diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2014-01-06 17:58:36 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2014-01-06 17:58:36 +0100 |
| commit | 23ed2d5006295f5fe691030a4b11ef36486a3652 (patch) | |
| tree | e636ba9044aa5291df92d22d866e5091fc553563 /package/libnids/patches | |
| parent | 96d11bbe9406d924ac68db4336193d7ca10a628d (diff) | |
| parent | efb2406790d55efac13cd37888d97c5517e19688 (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'package/libnids/patches')
| -rw-r--r-- | package/libnids/patches/patch-configure | 17 | ||||
| -rw-r--r-- | package/libnids/patches/patch-configure_in | 20 |
2 files changed, 20 insertions, 17 deletions
diff --git a/package/libnids/patches/patch-configure b/package/libnids/patches/patch-configure deleted file mode 100644 index 01a4d76fd..000000000 --- a/package/libnids/patches/patch-configure +++ /dev/null @@ -1,17 +0,0 @@ ---- libnids-1.24.orig/configure 2006-05-01 19:14:51.000000000 +0200 -+++ libnids-1.24/configure 2011-05-16 16:03:49.766610900 +0200 -@@ -3919,11 +3919,11 @@ echo "${ECHO_T}no" >&6 - *) - echo "$as_me:$LINENO: result: $withval" >&5 - echo "${ECHO_T}$withval" >&6 -- if test -f $withval/pcap.h -a -f $withval/libpcap.a; then -+ if test -f $withval/include/pcap.h; then - owd=`pwd` - if cd $withval; then withval=`pwd`; cd $owd; fi -- PCAP_CFLAGS="-I$withval -I$withval/bpf" -- PCAPLIB="-L$withval -lpcap" -+ PCAP_CFLAGS="-I$withval/include -I$withval/include/bpf" -+ PCAPLIB="-L$withval/lib -lpcap" - else - { { echo "$as_me:$LINENO: error: pcap.h or libpcap.a not found in $withval" >&5 - echo "$as_me: error: pcap.h or libpcap.a not found in $withval" >&2;} diff --git a/package/libnids/patches/patch-configure_in b/package/libnids/patches/patch-configure_in new file mode 100644 index 000000000..2554d2f32 --- /dev/null +++ b/package/libnids/patches/patch-configure_in @@ -0,0 +1,20 @@ +--- libnids-1.24.orig/configure.in 2006-05-01 19:14:51.000000000 +0200 ++++ libnids-1.24/configure.in 2014-01-06 16:25:57.765584034 +0100 +@@ -65,13 +65,13 @@ AC_ARG_WITH(libpcap, + ;; + *) + AC_MSG_RESULT($withval) +- if test -f $withval/pcap.h -a -f $withval/libpcap.a; then ++ if test -f $withval/include/pcap.h; then + owd=`pwd` + if cd $withval; then withval=`pwd`; cd $owd; fi +- PCAP_CFLAGS="-I$withval -I$withval/bpf" +- PCAPLIB="-L$withval -lpcap" ++ PCAP_CFLAGS="-I$withval/include -I$withval/include/bpf" ++ PCAPLIB="-L$withval/lib -lpcap" + else +- AC_ERROR(pcap.h or libpcap.a not found in $withval) ++ AC_ERROR(pcap.h not found in $withval) + fi + ;; + esac ], |