diff options
Diffstat (limited to 'configure.in')
| -rw-r--r-- | configure.in | 29 |
1 files changed, 16 insertions, 13 deletions
diff --git a/configure.in b/configure.in index 691faca1..6f4618ca 100644 --- a/configure.in +++ b/configure.in @@ -3325,7 +3325,7 @@ if test "$atf" = yes; then /*) ;; *) srcdir="../../$srcdir";; esac - ${SHELL} ${srcdir}${srcdir:+/unit/atf-src/}./configure MISSING=: --prefix $atfdir; + ${SHELL} "${srcdir}${srcdir:+/unit/atf-src/}./configure" MISSING=: --prefix $atfdir; ) ], [atfdir=`pwd`/unit/atf]) AC_MSG_RESULT(building ATF from bind9/unit/atf-src) @@ -3383,7 +3383,7 @@ BIND9_MAKE_INCLUDES=$BIND9_TOP_BUILDDIR/make/includes AC_SUBST_FILE(BIND9_MAKE_RULES) BIND9_MAKE_RULES=$BIND9_TOP_BUILDDIR/make/rules -. $srcdir/version +. "$srcdir/version" BIND9_PRODUCT="PRODUCT=\"${PRODUCT}\"" AC_SUBST(BIND9_PRODUCT) BIND9_DESCRIPTION="DESCRIPTION=\"${DESCRIPTION}\"" @@ -3392,10 +3392,13 @@ BIND9_VERSION="VERSION=${MAJORVER}.${MINORVER}${PATCHVER:+.}${PATCHVER}${RELEASE AC_SUBST(BIND9_VERSION) BIND9_SRCID="SRCID=unset" -if test -f $srcdir/srcid; then - . $srcdir/srcid +if test -f "${srcdir}/srcid"; then + . "${srcdir}/srcid" BIND9_SRCID="SRCID=$SRCID" +elif test -d "${srcdir}/.git"; then + BIND9_SRCID="SRCID="`(cd "${srcdir}";git log -n 1 --format=%h)` fi + AC_SUBST(BIND9_SRCID) if test -z "$ac_configure_args"; then @@ -3411,25 +3414,25 @@ BIND9_CONFIGARGS="CONFIGARGS=${BIND9_CONFIGARGS}" AC_SUBST(BIND9_CONFIGARGS) AC_SUBST_FILE(LIBISC_API) -LIBISC_API=$srcdir/lib/isc/api +LIBISC_API="$srcdir/lib/isc/api" AC_SUBST_FILE(LIBISCCC_API) -LIBISCCC_API=$srcdir/lib/isccc/api +LIBISCCC_API="$srcdir/lib/isccc/api" AC_SUBST_FILE(LIBISCCFG_API) -LIBISCCFG_API=$srcdir/lib/isccfg/api +LIBISCCFG_API="$srcdir/lib/isccfg/api" AC_SUBST_FILE(LIBDNS_API) -LIBDNS_API=$srcdir/lib/dns/api +LIBDNS_API="$srcdir/lib/dns/api" AC_SUBST_FILE(LIBBIND9_API) -LIBBIND9_API=$srcdir/lib/bind9/api +LIBBIND9_API="$srcdir/lib/bind9/api" AC_SUBST_FILE(LIBLWRES_API) -LIBLWRES_API=$srcdir/lib/lwres/api +LIBLWRES_API="$srcdir/lib/lwres/api" AC_SUBST_FILE(LIBIRS_API) -LIBIRS_API=$srcdir/lib/irs/api +LIBIRS_API="$srcdir/lib/irs/api" # # Configure any DLZ drivers. @@ -3869,7 +3872,7 @@ test "$want_symtable" = "minimal" && \ echo " Use symbol table for backtrace, named only (--enable-symtable)" test "$want_symtable" = "yes" -o "$want_symtable" = "all" && \ echo " Use symbol table for backtrace, all binaries (--enable-symtable=all)" -test "$use_pkcs11" = "no" || echo " PKCS#11/Cryptoki support (--with-pks11)" +test "$use_pkcs11" = "no" || echo " PKCS#11/Cryptoki support (--with-pkcs11)" # these lines are only printed if run with --enable-full-report @@ -3914,7 +3917,7 @@ test "$enable_filter" = "yes" || \ test "$use_gssapi" = "no" && echo " GSS-API (--with-gssapi)" test "$want_backtrace" = "yes" || \ echo " Print backtrace on crash (--enable-backtrace)" -test "$use_pkcs11" = "no" && echo " PKCS#11/Cryptoki support (--with-pks11)" +test "$use_pkcs11" = "no" && echo " PKCS#11/Cryptoki support (--with-pkcs11)" test "$enable_ipv6" = "no" -o "$found_ipv6" = "no" && \ echo " IPv6 support (--enable-ipv6)" |