- makefile for sqlite driver fixed
authorAlex Kirhenshtein <alk@netxms.org>
Wed, 18 Jun 2008 11:11:48 +0000 (11:11 +0000)
committerAlex Kirhenshtein <alk@netxms.org>
Wed, 18 Jun 2008 11:11:48 +0000 (11:11 +0000)
- executable flag set on 'reconf'

configure.ac
reconf [changed mode: 0644->0755]
src/server/dbdrv/sqlite/Makefile.am

index 6cc8fc2..d08f5c4 100644 (file)
@@ -120,11 +120,6 @@ AC_ARG_WITH(private,
 AC_ARG_WITH(sqlite,
 [AS_HELP_STRING(--with-sqlite,build SQLite database driver)],
 [ if test "x$withval" != "xno" ; then
-       if test "x$withval" != "x" && test "x$withval" != "xyes" ; then
-               LD_RUN_PATH="${withval}/lib${LD_RUN_PATH:+:}${LD_RUN_PATH}"   
-               LDFLAGS="$LDFLAGS -L${withval}/lib"
-               CPPFLAGS="$CPPFLAGS -I${withval}/include"
-       fi
        COMPONENTS="$COMPONENTS sqlite"
        DBDRIVER_SELECTED="yes"
 fi ])
@@ -1331,19 +1326,6 @@ if test $? = 0; then
 fi
 
 
-#--------------------------------------------------------------------
-# SQLite
-#--------------------------------------------------------------------
-
-check_substr "$COMPONENTS" "sqlite"
-if test $? = 0; then
-       AC_CHECK_HEADER(sqlite3.h,,AC_MSG_ERROR([*** Cannot find sqlite3.h - check your SQLite installation ***]))
-       AC_CHECK_LIB(rt, fdatasync)
-       AC_CHECK_LIB(sqlite3, sqlite3_open, [],
-               [AC_MSG_ERROR(libsqlite3 is required for SQLite support)])
-fi
-
-
 #--------------------------------------------------------------------
 # nxhttpd
 #--------------------------------------------------------------------
diff --git a/reconf b/reconf
old mode 100644 (file)
new mode 100755 (executable)
index e543f3e..eb94dc8 100644 (file)
@@ -1,12 +1,12 @@
 INCLUDES=-I@top_srcdir@/include -I@top_srcdir@/src/server/include
 
 lib_LTLIBRARIES = libnxddr_sqlite.la
-libnxddr_sqlite_la_SOURCES = sqlite.cpp
+libnxddr_sqlite_la_SOURCES = sqlite.cpp sqlite3.c
 libnxddr_sqlite_la_LDFLAGS = -version-info $(NETXMS_LIBRARY_VERSION) ../../../libnetxms/libnetxms.la
 
 EXTRA_DIST = \
        sqlite.dsp sqlite.dsw \
-       sqlitedrv.h
+       sqlitedrv.h sqlite3ext.h sqlite3.h
 
 install-exec-hook:
        if test "x`uname -s`" = "xAIX" ; then $(AR) x $(libdir)/libnxddr_sqlite.a $(libdir)/libnxddr_sqlite.so.0 ; fi