File ulogd-pcap.diff of Package ulogd2

Overview Repositories Revisions Requests Users Attributes Meta

File ulogd-pcap.diff of Package ulogd2 (Revision 8b2d30f79598278e84ee783e3dfa72ab)

Currently displaying revision 8b2d30f79598278e84ee783e3dfa72ab , Show latest

pcap is not found reliably by either --with-pcap=%_prefix
or --with-pcap-lib=%_libdir --with-pcap-inc=%_includedir.

If you have any special paths, just use
	./configure CPPFLAGS="-I/my/pcap" LDFLAGS="-L/my/pcap"

---
 configure.ac            |    7 +++----
 output/pcap/Makefile.am |    4 ++--
 2 files changed, 5 insertions(+), 6 deletions(-)

Index: ulogd2/configure.ac
===================================================================
--- ulogd2.orig/configure.ac
+++ ulogd2/configure.ac
@@ -20,7 +20,9 @@ AC_PROG_LIBTOOL
 dnl Checks for libraries.
 AC_SEARCH_LIBS([dlopen], [dl], [libdl_LIBS="$LIBS"; LIBS=""])
 AC_SUBST([libdl_LIBS])
-AC_CHECK_HEADER(pcap.h,HAVE_PCAP_H=true)
+AC_SEARCH_LIBS([pcap_close], [pcap], [libpcap_LIBS="-lpcap"; LIBS=""])
+AC_SUBST([libpcap_LIBS])
+AM_CONDITIONAL([HAVE_PCAP], test -n "$libpcap_LIBS"])
 
 dnl Checks for header files.
 AC_HEADER_DIRENT
@@ -59,8 +61,6 @@ AM_CONDITIONAL([HAVE_SQLITE3], [test -n
 CT_CHECK_DBI()
 AM_CONDITIONAL(HAVE_DBI, test "x$DBI_LIB" != "x")
 
-CT_CHECK_PCAP()
-AM_CONDITIONAL(HAVE_PCAP, test "x$HAVE_PCAP_LIB" != "x")
 
 
 dnl AC_SUBST(DATABASE_DIR)
@@ -71,7 +71,6 @@ dnl AC_SUBST(EXTRA_MYSQL_DEF)
 dnl AC_SUBST(EXTRA_PGSQL_DEF)
 
 dnl AC_SUBST(DATABASE_DRIVERS)
-dnl AC_SUBST(HAVE_PCAP_H)
 
 dnl AM_CONDITIONAL(HAVE_MYSQL, test x$mysqldir != x)
 dnl AM_CONDITIONAL(HAVE_PGSQL, test x$pgsqldir != x)
Index: ulogd2/output/pcap/Makefile.am
===================================================================
--- ulogd2.orig/output/pcap/Makefile.am
+++ ulogd2/output/pcap/Makefile.am
@@ -1,5 +1,5 @@
 
-AM_CPPFLAGS = -I$(top_srcdir)/include $(PCAP_INC)
+AM_CPPFLAGS = -I$(top_srcdir)/include
 AM_CFLAGS = ${regular_CFLAGS}
 
 if HAVE_PCAP
@@ -7,7 +7,7 @@ if HAVE_PCAP
 pkglib_LTLIBRARIES = ulogd_output_PCAP.la
 
 ulogd_output_PCAP_la_SOURCES = ulogd_output_PCAP.c
-ulogd_output_PCAP_la_LIBADD  = ${PCAP_LIB}
+ulogd_output_PCAP_la_LIBADD  = ${libpcap_LIBS}
 ulogd_output_PCAP_la_LDFLAGS = -avoid-version -module
 
 endif

Places

File ulogd-pcap.diff of Package ulogd2 (Revision 8b2d30f79598278e84ee783e3dfa72ab)

Places