mirror of
https://gitlab.isc.org/isc-projects/bind9
synced 2025-08-31 06:25:31 +00:00
Merge branch 'pemensik/bind9-no-idn2-export' into 'master'
Don't include -lidn2 in isc-config.sh output Closes #163 See merge request isc-projects/bind9!178
This commit is contained in:
Ondřej Surý
22
configure
vendored
22
configure
vendored
@@ -22466,6 +22466,7 @@ fi
|
||||
#
|
||||
|
||||
LIBIDN2_CFLAGS=
|
||||
LIBIDN2_LDFLAGS=
|
||||
LIBIDN2_LIBS=
|
||||
|
||||
# Check whether --with-libidn2 was given.
|
||||
@@ -22479,20 +22480,23 @@ case $use_libidn2 in #(
|
||||
no) :
|
||||
: ;; #(
|
||||
yes) :
|
||||
|
||||
LIBIDN2_LIBS="-lidn2"
|
||||
;; #(
|
||||
: ;; #(
|
||||
*) :
|
||||
|
||||
LIBIDN2_CFLAGS="-I$use_libidn2/include"
|
||||
LIBIDN2_LIBS="-L$use_libidn2/lib -lidn2"
|
||||
LIBIDN2_LDFLAGS="-L$use_libidn2/lib"
|
||||
;; #(
|
||||
*) :
|
||||
;;
|
||||
esac
|
||||
|
||||
if test "$use_libidn2" != "no"; then :
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing idn2_to_ascii_8z" >&5
|
||||
save_CFLAGS="$CFLAGS"
|
||||
save_LIBS="$LIBS"
|
||||
save_LDFLAGS="$LDFLAGS"
|
||||
CFLAGS="$LIBIDN2_CFLAGS $CFLAGS"
|
||||
LDFLAGS="$LIBIDN2_LDFLAGS $LDFLAGS"
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing idn2_to_ascii_8z" >&5
|
||||
$as_echo_n "checking for library containing idn2_to_ascii_8z... " >&6; }
|
||||
if ${ac_cv_search_idn2_to_ascii_8z+:} false; then :
|
||||
$as_echo_n "(cached) " >&6
|
||||
@@ -22551,12 +22555,11 @@ $as_echo "#define WITH_IDN_SUPPORT 1" >>confdefs.h
|
||||
|
||||
$as_echo "#define WITH_LIBIDN2 1" >>confdefs.h
|
||||
|
||||
LIBIDN2_LIBS="$LIBIDN2_LDFLAGS -lidn2"
|
||||
else
|
||||
as_fn_error $? "libidn2 requested, but not found" "$LINENO" 5
|
||||
fi
|
||||
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether libidn2 supports idn2_to_unicode_8zlz" >&5
|
||||
$as_echo_n "checking whether libidn2 supports idn2_to_unicode_8zlz... " >&6; }
|
||||
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
||||
/* end confdefs.h. */
|
||||
#include <idn2.h>
|
||||
@@ -22580,6 +22583,9 @@ $as_echo "no" >&6; }
|
||||
fi
|
||||
rm -f core conftest.err conftest.$ac_objext \
|
||||
conftest$ac_exeext conftest.$ac_ext
|
||||
CFLAGS="$save_CFLAGS"
|
||||
LIBS="$save_LIBS"
|
||||
LDFLAGS="$save_LDFLAGS"
|
||||
|
||||
fi
|
||||
|
||||
@@ -26474,6 +26480,7 @@ report() {
|
||||
test "X$JSONSTATS" = "X" || echo " JSON statistics (--with-libjson)"
|
||||
test "X$ZLIB" = "X" || echo " HTTP zlib compression (--with-zlib)"
|
||||
test "X$NZD_TOOLS" = "X" || echo " LMDB database to store configuration for 'addzone' zones (--with-lmdb)"
|
||||
test "no" = "$use_libidn2" || echo " IDN support (--with-libidn2)"
|
||||
fi
|
||||
|
||||
if test "no" != "$use_pkcs11"; then
|
||||
@@ -26574,6 +26581,7 @@ report() {
|
||||
test "X$JSONSTATS" = "X" && echo " JSON statistics (--with-libjson)"
|
||||
test "X$ZLIB" = "X" && echo " HTTP zlib compression (--with-zlib)"
|
||||
test "X$NZD_TOOLS" = "X" && echo " LMDB database to store configuration for 'addzone' zones (--with-lmdb)"
|
||||
test "no" = "$use_libidn2" && echo " IDN support (--with-libidn2)"
|
||||
|
||||
echo "-------------------------------------------------------------------------------"
|
||||
echo "Configured paths:"
|
||||
|
||||
23
configure.in
23
configure.in
@@ -4662,31 +4662,38 @@ NOM_PATH_FILE(XSLT_DBLATEX_FASTBOOK, xsl/latex_book_fast.xsl, $dblatex_xsl_trees
|
||||
#
|
||||
|
||||
LIBIDN2_CFLAGS=
|
||||
LIBIDN2_LDFLAGS=
|
||||
LIBIDN2_LIBS=
|
||||
AC_ARG_WITH(libidn2,
|
||||
AS_HELP_STRING([--with-libidn2[=PATH]], [enable IDN support using GNU libidn2 [yes|no|path]]),
|
||||
use_libidn2="$withval", use_libidn2="no")
|
||||
AS_CASE([$use_libidn2],
|
||||
[no],[:],
|
||||
[yes],[
|
||||
LIBIDN2_LIBS="-lidn2"
|
||||
],
|
||||
[yes],[:],
|
||||
[*],[
|
||||
LIBIDN2_CFLAGS="-I$use_libidn2/include"
|
||||
LIBIDN2_LIBS="-L$use_libidn2/lib -lidn2"
|
||||
LIBIDN2_LDFLAGS="-L$use_libidn2/lib"
|
||||
])
|
||||
|
||||
AS_IF([test "$use_libidn2" != "no"],
|
||||
[AC_SEARCH_LIBS([idn2_to_ascii_8z], [idn2],
|
||||
[save_CFLAGS="$CFLAGS"
|
||||
save_LIBS="$LIBS"
|
||||
save_LDFLAGS="$LDFLAGS"
|
||||
CFLAGS="$LIBIDN2_CFLAGS $CFLAGS"
|
||||
LDFLAGS="$LIBIDN2_LDFLAGS $LDFLAGS"
|
||||
AC_SEARCH_LIBS([idn2_to_ascii_8z], [idn2],
|
||||
[AC_DEFINE(WITH_IDN_SUPPORT, 1, [define if IDN input support is to be included.])
|
||||
AC_DEFINE(WITH_LIBIDN2, 1, [define if libidn2 support is to be included.])],
|
||||
AC_DEFINE(WITH_LIBIDN2, 1, [define if libidn2 support is to be included.])
|
||||
LIBIDN2_LIBS="$LIBIDN2_LDFLAGS -lidn2"],
|
||||
[AC_MSG_ERROR([libidn2 requested, but not found])])
|
||||
AC_MSG_CHECKING(whether libidn2 supports idn2_to_unicode_8zlz)
|
||||
AC_TRY_LINK([#include <idn2.h>],
|
||||
[idn2_to_unicode_8zlz(".", NULL, IDN2_NONTRANSITIONAL|IDN2_NFC_INPUT);],
|
||||
[AC_MSG_RESULT(yes)
|
||||
AC_DEFINE(WITH_IDN_OUT_SUPPORT, 1, [define if IDN output support is to be included.])],
|
||||
[AC_MSG_RESULT([no])])
|
||||
CFLAGS="$save_CFLAGS"
|
||||
LIBS="$save_LIBS"
|
||||
LDFLAGS="$save_LDFLAGS"
|
||||
])
|
||||
AC_SUBST([LIBIDN2_CFLAGS])
|
||||
AC_SUBST([LIBIDN2_LIBS])
|
||||
@@ -5384,6 +5391,7 @@ report() {
|
||||
test "X$JSONSTATS" = "X" || echo " JSON statistics (--with-libjson)"
|
||||
test "X$ZLIB" = "X" || echo " HTTP zlib compression (--with-zlib)"
|
||||
test "X$NZD_TOOLS" = "X" || echo " LMDB database to store configuration for 'addzone' zones (--with-lmdb)"
|
||||
test "no" = "$use_libidn2" || echo " IDN support (--with-libidn2)"
|
||||
fi
|
||||
|
||||
if test "no" != "$use_pkcs11"; then
|
||||
@@ -5484,6 +5492,7 @@ report() {
|
||||
test "X$JSONSTATS" = "X" && echo " JSON statistics (--with-libjson)"
|
||||
test "X$ZLIB" = "X" && echo " HTTP zlib compression (--with-zlib)"
|
||||
test "X$NZD_TOOLS" = "X" && echo " LMDB database to store configuration for 'addzone' zones (--with-lmdb)"
|
||||
test "no" = "$use_libidn2" && echo " IDN support (--with-libidn2)"
|
||||
|
||||
echo "-------------------------------------------------------------------------------"
|
||||
echo "Configured paths:"
|
||||
|
||||
Reference in New Issue
Block a user