1692. [bug] Don't set -I, -L and -R flags when librcypto is in

                        /usr/lib. [RT #11971]

diff --git a/CHANGES b/CHANGES
index 792a9d40e26beaa18582d3ba33bde375d58fd551..cf8a54129000ccc905454a28b175451909fbf7b2 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,6 @@
+1692.  [bug]           Don't set -I, -L and -R flags when librcypto is in
+                       /usr/lib. [RT #11971]
+
 1691.  [bug]           sdb's attachversion was not complete. [RT #11990]
 
 1690.  [bug]           Delay detaching view from the client until UPDATE

diff --git a/configure b/configure
index d05006f22304989ee589f9cdf0bec35d03b2fde7..123279c6a49f3ad5c98d0ee497b1de241c6bb822 100755 (executable)
--- a/configure
+++ b/configure
@@ -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.343 2004/07/01 00:22:29 marka Exp $
+# $Id: configure,v 1.344 2004/07/23 04:35:08 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.359 .
+# From configure.in Revision: 1.360 .
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.59.
 #
@@ -4653,21 +4653,29 @@ echo "$as_me: error: OpenSSL was not found in any of $openssldirs; use --with-op
    { (exit 1); exit 1; }; }
                        elif test "$use_openssl" = "auto"
                        then
+                               DST_OPENSSL_INC=""
+                               USE_OPENSSL=""
                                echo "$as_me:$LINENO: result: not found" >&5
 echo "${ECHO_T}not found" >&6
                                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
                echo "$as_me:$LINENO: result: using openssl from $use_openssl/lib and $use_openssl/include" >&5
 echo "${ECHO_T}using openssl from $use_openssl/lib and $use_openssl/include" >&6
 
@@ -7834,7 +7842,7 @@ ia64-*-hpux*)
   ;;
 *-*-irix6*)
   # Find out which ABI we are using.
-  echo '#line 7837 "configure"' > conftest.$ac_ext
+  echo '#line 7845 "configure"' > conftest.$ac_ext
   if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
@@ -8824,7 +8832,7 @@ fi
 
 
 # Provide some information about the compiler.
-echo "$as_me:8827:" \
+echo "$as_me:8835:" \
      "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
@@ -9862,11 +9870,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:9865: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:9873: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:9869: \$? = $ac_status" >&5
+   echo "$as_me:9877: \$? = $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
@@ -10095,11 +10103,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:10098: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:10106: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:10102: \$? = $ac_status" >&5
+   echo "$as_me:10110: \$? = $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
@@ -10155,11 +10163,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:10158: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:10166: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:10162: \$? = $ac_status" >&5
+   echo "$as_me:10170: \$? = $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
@@ -12339,7 +12347,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 12342 "configure"
+#line 12350 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -12437,7 +12445,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 12440 "configure"
+#line 12448 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -14620,11 +14628,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:14623: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:14631: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:14627: \$? = $ac_status" >&5
+   echo "$as_me:14635: \$? = $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
@@ -14680,11 +14688,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:14683: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:14691: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:14687: \$? = $ac_status" >&5
+   echo "$as_me:14695: \$? = $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
@@ -16041,7 +16049,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 16044 "configure"
+#line 16052 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -16139,7 +16147,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 16142 "configure"
+#line 16150 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -16966,11 +16974,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:16969: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:16977: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:16973: \$? = $ac_status" >&5
+   echo "$as_me:16981: \$? = $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
@@ -17026,11 +17034,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:17029: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:17037: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:17033: \$? = $ac_status" >&5
+   echo "$as_me:17041: \$? = $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
@@ -19064,11 +19072,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:19067: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:19075: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:19071: \$? = $ac_status" >&5
+   echo "$as_me:19079: \$? = $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
@@ -19297,11 +19305,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:19300: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:19308: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:19304: \$? = $ac_status" >&5
+   echo "$as_me:19312: \$? = $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
@@ -19357,11 +19365,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:19360: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:19368: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:19364: \$? = $ac_status" >&5
+   echo "$as_me:19372: \$? = $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
@@ -21541,7 +21549,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 21544 "configure"
+#line 21552 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -21639,7 +21647,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 21642 "configure"
+#line 21650 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H

diff --git a/configure.in b/configure.in
index ce0744c7a6a96cb2ce1bfc5998a56dac1f6926f9..f01e72a2aefc8eb3cc1fc3a181908ca45a00054e 100644 (file)
--- 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.359 $)
+AC_REVISION($Revision: 1.360 $)
 
 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"