diff options
| author | laforge <laforge> | 2003-04-27 11:34:24 +0000 |
|---|---|---|
| committer | laforge <laforge> | 2003-04-27 11:34:24 +0000 |
| commit | 2a5e27442f4fb3f633b9b6b1e8999fd95b065b36 (patch) | |
| tree | 4eaf7fa361dc171d463dd164e3fd1f46376461f8 | |
| parent | 79fa4ccd0260ac5febcd4b4fc764a1825efee647 (diff) | |
don't link mysql plugin with postgresql libs and vice versa (Magnus Boden)
| -rw-r--r-- | Rules.make.in | 4 | ||||
| -rw-r--r-- | configure.in | 6 |
2 files changed, 6 insertions, 4 deletions
diff --git a/Rules.make.in b/Rules.make.in index 4715992..4b3fcff 100644 --- a/Rules.make.in +++ b/Rules.make.in @@ -32,9 +32,9 @@ ULOGD_SL:=BASE OPRINT PWSNIFF LOGEMU LOCAL # mysql output support #ULOGD_SL+=MYSQL MYSQL_CFLAGS=-I@MYSQLINCLUDES@ @EXTRA_MYSQL_DEF@ -MYSQL_LDFLAGS=@DATABASE_LIB_DIR@ @DATABASE_LIB@ +MYSQL_LDFLAGS=@DATABASE_LIB_DIR@ @MYSQL_LIB@ # postgreSQL output support #ULOGD_SL+=PGSQL PGSQL_CFLAGS=-I@PGSQLINCLUDES@ @EXTRA_PGSQL_DEF@ -PGSQL_LDFLAGS=@DATABASE_LIB_DIR@ @DATABASE_LIB@ +PGSQL_LDFLAGS=@DATABASE_LIB_DIR@ @PGSQL_LIB@ diff --git a/configure.in b/configure.in index 145b864..39d3eda 100644 --- a/configure.in +++ b/configure.in @@ -70,7 +70,7 @@ else DATABASE_DIR="${DATABASE_DIR} mysql" - DATABASE_LIB="${DATABASE_LIB} -lmysqlclient " + MYSQL_LIB="${DATABASE_LIB} -lmysqlclient " DATABASE_LIB_DIR="${DATABASE_LIB_DIR} -L${MYSQLLIBS} " DATABASE_DRIVERS="${DATABASE_DRIVERS} ../mysql/mysql_driver.o " @@ -79,6 +79,7 @@ else AC_SUBST(MYSQLINCLUDES) + AC_SUBST(MYSQL_LIB) if test -f $MYSQLLIBS/libmystrings.so then @@ -169,12 +170,13 @@ else DATABASE_DIR="${DATABASE_DIR} pgsql" - DATABASE_LIB="${DATABASE_LIB} -lpq " + PGSQL_LIB="${DATABASE_LIB} -lpq " DATABASE_LIB_DIR="${DATABASE_LIB_DIR} -L${PGSQLLIBS} " DB_DEF="${DB_DEF} -DHAVE_PGSQL " AC_SUBST(PGSQLINCLUDES) + AC_SUBST(PGSQL_LIB) fi ]) |