File ulogd-1.24-build.dif of Package ulogd

--- configure.in
+++ configure.in	2007/03/19 12:04:40
@@ -63,15 +63,10 @@ else
         MYSQLLIBS=`$d/mysql_config --libs`
 
 	DATABASE_DIR="${DATABASE_DIR} mysql"
-
-	MYSQL_LIB="${DATABASE_LIB} ${MYSQLLIBS} " 
-	# no change to DATABASE_LIB_DIR, since --libs already includes -L
-
-	DATABASE_DRIVERS="${DATABASE_DRIVERS} ../mysql/mysql_driver.o "
+	MYSQL_LIB="${MYSQLLIBS}" 
 
 	DB_DEF="${DB_DEF} -DHAVE_MYSQL "
 
-
 	AC_SUBST(MYSQLINCLUDES)
 	AC_SUBST(MYSQL_LIB)
 
@@ -81,18 +76,22 @@ else
 	dnl Having a look in the libary itself should be more reliable than
 	dnl parsing the output of mysql --version.
 
-	AC_MSG_CHECKING(for mysql_real_escape_string support)
-
-	MYSQL_FUNCTION_TEST=`strings ${MYSQLLIBS}/libmysqlclient.so | grep mysql_real_escape_string`
-
-	if test "x$MYSQL_FUNCTION_TEST" = x
-	then
-                EXTRA_MYSQL_DEF="-DOLD_MYSQL=1 "
-                AC_MSG_RESULT(found old MySQL)
-	else
-		AC_MSG_RESULT(found new MySQL)
-	fi
-
+	dnl AC_MSG_CHECKING(for mysql_real_escape_string support)
+	dnl
+	dnl MYSQL_FUNCTION_TEST=`strings ${MYSQLLIBS}/libmysqlclient.so | grep mysql_real_escape_string`
+	dnl
+	dnl if test "x$MYSQL_FUNCTION_TEST" = x
+	dnl then
+	dnl	EXTRA_MYSQL_DEF="-DOLD_MYSQL=1 "
+	dnl	AC_MSG_RESULT(found old MySQL)
+	dnl else
+	dnl	AC_MSG_RESULT(found new MySQL)
+	dnl fi
+
+	OLDLIBS="$LIBS"
+	LIBS="$MYSQLLIBS"
+	AC_CHECK_FUNCS([mysql_real_escape_string], [], [EXTRA_MYSQL_DEF="-DOLD_MYSQL=1 "])
+	LIBS="$OLDLIBS"
 fi      
 ])      
 
@@ -141,13 +140,12 @@ then
         AC_MSG_WARN(PGSQL backend not used)
 else
         AC_DEFINE(HAVE_PGSQL)
-	PGSQLINCLUDES=`$pgsqldir/pg_config --includedir`
-	PGSQLLIBS=`$pgsqldir/pg_config --libdir`
+	PGSQLINCLUDES=-I`$pgsqldir/pg_config --includedir`
+	PGSQLLIBS=-L`$pgsqldir/pg_config --libdir`
 
 	DATABASE_DIR="${DATABASE_DIR} pgsql"
-	PGSQL_LIB="${DATABASE_LIB} -lpq " 
+	PGSQL_LIB="${PGSQLLIBS} -lpq " 
 
-	DATABASE_LIB_DIR="${DATABASE_LIB_DIR} -L${PGSQLLIBS} "
 	DB_DEF="${DB_DEF} -DHAVE_PGSQL "
 
 	AC_SUBST(PGSQLINCLUDES)
@@ -179,34 +177,38 @@ then
 else
         dir="/usr/local"
 fi
-mysqldir=""
+sqlite3dir=""
 AC_MSG_CHECKING(for sqlite3 files)
 for d in $dir /usr /usr/local /usr/local/sqlite3
 do
-        if test -f $d/lib/sqlite3/libsqlite3.so
-        then
-                AC_MSG_RESULT(found sqlite3 in $d)
-                sqlite3dir=$d
-                sqlite3dir_suffix=/sqlite3
-                break
-	elif test -f $d/lib64/sqlite3/libsqlite3.so
+	if test -f $d/lib64/sqlite3/libsqlite3.so
 	then
 		AC_MSG_RESULT(found sqlite3 in $d)
 		sqlite3dir=$d
 		sqlite3dir_suffix=/sqlite3
+		sqlite3dir_libdir=${sqlite3dir}/lib64
 		break
-        elif test -f $d/lib/libsqlite3.so
+        elif test -f $d/lib/sqlite3/libsqlite3.so
         then
-                AC_MSG_RESULT(found sqlite in $d)
+                AC_MSG_RESULT(found sqlite3 in $d)
                 sqlite3dir=$d
-                sqlite3dir_suffix=
+                sqlite3dir_suffix=/sqlite3
+		sqlite3dir_libdir=${sqlite3dir}/lib
                 break
 	elif test -f $d/lib64/libsqlite3.so
         then
