fix build on Cygwin

3 files changed, 14 insertions, 58 deletions

diff --git a/package/daq/Makefile b/package/daq/Makefile
index 2ea031810..be48531c6 100644
--- a/package/daq/Makefile
+++ b/package/daq/Makefile
@@ -5,12 +5,12 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		daq
 PKG_VERSION:=		2.0.0
-PKG_RELEASE:=		2
+PKG_RELEASE:=		3
 PKG_MD5SUM:=		a00855a153647df76d47f1ea454f74ae
 PKG_DESCR:=		daq
 PKG_SECTION:=		libs
 PKG_DEPENDS:=		libpcap
-PKG_BUILDDEP:=		libpcap
+PKG_BUILDDEP:=		libpcap autotool
 PKG_URL:=		http://www.snort.org
 PKG_SITES:=		http://openadk.org/distfiles/
 PKG_OPTS:=		dev
@@ -19,6 +19,8 @@ include $(TOPDIR)/mk/package.mk
 
 $(eval $(call PKG_template,DAQ,daq,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
 
+AUTOTOOL_STYLE:=	autoreconf
+
 daq-install:
 	$(INSTALL_DIR) $(IDIR_DAQ)/usr/lib/daq
 	$(CP) $(WRKINST)/usr/lib/daq/*.so \
diff --git a/package/daq/patches/patch-configure b/package/daq/patches/patch-configure
deleted file mode 100644
index e23ab323a..000000000
--- a/package/daq/patches/patch-configure
+++ /dev/null
@@ -1,56 +0,0 @@
---- daq-2.0.0.orig/configure	2012-11-05 22:07:56.000000000 +0100
-+++ daq-2.0.0/configure	2013-07-17 11:03:24.000000000 +0200
-@@ -12771,53 +12771,6 @@ fi
-         echo
-         exit 1
-     fi
--    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libpcap version >= \"1.0.0\"" >&5
--$as_echo_n "checking for libpcap version >= \"1.0.0\"... " >&6; }
--    if test "$cross_compiling" = yes; then :
--  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
--$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
--as_fn_error $? "cannot run test program while cross compiling
--See \`config.log' for more details" "$LINENO" 5; }
--else
--  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
--/* end confdefs.h.  */
--
--    #include <pcap.h>
--    #include <string.h>
--    extern char pcap_version[];
--
--int
--main ()
--{
--
--        if (strcmp(pcap_version, "1.0.0") < 0)
--            return 1;
--
--  ;
--  return 0;
--}
--_ACEOF
--if ac_fn_c_try_run "$LINENO"; then :
--  libpcap_version_1x="yes"
--else
--  libpcap_version_1x="no"
--fi
--rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
--  conftest.$ac_objext conftest.beam conftest.$ac_ext
--fi
--
--    if test "x$libpcap_version_1x" = "xno"; then
--        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
--$as_echo "no" >&6; }
--        echo
--        echo "    ERROR!  Libpcap library version >= "1.0.0"  not found."
--        echo "    Get it from http://www.tcpdump.org"
--        echo
--        exit 1
--    else
--        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
--$as_echo "yes" >&6; }
--    fi
- 
-     if test "$enable_pcap_module" = yes; then
-         STATIC_LIBS="${STATIC_LIBS} -lpcap"
diff --git a/package/daq/patches/patch-configure_ac b/package/daq/patches/patch-configure_ac
new file mode 100644
index 000000000..4f8d40df3
--- /dev/null
+++ b/package/daq/patches/patch-configure_ac
@@ -0,0 +1,10 @@
+--- daq-2.0.0.orig/configure.ac	2012-09-06 17:17:23.000000000 +0200
++++ daq-2.0.0/configure.ac	2013-11-15 15:21:19.546122100 +0100
+@@ -179,7 +179,6 @@ AC_ARG_ENABLE(pcap-module,
+               [enable_pcap_module="$enableval"], [enable_pcap_module="$DEFAULT_ENABLE"])
+ if test "$enable_pcap_module" = yes; then
+     AC_CHECK_HEADER([pcap.h], [], [enable_pcap_module=no])
+-    AC_CHECK_PCAP_VER("1.0.0")
+     if test "$enable_pcap_module" = yes; then
+         STATIC_LIBS="${STATIC_LIBS} -lpcap"
+     fi