Skip to content

Commit

Permalink
- Disable SQLITE3 linking on Linux (keep the configure line there but…
Browse files Browse the repository at this point in the history
… commented out in case we need it in the future)

git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@7051 f25d12d1-65f4-0310-ae8a-bbce733d8d8e
  • Loading branch information
sjoelund committed Nov 16, 2010
1 parent 8dccb91 commit c747844
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 49 deletions.
3 changes: 2 additions & 1 deletion Compiler/Makefile.compiler_subdirs.common
Expand Up @@ -12,7 +12,8 @@ all : .testvariables $(ALLMO) $(SRCSIGX)
SUBDIRS = runtime parser modpar
SRCHSRCDIR = $(SRCH:%.h=$(srcdir)/%.h)

SQLITE3=-lsqlite3
# Don't link against sqlite until we actually need it -lsqlite3
SQLITE3=

.SUFFIXES: .o .mo .h .c
.PHONY: all vctarget absyn_subdir clean reallyclean $(SUBDIRS)
Expand Down
48 changes: 1 addition & 47 deletions configure
Expand Up @@ -4433,53 +4433,7 @@ fi
fi


{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sqlite3_libversion in -lsqlite3" >&5
$as_echo_n "checking for sqlite3_libversion in -lsqlite3... " >&6; }
if test "${ac_cv_lib_sqlite3_sqlite3_libversion+set}" = set; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lsqlite3 $LIBS"
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
Use char because int might match the return type of a GCC
builtin and then its argument prototype would still apply. */
#ifdef __cplusplus
extern "C"
#endif
char sqlite3_libversion ();
int
main ()
{
return sqlite3_libversion ();
;
return 0;
}
_ACEOF
if ac_fn_c_try_link "$LINENO"; then :
ac_cv_lib_sqlite3_sqlite3_libversion=yes
else
ac_cv_lib_sqlite3_sqlite3_libversion=no
fi
rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_sqlite3_sqlite3_libversion" >&5
$as_echo "$ac_cv_lib_sqlite3_sqlite3_libversion" >&6; }
if test "x$ac_cv_lib_sqlite3_sqlite3_libversion" = x""yes; then :
cat >>confdefs.h <<_ACEOF
#define HAVE_LIBSQLITE3 1
_ACEOF

LIBS="-lsqlite3 $LIBS"

else
as_fn_error $? "sqlite3 not found" "$LINENO" 5
fi

# AC_CHECK_LIB(sqlite3,sqlite3_libversion,[],[AC_MSG_ERROR([sqlite3 not found])])



Expand Down
2 changes: 1 addition & 1 deletion configure.in
Expand Up @@ -210,7 +210,7 @@ AC_CHECK_FUNC(gethostbyname,
AC_CHECK_LIB(nsl,gethostbyname, [AC_MSG_RESULT([yes]); LIBNSL="-lnsl"],[AC_MSG_ERROR([neither gethostbyname nor libnsl.a found])])
])

AC_CHECK_LIB(sqlite3,sqlite3_libversion,[],[AC_MSG_ERROR([sqlite3 not found])])
# AC_CHECK_LIB(sqlite3,sqlite3_libversion,[],[AC_MSG_ERROR([sqlite3 not found])])

dnl should we use corba?

Expand Down

0 comments on commit c747844

Please sign in to comment.