Beside a missing , in the inner autoconf test, it looks like doing a

check twice with AC_CHECK_LIB (without and with OTHER-LIBRARIES) doesn't
work due to caching. So give up and just check separately for
-lssl/-lcrypto and hope for the best.

2 files changed, 18 insertions, 24 deletions

diff --git a/net/fetch/files/configure b/net/fetch/files/configure
index 0fe69077f15..87eb7ef0d5c 100755
--- a/net/fetch/files/configure
+++ b/net/fetch/files/configure
@@ -3626,13 +3626,13 @@ _ACEOF
 
 fi
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for fetchGet in -lfetch" >&5
-$as_echo_n "checking for fetchGet in -lfetch... " >&6; }
-if test "${ac_cv_lib_fetch_fetchGet+set}" = set; then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for SSL_read in -lssl" >&5
+$as_echo_n "checking for SSL_read in -lssl... " >&6; }
+if test "${ac_cv_lib_ssl_SSL_read+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
-LIBS="-lfetch  $LIBS"
+LIBS="-lssl -lcrypto $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
@@ -3642,36 +3642,36 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 #ifdef __cplusplus
 extern "C"
 #endif
-char fetchGet ();
+char SSL_read ();
 int
 main ()
 {
-return fetchGet ();
+return SSL_read ();
   ;
   return 0;
 }
 _ACEOF
 if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_lib_fetch_fetchGet=yes
+  ac_cv_lib_ssl_SSL_read=yes
 else
-  ac_cv_lib_fetch_fetchGet=no
+  ac_cv_lib_ssl_SSL_read=no
 fi
 rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_fetch_fetchGet" >&5
-$as_echo "$ac_cv_lib_fetch_fetchGet" >&6; }
-if test "x$ac_cv_lib_fetch_fetchGet" = x""yes; then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ssl_SSL_read" >&5
+$as_echo "$ac_cv_lib_ssl_SSL_read" >&6; }
+if test "x$ac_cv_lib_ssl_SSL_read" = x""yes; then :
   cat >>confdefs.h <<_ACEOF
-#define HAVE_LIBFETCH 1
+#define HAVE_LIBSSL 1
 _ACEOF
 
-  LIBS="-lfetch $LIBS"
+  LIBS="-lssl $LIBS"
 
-else
+fi
 
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for fetchGet in -lfetch" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for fetchGet in -lfetch" >&5
 $as_echo_n "checking for fetchGet in -lfetch... " >&6; }
 if test "${ac_cv_lib_fetch_fetchGet+set}" = set; then :
   $as_echo_n "(cached) " >&6
@@ -3714,11 +3714,6 @@ _ACEOF
 
   LIBS="-lfetch $LIBS"
 
-else
-   -lssl -lcrypto
-fi
-
-
 fi
 
 
diff --git a/net/fetch/files/configure.ac b/net/fetch/files/configure.ac
index aed52104e5d..bf3d8d93989 100644
--- a/net/fetch/files/configure.ac
+++ b/net/fetch/files/configure.ac
@@ -1,4 +1,4 @@
-dnl $NetBSD: configure.ac,v 1.2 2009/11/19 22:55:53 joerg Exp $
+dnl $NetBSD: configure.ac,v 1.3 2010/01/04 16:50:43 joerg Exp $
 
 dnl Process this file with autoconf to produce a configure script.
 AC_PREREQ(2.52)
@@ -15,9 +15,8 @@ AC_TYPE_INTMAX_T
 AC_CHECK_FUNCS([getpass getpassphrase setproctitle])
 AC_CHECK_LIB(socket, socket)
 AC_CHECK_LIB(nsl, gethostbyname)
-AC_CHECK_LIB(fetch, fetchGet, [], [
-    AC_CHECK_LIB(fetch, fetchGet, [], [] [-lssl -lcrypto])
-])
+AC_CHECK_LIB(ssl, SSL_read, [], [], [-lcrypto])
+AC_CHECK_LIB(fetch, fetchGet)
 
 case "$host_os" in
 netbsd)