diff options
Diffstat (limited to 'contrib/bind9/configure.in')
| -rw-r--r-- | contrib/bind9/configure.in | 52 |
1 files changed, 46 insertions, 6 deletions
diff --git a/contrib/bind9/configure.in b/contrib/bind9/configure.in index 76e1eb3..08f0bf3 100644 --- a/contrib/bind9/configure.in +++ b/contrib/bind9/configure.in @@ -18,7 +18,7 @@ AC_DIVERT_PUSH(1)dnl esyscmd([sed "s/^/# /" COPYRIGHT])dnl AC_DIVERT_POP()dnl -AC_REVISION($Revision: 1.457.26.16 $) +AC_REVISION($Revision: 1.457.26.28 $) AC_INIT(lib/dns/name.c) AC_PREREQ(2.59) @@ -280,6 +280,7 @@ AC_C_CONST AC_C_INLINE AC_C_VOLATILE AC_CHECK_FUNC(sysctlbyname, AC_DEFINE(HAVE_SYSCTLBYNAME)) +AC_C_FLEXIBLE_ARRAY_MEMBER # # UnixWare 7.1.1 with the feature supplement to the UDK compiler @@ -414,7 +415,7 @@ AC_ARG_ENABLE(devpoll, want_devpoll="$enableval", want_devpoll="yes") case $want_devpoll in yes) - AC_CHECK_HEADERS(sys/devpoll.h, + AC_CHECK_HEADERS(sys/devpoll.h devpoll.h, ISC_PLATFORM_HAVEDEVPOLL="#define ISC_PLATFORM_HAVEDEVPOLL 1" , ISC_PLATFORM_HAVEDEVPOLL="#undef ISC_PLATFORM_HAVEDEVPOLL" @@ -499,10 +500,14 @@ case "$use_openssl" in AC_MSG_RESULT(no) DST_OPENSSL_INC="" USE_OPENSSL="" + OPENSSLLINKOBJS="" + OPENSSLLINKSRCS="" ;; auto) DST_OPENSSL_INC="" USE_OPENSSL="" + OPENSSLLINKOBJS="" + OPENSSLLINKSRCS="" AC_MSG_ERROR( [OpenSSL was not found in any of $openssldirs; use --with-openssl=/path If you don't want OpenSSL, use --without-openssl]) @@ -647,6 +652,8 @@ esac AC_CHECK_FUNCS(EVP_sha256 EVP_sha512) CFLAGS="$saved_cflags" LIBS="$saved_libs" + OPENSSLLINKOBJS='${OPENSSLLINKOBJS}' + OPENSSLLINKSRCS='${OPENSSLLINKSRCS}' ;; esac @@ -658,6 +665,8 @@ esac AC_SUBST(USE_OPENSSL) AC_SUBST(DST_OPENSSL_INC) +AC_SUBST(OPENSSLLINKOBJS) +AC_SUBST(OPENSSLLINKSRCS) DNS_CRYPTO_LIBS="$DNS_CRYPTO_LIBS $DNS_OPENSSL_LIBS" # @@ -722,6 +731,13 @@ case "$use_gssapi" in AC_MSG_ERROR([gssapi.h not found]) fi + AC_CHECK_HEADERS(krb5.h krb5/krb5.h kerberosv5/krb5.h, + [ISC_PLATFORM_KRB5HEADER="#define ISC_PLATFORM_KRB5HEADER <$ac_header>"]) + + if test "$ISC_PLATFORM_KRB5HEADER" = ""; then + AC_MSG_ERROR([krb5.h not found]) + fi + CPPFLAGS="$saved_cppflags" # @@ -752,7 +768,7 @@ case "$use_gssapi" in "-lgssapi" \ "-lgssapi -lkrb5 -ldes -lcrypt -lasn1 -lroken -lcom_err" \ "-lgssapi -lkrb5 -lcrypto -lcrypt -lasn1 -lroken -lcom_err" \ - "-lgss" + "-lgss -lkrb5" do # Note that this does not include $saved_libs, because # on FreeBSD machines this configure script has added @@ -761,7 +777,7 @@ case "$use_gssapi" in # when you are trying to build with KTH in /usr/lib. LIBS="-L$use_gssapi/lib $TRY_LIBS" AC_MSG_CHECKING(linking as $TRY_LIBS) - AC_TRY_LINK( , [gss_acquire_cred();], + AC_TRY_LINK( , [gss_acquire_cred();krb5_init_context()], gssapi_linked=yes, gssapi_linked=no) case $gssapi_linked in yes) AC_MSG_RESULT(yes); break ;; @@ -823,6 +839,7 @@ esac AC_SUBST(ISC_PLATFORM_HAVEGSSAPI) AC_SUBST(ISC_PLATFORM_GSSAPIHEADER) +AC_SUBST(ISC_PLATFORM_KRB5HEADER) AC_SUBST(USE_GSSAPI) AC_SUBST(DST_GSSAPI_INC) @@ -922,6 +939,8 @@ then fi ALWAYS_DEFINES="-D_REENTRANT" ISC_PLATFORM_USETHREADS="#define ISC_PLATFORM_USETHREADS 1" + THREADOPTOBJS='${THREADOPTOBJS}' + THREADOPTSRCS='${THREADOPTSRCS}' thread_dir=pthreads # # We'd like to use sigwait() too @@ -1000,11 +1019,15 @@ then else ISC_PLATFORM_USETHREADS="#undef ISC_PLATFORM_USETHREADS" thread_dir=nothreads + THREADOPTOBJS="" + THREADOPTSRCS="" ALWAYS_DEFINES="" fi AC_SUBST(ALWAYS_DEFINES) AC_SUBST(ISC_PLATFORM_USETHREADS) +AC_SUBST(THREADOPTOBJS) +AC_SUBST(THREADOPTSRCS) ISC_THREAD_DIR=$thread_dir AC_SUBST(ISC_THREAD_DIR) @@ -1100,7 +1123,7 @@ IRIX_DNSSEC_WARNINGS_HACK="" if test "X$GCC" = "Xyes"; then AC_MSG_CHECKING(if "$CC" supports -fno-strict-aliasing) SAVE_CFLAGS=$CFLAGS - CFLAGS=-fno-strict-aliasing + CFLAGS="$CFLAGS -fno-strict-aliasing" AC_TRY_COMPILE(,, [FNOSTRICTALIASING=yes],[FNOSTRICTALIASING=no]) CFLAGS=$SAVE_CFLAGS if test "$FNOSTRICTALIASING" = "yes"; then @@ -2252,6 +2275,8 @@ case "$enable_atomic" in use_atomic=yes]) ] ) + else + use_atomic=yes fi ;; *) @@ -2298,7 +2323,7 @@ main() { alpha*-*) arch=alpha ;; - powerpc-*) + powerpc-*|powerpc64-*) arch=powerpc ;; mips-*|mipsel-*|mips64-*|mips64el-*) @@ -2771,6 +2796,7 @@ DLZ_DRIVER_INCLUDES="" DLZ_DRIVER_LIBS="" DLZ_DRIVER_SRCS="" DLZ_DRIVER_OBJS="" +DLZ_SYSTEM_TEST="" sinclude(contrib/dlz/config.dlz.in) @@ -2792,6 +2818,7 @@ AC_SUBST(DLZ_DRIVER_INCLUDES) AC_SUBST(DLZ_DRIVER_LIBS) AC_SUBST(DLZ_DRIVER_SRCS) AC_SUBST(DLZ_DRIVER_OBJS) +AC_SUBST(DLZ_SYSTEM_TEST) AC_SUBST_FILE(DLZ_DRIVER_RULES) if test "$cross_compiling" = "yes"; then @@ -2980,6 +3007,7 @@ AC_CONFIG_FILES([ bin/tests/timers/Makefile bin/tests/dst/Makefile bin/tests/mem/Makefile + bin/tests/hashes/Makefile bin/tests/net/Makefile bin/tests/sockaddr/Makefile bin/tests/system/Makefile @@ -3008,6 +3036,18 @@ AC_CONFIG_FILES([ AC_OUTPUT +# +# Now that the Makefiles exist we can ensure that everything is rebuilt. +# +AC_ARG_WITH(make-clean, +[ --with-make-clean Run "make clean" at end of configure [[yes|no]].], + make_clean="$withval", make_clean="yes") +case "$make_clean" in +yes) + make clean + ;; +esac + if test "X$USE_OPENSSL" = "X"; then cat << \EOF BIND is being built without OpenSSL. This means it will not have DNSSEC support. |
