Marius Tomaschewski (mt@suse.de)

- Cleaned up and unified some configure.in / Rules.make.in variables
  (sometimes the variable contained -I or -L, sometimes not).

- Fixed to use AC_CHECK_FUNCS for mysql_real_escape_string detection
  instead of "strings ..." call. In the past it never worked, because
  the MYSQLLIBS variable contained "-L" and -l flags (see above) that
  got passed to the strings call.

- Removed PGSQL_LIB="${DATABASE_LIB} -lpq " adding mysql libs to the
  set of libs of sqlite3, ...

- Fixed sqlite3 installation check to work on both, 32 and 64 bit
  platforms. The 64bit lib has to be checked first or the 32 bit lib
  will be used while linking in 64 bit mode.

- Added $(LDFLAGS) to ulogd link rule in Makefile.in

- Somebody fixed the ugly "strings $MYSQLIBS" stuff already to AC_SEARCH_LIBS.
  I changed it to my variant using "mysql_config --libs" to get the libs and
  just check if the libs contain the mysql_real_escape_string function or not.

3 files changed, 35 insertions, 41 deletions

diff --git a/ulogd/Makefile.in b/ulogd/Makefile.in
index 7bfa3f9..0f1845c 100644
--- a/ulogd/Makefile.in
+++ b/ulogd/Makefile.in
@@ -62,7 +62,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'
 
diff --git a/ulogd/Rules.make.in b/ulogd/Rules.make.in
index e9cd1fd..4a161a4 100644
--- a/ulogd/Rules.make.in
+++ b/ulogd/Rules.make.in
@@ -23,7 +23,7 @@ CFLAGS+=-DULOGD_CONFIGFILE=\"$(ULOGD_CONFIGFILE)\"
 CFLAGS+=@KERNEL64_USERSPACE32@
 # doesn't work for subdirs
 CFLAGS+=$(INCIPULOG)
-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
 
@@ -35,16 +35,16 @@ ULOGD_SL:=BASE OPRINT PWSNIFF LOGEMU LOCAL SYSLOG
 
 # 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@
 
diff --git a/ulogd/configure.in b/ulogd/configure.in
index b7109a0..c9db6c2 100644
--- a/ulogd/configure.in
+++ b/ulogd/configure.in
@@ -67,11 +67,7 @@ else
 
 	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=`$d/mysql_config --libs`
 	DB_DEF="${DB_DEF} -DHAVE_MYSQL "
 
 
@@ -84,11 +80,10 @@ 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)
-
-	AC_SEARCH_LIBS(mysql_real_escape_string, mysqlclient_r mysqlclient,
-		[EXTRA_MYSQL_DEF="-DOLD_MYSQL=1"])
-
+	OLDLIBS="$LIBS"
+	LIBS="$MYSQL_LIB"
+	AC_CHECK_FUNCS([mysql_real_escape_string], [], [EXTRA_MYSQL_DEF="-DOLD_MYSQL=1 "])
+	LIBS="$OLDLIBS"
 fi      
 ])      
 
@@ -137,13 +132,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)
@@ -175,34 +169,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
 
@@ -211,15 +209,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 "