diff options
| author | /C=EU/ST=EU/CN=Pablo Neira Ayuso/emailAddress=pablo@netfilter.org </C=EU/ST=EU/CN=Pablo Neira Ayuso/emailAddress=pablo@netfilter.org> | 2007-08-02 13:37:25 +0000 |
|---|---|---|
| committer | /C=EU/ST=EU/CN=Pablo Neira Ayuso/emailAddress=pablo@netfilter.org </C=EU/ST=EU/CN=Pablo Neira Ayuso/emailAddress=pablo@netfilter.org> | 2007-08-02 13:37:25 +0000 |
| commit | 34e5fdaa633ff6a6d8f6fa84e350fb3499fc4625 (patch) | |
| tree | 4f6fd6ba53dd4b5e07a795d6483634b6590efce9 /ulogd/Rules.make.in | |
| parent | 8bed2933b6b4772e0f14cc4c6ce743e200532b14 (diff) | |
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.
Diffstat (limited to 'ulogd/Rules.make.in')
| -rw-r--r-- | ulogd/Rules.make.in | 14 |
1 files changed, 7 insertions, 7 deletions
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@ |