[netfilter-cvslog] r6606 - branches/ulog/ulogd2

[laforge at netfilter.org]

Author: laforge at netfilter.org
Date: 2006-05-23 10:38:32 +0200 (Tue, 23 May 2006)
New Revision: 6606

Modified:
   branches/ulog/ulogd2/acinclude.m4
Log:
configure --without-pgsql" or "configure --with-pgsql=no" should                                          
force the pgsql plugin to be disabled.  Same for mysql, pcap and sqlite3.
(Philip Craig)


Modified: branches/ulog/ulogd2/acinclude.m4
===================================================================
--- branches/ulog/ulogd2/acinclude.m4	2006-05-23 08:37:17 UTC (rev 6605)
+++ branches/ulog/ulogd2/acinclude.m4	2006-05-23 08:38:32 UTC (rev 6606)
@@ -30,6 +30,8 @@
 AC_SUBST(PQLIBS)
 PQLIBS=-lpq
 
+if test "$pg_prefix" != "no"; then
+
 AC_MSG_CHECKING([for PostgreSQL pg_config program])
 for d in $pg_prefix/bin /usr/bin /usr/local/bin /usr/local/pgsql/bin /opt/pgsql/bin /opt/packages/pgsql/bin
 do
@@ -89,6 +91,8 @@
   AC_CHECK_LIB(pq, PQconnectdb, [], AC_MSG_WARN(libpq.so not found))
 fi
 
+fi
+
 ])
 
 dnl @synopsis CT_CHECK_MYSQL_DB
@@ -121,6 +125,8 @@
 AC_SUBST(MYSQL_INC)
 AC_SUBST(MYSQL_LIB)
 
+if test "$my_prefix" != "no"; then
+
 AC_MSG_CHECKING([for MySQL mysql_config program])
 for d in $my_prefix/bin /usr/bin /usr/local/bin /usr/local/mysql/bin /opt/mysql/bin /opt/packages/mysql/bin
 do
@@ -180,6 +186,8 @@
   AC_CHECK_LIB(mysqlclient, mysql_close, [], AC_MSG_WARN(libmysqlclient.so not found))
 fi
 
+fi
+
 ])
 
 dnl @synopsis CT_CHECK_PCAP
@@ -211,6 +219,8 @@
 AC_SUBST(PCAP_INC)
 AC_SUBST(PCAP_LIB)
 
+if test "$pcap_prefix" != "no"; then
+
 if test "$pcap_prefix" != ""; then
    AC_MSG_CHECKING([for libpcap includes in $pcap_prefix/include])
    if test -f "$pcap_prefix/include/pcap.h" ; then
@@ -254,6 +264,8 @@
   AC_CHECK_LIB(pcap, pcap_close, [], AC_MSG_WARN(libpcap.so not found))
 fi
 
+fi
+
 ])
 
 dnl @synopsis CT_CHECK_SQLITE3_DB
@@ -286,6 +298,8 @@
 AC_SUBST(SQLITE3_INC)
 AC_SUBST(SQLITE3_LIB)
 
+if test "$sqlite3_prefix" != "no"; then
+
 AC_MSG_CHECKING([for sqlite3 pkg-config program])
 for d in $sqlite3_prefix/bin /usr/bin /usr/local/bin /usr/local/sqlite3/bin /opt/sqlite3/bin /opt/packages/sqlite3/bin
 do
@@ -350,4 +364,6 @@
   AC_CHECK_LIB(sqlite3, sqlite3_close, [], AC_MSG_WARN(libsqlite3.so not found))
 fi
 
+fi
+
 ])