-		AC_MSG_RESULT(found sqlite in $d)
+		AC_MSG_RESULT(found sqlite3 in $d)
 		sqlite3dir=$d
 		sqlite3dir_suffix=
+		sqlite3dir_libdir=${sqlite3dir}/lib64
 		break
+        elif test -f $d/lib/libsqlite3.so
+        then
+                AC_MSG_RESULT(found sqlite3 in $d)
+                sqlite3dir=$d
+                sqlite3dir_suffix=
+		sqlite3dir_libdir=${sqlite3dir}/lib
+                break
         fi
 done
 
@@ -215,15 +217,11 @@ then
         AC_MSG_WARN(sqlite3 backend not used)
 else
         AC_DEFINE(HAVE_SQLITE3)
-        SQLITE3INCLUDES=${sqlite3dir}/include${sqlite3dir_suffix}
-        SQLITE3LIBS=${sqlite3dir}/lib${sqlite3dir_suffix}
+        SQLITE3INCLUDES=-I${sqlite3dir}/include${sqlite3dir_suffix}
+        SQLITE3LIBS=-L${sqlite3dir_libdir}${sqlite3dir_suffix}
 
 	DATABASE_DIR="${DATABASE_DIR} sqlite3"
-
-	SQLITE3_LIB="${DATABASE_LIB} -lsqlite3 " 
-	DATABASE_LIB_DIR="${DATABASE_LIB_DIR} -L${SQLITE3LIBS} "
-
-dnl	DATABASE_DRIVERS="${DATABASE_DRIVERS} ../sqlite3/mysql_driver.o "
+	SQLITE3_LIB="${SQLITE3LIBS} -lsqlite3 " 
 
 	DB_DEF="${DB_DEF} -DHAVE_SQLITE3 "
 
--- Makefile.in
+++ Makefile.in	2007/03/19 10:09:19
@@ -63,7 +63,7 @@ recurse: 
 	@for d in $(SUBDIRS); do if ! make -C $$d; then exit 1; fi; done
 
 ulogd: ulogd.c $(LIBIPULOG) include/ulogd/ulogd.h conffile/conffile.o $(LIBIPULOG)/libipulog.a ulogd.conf
-	$(CC) $(CFLAGS) -rdynamic $< conffile/conffile.o $(LIBIPULOG)/libipulog.a -o $@ $(LIBS)
+	$(CC) $(CFLAGS) $(LDFLAGS) -rdynamic $< conffile/conffile.o $(LIBIPULOG)/libipulog.a -o $@ $(LIBS)
 
 edit = sed -e 's,@libdir\@,$(ULOGD_LIB_PATH),g'
 
--- Rules.make.in
+++ Rules.make.in	2007/03/19 12:05:38
@@ -22,7 +22,7 @@ CFLAGS=@CFLAGS@ @CPPFLAGS@ -Wall
 CFLAGS+=-DULOGD_CONFIGFILE=\"$(ULOGD_CONFIGFILE)\"
 # doesn't work for subdirs
 #CFLAGS+=$(INCIPULOG) $(INCCONFFILE)
-CFLAGS+=-I/lib/modules/`uname -r`/build/include
+#CFLAGS+=-I/lib/modules/`uname -r`/build/include
 #CFLAGS+=@DEFS@
 #CFLAGS+=-g -DDEBUG -DDEBUG_MYSQL -DDEBUG_PGSQL
 
@@ -34,16 +34,16 @@ ULOGD_SL:=BASE OPRINT PWSNIFF LOGEMU LOC
 
 # mysql output support
 #ULOGD_SL+=MYSQL
-MYSQL_CFLAGS=-I@MYSQLINCLUDES@ @EXTRA_MYSQL_DEF@
-MYSQL_LDFLAGS=@DATABASE_LIB_DIR@ @MYSQL_LIB@
+MYSQL_CFLAGS=@MYSQLINCLUDES@ @EXTRA_MYSQL_DEF@
+MYSQL_LDFLAGS=$(LDFLAGS) @MYSQL_LIB@
 
 # postgreSQL output support
 #ULOGD_SL+=PGSQL
-PGSQL_CFLAGS=-I@PGSQLINCLUDES@ @EXTRA_PGSQL_DEF@
-PGSQL_LDFLAGS=@DATABASE_LIB_DIR@ @PGSQL_LIB@
+PGSQL_CFLAGS=@PGSQLINCLUDES@ @EXTRA_PGSQL_DEF@
+PGSQL_LDFLAGS=$(LDFLAGS) @PGSQL_LIB@
 
 # mysql output support
 #ULOGD_SL+=SQLITE3
-SQLITE3_CFLAGS=-I@SQLITE3INCLUDES@ @EXTRA_SQLITE3_DEF@
-SQLITE3_LDFLAGS=@DATABASE_LIB_DIR@ @SQLITE3_LIB@
+SQLITE3_CFLAGS=@SQLITE3INCLUDES@ @EXTRA_SQLITE3_DEF@
+SQLITE3_LDFLAGS=$(LDFLAGS) @SQLITE3_LIB@