Up to 9.18.25

[packages/bind.git] / bind-ac-libs.patch

diff --git a/bind-ac-libs.patch b/bind-ac-libs.patch
index 3927414d2093dba15b794f1c4e90e840d71530b4..677cd99cf1c5268a8cf4ef1e6cdf4aab0ce04908 100644 (file)
--- a/bind-ac-libs.patch
+++ b/bind-ac-libs.patch
@@ -1,58 +1,20 @@
---- bind-9.8.0-P4/configure.ac~        2011-08-03 11:46:24.326770259 +0200
-+++ bind-9.8.0-P4/configure.ac 2011-08-03 11:49:53.240770212 +0200
-@@ -1076,7 +1076,7 @@ case "$use_gssapi" in
-                   then
-                           LIBS="$TRY_LIBS $ISC_OPENSSL_LIBS"
-                   else
--                          LIBS="-L$use_gssapi/lib $TRY_LIBS $ISC_OPENSSL_LIBS"
-+                          LIBS="$TRY_LIBS $ISC_OPENSSL_LIBS"
-                   fi
-                   AC_MSG_CHECKING(linking as $TRY_LIBS)
-                   AC_TRY_LINK([
-@@ -1420,7 +1420,7 @@
-                               fi
-                               ;;
-                       *)
--                              DST_OPENSSL_LIBS="-L$use_openssl/lib -lcrypto"
-+                              DST_OPENSSL_LIBS="-lcrypto"
-                               ;;
-                       esac
-               fi
-@@ -1596,7 +1596,7 @@
-       *)
-               if test -f $kame_path/lib/libinet6.a; then
-                       AC_MSG_RESULT($kame_path/lib/libinet6.a)
--                      LIBS="-L$kame_path/lib -linet6 $LIBS"
-+                      LIBS="-linet6 $LIBS"
-               else
-                       AC_MSG_ERROR([$kame_path/lib/libinet6.a not found.
- 
-@@ -2989,16 +2989,16 @@
- case "$use_libiconv" in
- yes)
-       if test X$prefix = XNONE ; then
--              iconvlib="-L/usr/local/lib -R/usr/local/lib -liconv"
-+              iconvlib="-liconv"
-       else
--              iconvlib="-L$prefix/lib -R$prefix/lib -liconv"
-+              iconvlib="-liconv"
-       fi
-       ;;
- no)
-       iconvlib=
-       ;;
- *)
--      iconvlib="-L$use_libiconv/lib -R$use_libiconv/lib -liconv"
-+      iconvlib="-liconv"
-       ;;
- esac
-
-@@ -4801,7 +4801,7 @@ if test "no" != "$use_idnkit"; then
-       if test "no" != "$idnlib"; then
-               IDNKIT_LIBS="$idnlib $iconvlib"
-       else
--              IDNKIT_LIBS="-L$idnkit_path/lib -lidnkit $iconvlib"
-+              IDNKIT_LIBS="-lidnkit $iconvlib"
-       fi
- fi
- AC_SUBST(IDNKIT_LIBS)
+--- bind-9.18.0/configure.ac~  2022-01-24 21:06:11.000000000 +0100
++++ bind-9.18.0/configure.ac   2022-01-27 13:36:04.136536700 +0100
+@@ -474,7 +474,7 @@ AS_IF([test "$enable_geoip" = "yes"],
+              [ # default
+                  AX_SAVE_FLAGS([maxminddb])
+                  MAXMINDDB_CFLAGS="-I$with_maxminddb/include"
+-                 MAXMINDDB_LIBS="-L$with_maxminddb/lib"
++                 MAXMINDDB_LIBS=""
+                  CFLAGS="$CFLAGS $MAXMINDDB_CFLAGS"
+                  LIBS="$LIBS $MAXMINDDB_LIBS"
+                  AC_SEARCH_LIBS([MMDB_open], [maxminddb],
+@@ -1295,7 +1295,7 @@ AS_CASE([$with_libidn2],
+       [no],   [],
+       [*],    [AX_SAVE_FLAGS([libidn2])
+                LIBIDN2_CFLAGS="-I$with_libidn2/include"
+-               LIBIDN2_LIBS="-L$with_libidn2/lib"
++               LIBIDN2_LIBS=""
+                CFLAGS="$CFLAGS $LIBIDN2_CFLAGS"
+                LIBS="$LIBS $LIBIDN2_LIBS"
+                AC_CHECK_HEADERS([idn2.h],