- Fix broken CFLAGS handling during search for OpenSSL. Fixes va_list

   problems with gcc/Solaris.

diff --git a/ChangeLog b/ChangeLog
index 1aa93928265f60ea1d49c594a2460f8d1776a7a5..0fbe547389ae21c8abc6a22962320f6a5a14a4d6 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+20000315
+ - Fix broken CFLAGS handling during search for OpenSSL. Fixes va_list
+   problems with gcc/Solaris.
+
 20000314
  - Include macro for IN6_IS_ADDR_V4MAPPED. Report from 
    peter@frontierflying.com

diff --git a/configure.in b/configure.in
index 8f1eb973bf2e027a13028ac362f870e3d671a371..c643d9e54252418c6958d36bd4c162d65a37af5e 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -158,6 +158,7 @@ AC_ARG_WITH(ssl-dir,
 )
 
 saved_LIBS="$LIBS"
+saved_LDFLAGS="$LDFLAGS"
 saved_CFLAGS="$CFLAGS"
 if test "x$prefix" != "xNONE" ; then
        tryssldir="$tryssldir $prefix"
@@ -165,19 +166,21 @@ fi
 AC_MSG_CHECKING([for OpenSSL/SSLeay directory])
 for ssldir in "" $tryssldir /usr/local/openssl /usr/lib/openssl /usr/local/ssl /usr/lib/ssl /usr/local /usr/pkg /opt /opt/openssl ; do
        if test ! -z "$ssldir" ; then
-               LIBS="$saved_LIBS -L$ssldir/lib -L$ssldir -lcrypto"
-               CFLAGS="$CFLAGS -I$ssldir/include"
-               if test "x$need_dash_r" = "x1" ; then
-                       LIBS="$LIBS -R$ssldir/lib -L$ssldir"
+               LDFLAGS="$saved_LDFLAGS -L$ssldir/lib -L$ssldir"
+               CFLAGS="$saved_CFLAGS -I$ssldir/include"
+               if test ! -z "$need_dash_r" ; then
+                       LDFLAGS="$LDFLAGS -R$ssldir/lib -R$ssldir"
                fi
        else
-               LIBS="$saved_LIBS -lcrypto"
+               LDFLAGS="$saved_LDFLAGS"
        fi
 
        for WANTS_RSAREF in "" 1 ; do
                
-               if test ! -z "$WANTS_RSAREF" ; then
-                       LIBS="$LIBS -lRSAglue -lrsaref"
+               if test -z "$WANTS_RSAREF" ; then
+                       LIBS="$saved_LIBS -lcrypto"
+               else
+                       LIBS="$saved_LIBS -lcrypto -lRSAglue -lrsaref"
                fi
 
                AC_TRY_RUN(
@@ -225,15 +228,16 @@ fi
 if test -z "$ssldir" ; then
        ssldir="(system)"
 else
-       CFLAGS="$CFLAGS -I$ssldir/include"
-       LDFLAGS="$LDFLAGS -L$ssldir/lib"
-       if test "x$need_dash_r" = "x1" ; then
-               LDFLAGS="$LDFLAGS -R$ssldir"
+       CFLAGS="$saved_CFLAGS -I$ssldir/include"
+       LDFLAGS="$saved_LDFLAGS -L$ssldir/lib -L$ssldir"
+       if test ! -z "$need_dash_r" ; then
+               LDFLAGS="$LDFLAGS -R$ssldir/lib -R$ssldir"
        fi
 fi
-LIBS="$saved_LIBS -lcrypto"
-if test ! -z "$WANTS_RSAREF" ; then
-       LIBS="$LIBS -lRSAglue -lrsaref"
+if test -z "$WANTS_RSAREF" ; then
+       LIBS="$saved_LIBS -lcrypto"
+else
+       LIBS="$saved_LIBS -lcrypto -lRSAglue -lrsaref"
 fi
 AC_MSG_RESULT($ssldir)