diff options
| author | Internet Software Consortium, Inc <@isc.org> | 2007-09-07 14:15:33 -0600 |
|---|---|---|
| committer | LaMont Jones <lamont@debian.org> | 2007-09-07 14:15:33 -0600 |
| commit | fa8ae3c88e6081168d1c17dfa69a06e02d19b510 (patch) | |
| tree | a18e1457bd189423b0be0feb79df1ef2c585926f /configure.in | |
| parent | 79ae91633aed663f46adec15bdb2161c9db6f733 (diff) | |
| download | bind9-fa8ae3c88e6081168d1c17dfa69a06e02d19b510.tar.gz | |
9.3.0rc3
Diffstat (limited to 'configure.in')
| -rw-r--r-- | configure.in | 28 |
1 files changed, 18 insertions, 10 deletions
diff --git a/configure.in b/configure.in index bc040a7d..e51312ee 100644 --- a/configure.in +++ b/configure.in @@ -18,7 +18,7 @@ AC_DIVERT_PUSH(1)dnl esyscmd([sed "s/^/# /" COPYRIGHT])dnl AC_DIVERT_POP()dnl -AC_REVISION($Revision: 1.294.2.23.2.27 $) +AC_REVISION($Revision: 1.294.2.23.2.28 $) AC_INIT(lib/dns/name.c) AC_PREREQ(2.13) @@ -371,20 +371,28 @@ case "$use_openssl" in [OpenSSL was not found in any of $openssldirs; use --with-openssl=/path]) elif test "$use_openssl" = "auto" then + DST_OPENSSL_INC="" + USE_OPENSSL="" AC_MSG_RESULT(not found) break fi fi USE_OPENSSL='-DOPENSSL' - DST_OPENSSL_INC="-I$use_openssl/include" - case $host in - *-solaris*) - DNS_OPENSSL_LIBS="-L$use_openssl/lib -R$use_openssl/lib -lcrypto" - ;; - *) - DNS_OPENSSL_LIBS="-L$use_openssl/lib -lcrypto" - ;; - esac + if test "$use_openssl" = "/usr" + then + DST_OPENSSL_INC="" + DNS_OPENSSL_LIBS="-lcrypto" + else + DST_OPENSSL_INC="-I$use_openssl/include" + case $host in + *-solaris*) + DNS_OPENSSL_LIBS="-L$use_openssl/lib -R$use_openssl/lib -lcrypto" + ;; + *) + DNS_OPENSSL_LIBS="-L$use_openssl/lib -lcrypto" + ;; + esac + fi AC_MSG_RESULT(using openssl from $use_openssl/lib and $use_openssl/include) saved_cflags="$CFLAGS" |