mirror of
https://github.com/isc-projects/bind9.git
synced 2026-06-14 00:20:00 -04:00
1663. [func] Look for OpenSSL by default.
This commit is contained in:
Mark Andrews
parent
e180037bc1
commit
3d8dfd44a3
3 changed files with 45 additions and 36 deletions
2
CHANGES
2
CHANGES
|
|
@ -4,7 +4,7 @@
|
|||
|
||||
1664. [bug] nsupdate needed KEY for SIG(0), not DNSKEY.
|
||||
|
||||
1663. [placeholder] rt11600
|
||||
1663. [func] Look for OpenSSL by default.
|
||||
|
||||
1662. [bug] Change #1658 failed to change one use of 'type'
|
||||
to 'keytype'.
|
||||
|
|
|
|||
69
configure
vendored
69
configure
vendored
|
|
@ -14,7 +14,7 @@
|
|||
# OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
|
||||
# PERFORMANCE OF THIS SOFTWARE.
|
||||
#
|
||||
# $Id: configure,v 1.341 2004/05/21 08:15:37 marka Exp $
|
||||
# $Id: configure,v 1.342 2004/06/18 01:37:34 marka Exp $
|
||||
#
|
||||
# Portions Copyright (C) 1996-2001 Nominum, Inc.
|
||||
#
|
||||
|
|
@ -29,7 +29,7 @@
|
|||
# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
|
||||
# ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
|
||||
# OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
|
||||
# From configure.in Revision: 1.357 .
|
||||
# From configure.in Revision: 1.358 .
|
||||
# Guess values for system-dependent variables and create Makefiles.
|
||||
# Generated by GNU Autoconf 2.59.
|
||||
#
|
||||
|
|
@ -4621,7 +4621,7 @@ if test "${with_openssl+set}" = set; then
|
|||
withval="$with_openssl"
|
||||
use_openssl="$withval"
|
||||
else
|
||||
use_openssl="no"
|
||||
use_openssl="auto"
|
||||
fi;
|
||||
|
||||
case "$use_openssl" in
|
||||
|
|
@ -4632,7 +4632,7 @@ echo "${ECHO_T}no" >&6
|
|||
USE_OPENSSL=""
|
||||
;;
|
||||
*)
|
||||
if test "$use_openssl" = "yes"
|
||||
if test "$use_openssl" = "yes" -o "$use_openssl" = "auto"
|
||||
then
|
||||
# User did not specify a path - guess it
|
||||
openssldirs="/usr /usr/local /usr/local/ssl /usr/pkg"
|
||||
|
|
@ -4651,6 +4651,11 @@ echo "${ECHO_T}not found" >&6
|
|||
{ { echo "$as_me:$LINENO: error: OpenSSL was not found in any of $openssldirs; use --with-openssl=/path" >&5
|
||||
echo "$as_me: error: OpenSSL was not found in any of $openssldirs; use --with-openssl=/path" >&2;}
|
||||
{ (exit 1); exit 1; }; }
|
||||
elif test "$use_openssl" = "auto"
|
||||
then
|
||||
echo "$as_me:$LINENO: result: not found" >&5
|
||||
echo "${ECHO_T}not found" >&6
|
||||
break
|
||||
fi
|
||||
fi
|
||||
USE_OPENSSL='-DOPENSSL'
|
||||
|
|
@ -7829,7 +7834,7 @@ ia64-*-hpux*)
|
|||
;;
|
||||
*-*-irix6*)
|
||||
# Find out which ABI we are using.
|
||||
echo '#line 7832 "configure"' > conftest.$ac_ext
|
||||
echo '#line 7837 "configure"' > conftest.$ac_ext
|
||||
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
|
||||
(eval $ac_compile) 2>&5
|
||||
ac_status=$?
|
||||
|
|
@ -8819,7 +8824,7 @@ fi
|
|||
|
||||
|
||||
# Provide some information about the compiler.
|
||||
echo "$as_me:8822:" \
|
||||
echo "$as_me:8827:" \
|
||||
"checking for Fortran 77 compiler version" >&5
|
||||
ac_compiler=`set X $ac_compile; echo $2`
|
||||
{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5
|
||||
|
|
@ -9857,11 +9862,11 @@ else
|
|||
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
|
||||
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
|
||||
-e 's:$: $lt_compiler_flag:'`
|
||||
(eval echo "\"\$as_me:9860: $lt_compile\"" >&5)
|
||||
(eval echo "\"\$as_me:9865: $lt_compile\"" >&5)
|
||||
(eval "$lt_compile" 2>conftest.err)
|
||||
ac_status=$?
|
||||
cat conftest.err >&5
|
||||
echo "$as_me:9864: \$? = $ac_status" >&5
|
||||
echo "$as_me:9869: \$? = $ac_status" >&5
|
||||
if (exit $ac_status) && test -s "$ac_outfile"; then
|
||||
# The compiler can only warn and ignore the option if not recognized
|
||||
# So say no if there are warnings
|
||||
|
|
@ -10090,11 +10095,11 @@ else
|
|||
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
|
||||
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
|
||||
-e 's:$: $lt_compiler_flag:'`
|
||||
(eval echo "\"\$as_me:10093: $lt_compile\"" >&5)
|
||||
(eval echo "\"\$as_me:10098: $lt_compile\"" >&5)
|
||||
(eval "$lt_compile" 2>conftest.err)
|
||||
ac_status=$?
|
||||
cat conftest.err >&5
|
||||
echo "$as_me:10097: \$? = $ac_status" >&5
|
||||
echo "$as_me:10102: \$? = $ac_status" >&5
|
||||
if (exit $ac_status) && test -s "$ac_outfile"; then
|
||||
# The compiler can only warn and ignore the option if not recognized
|
||||
# So say no if there are warnings
|
||||
|
|
@ -10150,11 +10155,11 @@ else
|
|||
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
|
||||
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
|
||||
-e 's:$: $lt_compiler_flag:'`
|
||||
(eval echo "\"\$as_me:10153: $lt_compile\"" >&5)
|
||||
(eval echo "\"\$as_me:10158: $lt_compile\"" >&5)
|
||||
(eval "$lt_compile" 2>out/conftest.err)
|
||||
ac_status=$?
|
||||
cat out/conftest.err >&5
|
||||
echo "$as_me:10157: \$? = $ac_status" >&5
|
||||
echo "$as_me:10162: \$? = $ac_status" >&5
|
||||
if (exit $ac_status) && test -s out/conftest2.$ac_objext
|
||||
then
|
||||
# The compiler can only warn and ignore the option if not recognized
|
||||
|
|
@ -12334,7 +12339,7 @@ else
|
|||
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
|
||||
lt_status=$lt_dlunknown
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 12337 "configure"
|
||||
#line 12342 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
#if HAVE_DLFCN_H
|
||||
|
|
@ -12432,7 +12437,7 @@ else
|
|||
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
|
||||
lt_status=$lt_dlunknown
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 12435 "configure"
|
||||
#line 12440 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
#if HAVE_DLFCN_H
|
||||
|
|
@ -14615,11 +14620,11 @@ else
|
|||
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
|
||||
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
|
||||
-e 's:$: $lt_compiler_flag:'`
|
||||
(eval echo "\"\$as_me:14618: $lt_compile\"" >&5)
|
||||
(eval echo "\"\$as_me:14623: $lt_compile\"" >&5)
|
||||
(eval "$lt_compile" 2>conftest.err)
|
||||
ac_status=$?
|
||||
cat conftest.err >&5
|
||||
echo "$as_me:14622: \$? = $ac_status" >&5
|
||||
echo "$as_me:14627: \$? = $ac_status" >&5
|
||||
if (exit $ac_status) && test -s "$ac_outfile"; then
|
||||
# The compiler can only warn and ignore the option if not recognized
|
||||
# So say no if there are warnings
|
||||
|
|
@ -14675,11 +14680,11 @@ else
|
|||
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
|
||||
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
|
||||
-e 's:$: $lt_compiler_flag:'`
|
||||
(eval echo "\"\$as_me:14678: $lt_compile\"" >&5)
|
||||
(eval echo "\"\$as_me:14683: $lt_compile\"" >&5)
|
||||
(eval "$lt_compile" 2>out/conftest.err)
|
||||
ac_status=$?
|
||||
cat out/conftest.err >&5
|
||||
echo "$as_me:14682: \$? = $ac_status" >&5
|
||||
echo "$as_me:14687: \$? = $ac_status" >&5
|
||||
if (exit $ac_status) && test -s out/conftest2.$ac_objext
|
||||
then
|
||||
# The compiler can only warn and ignore the option if not recognized
|
||||
|
|
@ -16036,7 +16041,7 @@ else
|
|||
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
|
||||
lt_status=$lt_dlunknown
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 16039 "configure"
|
||||
#line 16044 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
#if HAVE_DLFCN_H
|
||||
|
|
@ -16134,7 +16139,7 @@ else
|
|||
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
|
||||
lt_status=$lt_dlunknown
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 16137 "configure"
|
||||
#line 16142 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
#if HAVE_DLFCN_H
|
||||
|
|
@ -16961,11 +16966,11 @@ else
|
|||
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
|
||||
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
|
||||
-e 's:$: $lt_compiler_flag:'`
|
||||
(eval echo "\"\$as_me:16964: $lt_compile\"" >&5)
|
||||
(eval echo "\"\$as_me:16969: $lt_compile\"" >&5)
|
||||
(eval "$lt_compile" 2>conftest.err)
|
||||
ac_status=$?
|
||||
cat conftest.err >&5
|
||||
echo "$as_me:16968: \$? = $ac_status" >&5
|
||||
echo "$as_me:16973: \$? = $ac_status" >&5
|
||||
if (exit $ac_status) && test -s "$ac_outfile"; then
|
||||
# The compiler can only warn and ignore the option if not recognized
|
||||
# So say no if there are warnings
|
||||
|
|
@ -17021,11 +17026,11 @@ else
|
|||
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
|
||||
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
|
||||
-e 's:$: $lt_compiler_flag:'`
|
||||
(eval echo "\"\$as_me:17024: $lt_compile\"" >&5)
|
||||
(eval echo "\"\$as_me:17029: $lt_compile\"" >&5)
|
||||
(eval "$lt_compile" 2>out/conftest.err)
|
||||
ac_status=$?
|
||||
cat out/conftest.err >&5
|
||||
echo "$as_me:17028: \$? = $ac_status" >&5
|
||||
echo "$as_me:17033: \$? = $ac_status" >&5
|
||||
if (exit $ac_status) && test -s out/conftest2.$ac_objext
|
||||
then
|
||||
# The compiler can only warn and ignore the option if not recognized
|
||||
|
|
@ -19059,11 +19064,11 @@ else
|
|||
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
|
||||
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
|
||||
-e 's:$: $lt_compiler_flag:'`
|
||||
(eval echo "\"\$as_me:19062: $lt_compile\"" >&5)
|
||||
(eval echo "\"\$as_me:19067: $lt_compile\"" >&5)
|
||||
(eval "$lt_compile" 2>conftest.err)
|
||||
ac_status=$?
|
||||
cat conftest.err >&5
|
||||
echo "$as_me:19066: \$? = $ac_status" >&5
|
||||
echo "$as_me:19071: \$? = $ac_status" >&5
|
||||
if (exit $ac_status) && test -s "$ac_outfile"; then
|
||||
# The compiler can only warn and ignore the option if not recognized
|
||||
# So say no if there are warnings
|
||||
|
|
@ -19292,11 +19297,11 @@ else
|
|||
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
|
||||
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
|
||||
-e 's:$: $lt_compiler_flag:'`
|
||||
(eval echo "\"\$as_me:19295: $lt_compile\"" >&5)
|
||||
(eval echo "\"\$as_me:19300: $lt_compile\"" >&5)
|
||||
(eval "$lt_compile" 2>conftest.err)
|
||||
ac_status=$?
|
||||
cat conftest.err >&5
|
||||
echo "$as_me:19299: \$? = $ac_status" >&5
|
||||
echo "$as_me:19304: \$? = $ac_status" >&5
|
||||
if (exit $ac_status) && test -s "$ac_outfile"; then
|
||||
# The compiler can only warn and ignore the option if not recognized
|
||||
# So say no if there are warnings
|
||||
|
|
@ -19352,11 +19357,11 @@ else
|
|||
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
|
||||
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
|
||||
-e 's:$: $lt_compiler_flag:'`
|
||||
(eval echo "\"\$as_me:19355: $lt_compile\"" >&5)
|
||||
(eval echo "\"\$as_me:19360: $lt_compile\"" >&5)
|
||||
(eval "$lt_compile" 2>out/conftest.err)
|
||||
ac_status=$?
|
||||
cat out/conftest.err >&5
|
||||
echo "$as_me:19359: \$? = $ac_status" >&5
|
||||
echo "$as_me:19364: \$? = $ac_status" >&5
|
||||
if (exit $ac_status) && test -s out/conftest2.$ac_objext
|
||||
then
|
||||
# The compiler can only warn and ignore the option if not recognized
|
||||
|
|
@ -21536,7 +21541,7 @@ else
|
|||
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
|
||||
lt_status=$lt_dlunknown
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 21539 "configure"
|
||||
#line 21544 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
#if HAVE_DLFCN_H
|
||||
|
|
@ -21634,7 +21639,7 @@ else
|
|||
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
|
||||
lt_status=$lt_dlunknown
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 21637 "configure"
|
||||
#line 21642 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
#if HAVE_DLFCN_H
|
||||
|
|
|
|||
10
configure.in
10
configure.in
|
|
@ -18,7 +18,7 @@ AC_DIVERT_PUSH(1)dnl
|
|||
esyscmd([sed "s/^/# /" COPYRIGHT])dnl
|
||||
AC_DIVERT_POP()dnl
|
||||
|
||||
AC_REVISION($Revision: 1.357 $)
|
||||
AC_REVISION($Revision: 1.358 $)
|
||||
|
||||
AC_INIT(lib/dns/name.c)
|
||||
AC_PREREQ(2.13)
|
||||
|
|
@ -343,7 +343,7 @@ AC_MSG_CHECKING(for OpenSSL library)
|
|||
AC_ARG_WITH(openssl,
|
||||
[ --with-openssl[=PATH] Build with OpenSSL [yes|no|path].
|
||||
(Required for DNSSEC)],
|
||||
use_openssl="$withval", use_openssl="no")
|
||||
use_openssl="$withval", use_openssl="auto")
|
||||
|
||||
case "$use_openssl" in
|
||||
no)
|
||||
|
|
@ -352,7 +352,7 @@ case "$use_openssl" in
|
|||
USE_OPENSSL=""
|
||||
;;
|
||||
*)
|
||||
if test "$use_openssl" = "yes"
|
||||
if test "$use_openssl" = "yes" -o "$use_openssl" = "auto"
|
||||
then
|
||||
# User did not specify a path - guess it
|
||||
openssldirs="/usr /usr/local /usr/local/ssl /usr/pkg"
|
||||
|
|
@ -369,6 +369,10 @@ case "$use_openssl" in
|
|||
AC_MSG_RESULT(not found)
|
||||
AC_MSG_ERROR(
|
||||
[OpenSSL was not found in any of $openssldirs; use --with-openssl=/path])
|
||||
elif test "$use_openssl" = "auto"
|
||||
then
|
||||
AC_MSG_RESULT(not found)
|
||||
break
|
||||
fi
|
||||
fi
|
||||
USE_OPENSSL='-DOPENSSL'
|
||||
|
|
|
|||
Loading…
Reference in a new issue