diff options
| -rw-r--r-- | NEWS | 2 | ||||
| -rw-r--r-- | configure.ac | 5 |
2 files changed, 5 insertions, 2 deletions
@@ -96,6 +96,8 @@ removed from a 6.5.0 or newer release.) fetchmail-6.4.31 (not yet release): # BUG FIXES: +* Try to fix ./configure --with-ssl=... for systems that have multiple OpenSSL + versions installed. Issues reported by Dennis Putnam. * The netrc parser now reports its errors to syslog or logfile when appropriate, previously it would always log to stderr. * Add error checking to .netrc parser. diff --git a/configure.ac b/configure.ac index 30530060..fff602fe 100644 --- a/configure.ac +++ b/configure.ac @@ -817,7 +817,7 @@ else then ### ssl.h found under openssl. Use openssl configuration preferentially, AC_MSG_NOTICE(Enabling OpenSSL support in $with_ssl.) - test "$with_ssl" != "/usr" && CFLAGS="$CFLAGS -I$with_ssl/include" LDFLAGS="$LDFLAGS -L$with_ssl/lib" + test "$with_ssl" != "/usr" && CFLAGS="$CFLAGS -I$with_ssl/include" LIBS="-L$with_ssl/lib $LIBS" ### In Red Hat 9, this file includes a reference to <krb5.h>, so we ### force the Kerberos directory onto the include path so it will build. CFLAGS="$CFLAGS -I/usr/kerberos/include" @@ -835,6 +835,7 @@ else found=0 test -n "$PKG_CONFIG" && for i in $modules ; do AS_MESSAGE([SSL-check: trying pkg-config for $i]) + AS_MESSAGE([NOTE: libdir=$libdir]) PKG_CHECK_MODULES([SSL],[$i],[ set -- $SSL_LIBS while test $# -ge 1 ; do @@ -845,7 +846,7 @@ else done CPPFLAGS="$SSL_CFLAGS $CPPFLAGS" AS_MESSAGE([From pkg-config: $SSL_LIBS]) - AC_LIB_LINKFLAGS_FROM_LIBS([SSL_LDFLAGS],[$SSL_LIBS]) + AC_LIB_LINKFLAGS_FROM_LIBS([SSL_LDFLAGS],[$LIBS $SSL_LIBS]) AS_MESSAGE([derived LDFLAGS: $SSL_LDFLAGS]) LDFLAGS="$SSL_LDFLAGS $LDFLAGS" found=1 |