[backfire/packages] merge r28424

[openwrt/svn-archive/archive.git] / net / dansguardian / patches / 001-include_dir.patch

diff --git a/net/dansguardian/patches/001-include_dir.patch b/net/dansguardian/patches/001-include_dir.patch
index 256b834dba2c30635a965f48b7807ad4ce5042ec..8a619f08a59d5fcb0a6f9103c7748c999cd42375 100644 (file)
--- a/net/dansguardian/patches/001-include_dir.patch
+++ b/net/dansguardian/patches/001-include_dir.patch
@@ -1,8 +1,6 @@
-Index: dansguardian-2.9.9.2/configure
-===================================================================
---- dansguardian-2.9.9.2.orig/configure        2008-02-27 17:52:06.000000000 +0100
-+++ dansguardian-2.9.9.2/configure     2008-02-27 17:52:06.000000000 +0100
-@@ -799,7 +799,7 @@
+--- a/configure
++++ b/configure
+@@ -861,7 +861,7 @@ sysconfdir='${prefix}/etc'
  sharedstatedir='${prefix}/com'
  localstatedir='${prefix}/var'
  includedir='${prefix}/include'
@@ -11,7 +9,7 @@ Index: dansguardian-2.9.9.2/configure
  docdir='${datarootdir}/doc/${PACKAGE_TARNAME}'
  infodir='${datarootdir}/info'
  htmldir='${docdir}'
-@@ -6429,7 +6429,7 @@
+@@ -6317,7 +6317,7 @@ $as_echo_n "checking for zlib... " >&6; 
  # Check whether --with-zlib was given.
  if test "${with_zlib+set}" = set; then
    withval=$with_zlib;  # check for header & func (in library) in given prefix
@@ -20,25 +18,7 @@ Index: dansguardian-2.9.9.2/configure
        if test "x$staticzlib" = "xtrue"; then
                LIBS="-Bstatic -L${withval} -lz -Bdynamic ${LIBS}"
        else
-@@ -9637,7 +9637,7 @@
-       PCRE_PREFIX=`pcre-config --prefix`
- 
-       LIBS="${PCRE_LIBS} ${LIBS}"
--      CPPFLAGS="${CPPFLAGS} -I${PCRE_PREFIX}/include"
-+      CPPFLAGS="${CPPFLAGS}"
- 
-       { echo "$as_me:$LINENO: checking for REG_DOTALL in pcreposix.h" >&5
- echo $ECHO_N "checking for REG_DOTALL in pcreposix.h... $ECHO_C" >&6; }
-@@ -10076,7 +10076,7 @@
-       CLAMAV_PREFIX=`clamav-config --prefix`
- 
-       LIBS="${CLAMAV_LIBS} -lclamav ${LIBS}"
--              CPPFLAGS="${CPPFLAGS} -I${CLAMAV_PREFIX}/include"
-+              CPPFLAGS="${CPPFLAGS}"
- 
- 
- cat >>confdefs.h <<\_ACEOF
-@@ -10753,7 +10753,7 @@
+@@ -10042,7 +10042,7 @@ _ACEOF
  if test "${with_libiconv+set}" = set; then
    withval=$with_libiconv;  # check for header & func (in library) in given prefix
                        if test "x$withval" != "x"; then