[w3m-dev 03888] autodetect ssl

* acinclude.m4 (AC_W3M_SSL): use SSL_*
* configure.in: move AC_W3M_SSL after AC_W3M_EXTLIBS

2 files changed, 210 insertions, 208 deletions

diff --git a/configure b/configure
index 195036a..f0fa404 100755
--- a/configure
+++ b/configure
@@ -50,10 +50,6 @@ ac_help="$ac_help
 ac_help="$ac_help
   --disable-ipv6		disable IPv6"
 ac_help="$ac_help
-  --with-ssl[=PREFIX]		support https protocol"
-ac_help="$ac_help
-   --disable-sslverify		verify SSL certificate"
-ac_help="$ac_help
   --disable-dict		disable dictionary lookup (see README.dict)"
 ac_help="$ac_help
   --disable-help-cgi		disable help cgi"
@@ -70,6 +66,10 @@ ac_help="$ac_help
 ac_help="$ac_help
   --with-browser=BROWSER	default browser (/usr/bin/mozilla)"
 ac_help="$ac_help
+  --with-ssl[=PREFIX]		support https protocol"
+ac_help="$ac_help
+   --disable-sslverify		verify SSL certificate"
+ac_help="$ac_help
   --with-termlib[=LIBS]		terminal library
 				LIBS is space separated list of:
 				  terminfo mytinfo termcap ncurses curses"
@@ -2053,104 +2053,8 @@ fi
 fi
 
 
-echo $ac_n "checking if SSL is suported""... $ac_c" 1>&6
-echo "configure:2058: checking if SSL is suported" >&5
-# Check whether --with-ssl or --without-ssl was given.
-if test "${with_ssl+set}" = set; then
-  withval="$with_ssl"
-  :
-else
-  with_ssl="yes"
-fi
-
-echo "$ac_t""$with_ssl" 1>&6
-if test x"$with_ssl" != xno; then
-  cat >> confdefs.h <<\EOF
-#define USE_SSL 1
-EOF
-
-  echo $ac_n "checking for SSL library/header""... $ac_c" 1>&6
-echo "configure:2074: checking for SSL library/header" >&5
-  test x"$with_ssl" = xyes && with_ssl="/usr/openssl /usr/ssl /usr /usr/local/openssl /usr/local/ssl /usr/local"
-  echo "$ac_t""$with_ssl" 1>&6
-  for dir in $with_ssl
-  do
-     if test -f "$dir/include/openssl/ssl.h"; then
-        CFLAGS="$CFLAGS -I$dir/include/openssl"
-        if test "$dir" != "/usr"; then
-           CFLAGS="$CFLAGS -I$dir/include"
-        fi
-     elif test "$dir" != "/usr" -a -f "$dir/include/ssl.h"; then
-        CFLAGS="$CFLAGS -I$dir/include"
-     fi
-     if test "$dir" != "/usr" -a -f "$dir/lib/libssl.a"; then
-	W3M_LIBS="$W3M_LIBS -L$dir/lib"
-     fi
-  done
-  echo $ac_n "checking for SSL_new in -lssl""... $ac_c" 1>&6
-echo "configure:2092: checking for SSL_new in -lssl" >&5
-ac_lib_var=`echo ssl'_'SSL_new | sed 'y%./+-%__p_%'`
-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  ac_save_LIBS="$LIBS"
-LIBS="-lssl -lcrypto $LIBS"
-cat > conftest.$ac_ext <<EOF
-#line 2100 "configure"
-#include "confdefs.h"
-/* Override any gcc2 internal prototype to avoid an error.  */
-/* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-char SSL_new();
-
-int main() {
-SSL_new()
-; return 0; }
-EOF
-if { (eval echo configure:2111: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=no"
-fi
-rm -f conftest*
-LIBS="$ac_save_LIBS"
-
-fi
-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-  w3m_ssl="found"; W3M_LIBS="$W3M_LIBS -lssl -lcrypto"
-else
-  echo "$ac_t""no" 1>&6
-w3m_ssl="not found"
-fi
-
-
-  if test x"$w3m_ssl" = xfound; then
-    echo $ac_n "checking if SSL certificate verify is enabled""... $ac_c" 1>&6
-echo "configure:2135: checking if SSL certificate verify is enabled" >&5
-    # Check whether --enable-sslverify or --disable-sslverify was given.
-if test "${enable_sslverify+set}" = set; then
-  enableval="$enable_sslverify"
-  :
-else
-  enable_sslverify="yes"
-fi
-
-    test x"$enable_sslverify" = xyes && cat >> confdefs.h <<\EOF
-#define USE_SSL_VERIFY 1
-EOF
-
-    echo "$ac_t""$enable_sslverify" 1>&6
-  fi
-fi
-
-
 echo $ac_n "checking if dictionary lookup is enabled""... $ac_c" 1>&6
-echo "configure:2154: checking if dictionary lookup is enabled" >&5
+echo "configure:2058: checking if dictionary lookup is enabled" >&5
 # Check whether --enable-dict or --disable-dict was given.
 if test "${enable_dict+set}" = set; then
   enableval="$enable_dict"
@@ -2166,7 +2070,7 @@ EOF
  echo "$ac_t""$enable_dict" 1>&6
 
  echo $ac_n "checking if help cgi is enabled""... $ac_c" 1>&6
-echo "configure:2170: checking if help cgi is enabled" >&5
+echo "configure:2074: checking if help cgi is enabled" >&5
  # Check whether --enable-help_cgi or --disable-help_cgi was given.
 if test "${enable_help_cgi+set}" = set; then
   enableval="$enable_help_cgi"
@@ -2182,7 +2086,7 @@ EOF
  echo "$ac_t""$enable_help_cgi" 1>&6
 
  echo $ac_n "checking if external URI loader is enabled""... $ac_c" 1>&6
-echo "configure:2186: checking if external URI loader is enabled" >&5
+echo "configure:2090: checking if external URI loader is enabled" >&5
  # Check whether --enable-external_uri_loader or --disable-external_uri_loader was given.
 if test "${enable_external_uri_loader+set}" = set; then
   enableval="$enable_external_uri_loader"
@@ -2198,7 +2102,7 @@ EOF
  echo "$ac_t""$enable_external_uri_loader" 1>&6
 
  echo $ac_n "checking if w3mmail is used""... $ac_c" 1>&6
-echo "configure:2202: checking if w3mmail is used" >&5
+echo "configure:2106: checking if w3mmail is used" >&5
  # Check whether --enable-w3mmailer or --disable-w3mmailer was given.
 if test "${enable_w3mmailer+set}" = set; then
   enableval="$enable_w3mmailer"
@@ -2217,7 +2121,7 @@ EOF
  
  migemo_command="migemo -t egrep /usr/local/share/migemo/migemo-dict"
  echo $ac_n "checking if migemo is supported with""... $ac_c" 1>&6
-echo "configure:2221: checking if migemo is supported with" >&5
+echo "configure:2125: checking if migemo is supported with" >&5
  # Check whether --with-migemo or --without-migemo was given.
 if test "${with_migemo+set}" = set; then
   withval="$with_migemo"
@@ -2238,7 +2142,7 @@ EOF
 
 w3m_editor="/usr/bin/vi"
 echo $ac_n "checking which editor is used by default""... $ac_c" 1>&6
-echo "configure:2242: checking which editor is used by default" >&5
+echo "configure:2146: checking which editor is used by default" >&5
 # Check whether --with-editor or --without-editor was given.
 if test "${with_editor+set}" = set; then
   withval="$with_editor"
@@ -2253,7 +2157,7 @@ EOF
 
 w3m_mailer="/usr/bin/mail"
 echo $ac_n "checking which mailer is used by default""... $ac_c" 1>&6
-echo "configure:2257: checking which mailer is used by default" >&5
+echo "configure:2161: checking which mailer is used by default" >&5
 # Check whether --with-mailer or --without-mailer was given.
 if test "${with_mailer+set}" = set; then
   withval="$with_mailer"
@@ -2268,7 +2172,7 @@ EOF
 
 w3m_browser="/usr/bin/mozilla"
 echo $ac_n "checking which external browser is used by default""... $ac_c" 1>&6
-echo "configure:2272: checking which external browser is used by default" >&5
+echo "configure:2176: checking which external browser is used by default" >&5
 # Check whether --with-browser or --without-browser was given.
 if test "${with_browser+set}" = set; then
   withval="$with_browser"
@@ -2285,7 +2189,7 @@ for lib in bsd BSD 44bsd socket nsl dld dl
 do
  lib=$lib
  echo $ac_n "checking for -l$lib""... $ac_c" 1>&6
-echo "configure:2289: checking for -l$lib" >&5
+echo "configure:2193: checking for -l$lib" >&5
  extlib="not found"
  for dir in /lib /usr/lib /usr/local/lib /usr/ucblib /usr/ccslib /usr/ccs/lib
  do
@@ -2298,13 +2202,110 @@ echo "configure:2289: checking for -l$lib" >&5
  echo "$ac_t""$extlib" 1>&6
 done
 
+
+
+echo $ac_n "checking if SSL is suported""... $ac_c" 1>&6
+echo "configure:2209: checking if SSL is suported" >&5
+# Check whether --with-ssl or --without-ssl was given.
+if test "${with_ssl+set}" = set; then
+  withval="$with_ssl"
+  :
+else
+  with_ssl="yes"
+fi
+
+echo "$ac_t""$with_ssl" 1>&6
+if test x"$with_ssl" != xno; then
+  cat >> confdefs.h <<\EOF
+#define USE_SSL 1
+EOF
+
+  echo $ac_n "checking for SSL library/header""... $ac_c" 1>&6
+echo "configure:2225: checking for SSL library/header" >&5
+  test x"$with_ssl" = xyes && with_ssl="/usr/openssl /usr/ssl /usr /usr/local/openssl /usr/local/ssl /usr/local"
+  echo "$ac_t""$with_ssl" 1>&6
+  for dir in $with_ssl
+  do
+     if test -f "$dir/include/openssl/ssl.h"; then
+        SSL_CFLAGS="$SSL_CFLAGS -I$dir/include/openssl"
+        if test "$dir" != "/usr"; then
+           SSL_CFLAGS="$SSL_CFLAGS -I$dir/include"
+        fi
+     elif test "$dir" != "/usr" -a -f "$dir/include/ssl.h"; then
+        SSL_CFLAGS="$SSLCFLAGS -I$dir/include"
+     fi
+     if test "$dir" != "/usr" -a -f "$dir/lib/libssl.a"; then
+	SSL_LIBS="$SSL_LIBS -L$dir/lib"
+     fi
+  done
+  echo $ac_n "checking for SSL_new in -lssl""... $ac_c" 1>&6
+echo "configure:2243: checking for SSL_new in -lssl" >&5
+ac_lib_var=`echo ssl'_'SSL_new | sed 'y%./+-%__p_%'`
+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  ac_save_LIBS="$LIBS"
+LIBS="-lssl $SSL_LIBS -lcrypto $LIBS"
+cat > conftest.$ac_ext <<EOF
+#line 2251 "configure"
+#include "confdefs.h"
+/* Override any gcc2 internal prototype to avoid an error.  */
+/* We use char because int might match the return type of a gcc2
+    builtin and then its argument prototype would still apply.  */
+char SSL_new();
+
+int main() {
+SSL_new()
+; return 0; }
+EOF
+if { (eval echo configure:2262: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+  rm -rf conftest*
+  eval "ac_cv_lib_$ac_lib_var=yes"
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  eval "ac_cv_lib_$ac_lib_var=no"
+fi
+rm -f conftest*
+LIBS="$ac_save_LIBS"
+
+fi
+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+  w3m_ssl="found"; CFLAGS="$CFLAGS $SSL_CFLAGS" W3M_LIBS="$W3M_LIBS $SSL_LIBS -lssl -lcrypto"
+else
+  echo "$ac_t""no" 1>&6
+w3m_ssl="not found"
+fi
+
+
+  if test x"$w3m_ssl" = xfound; then
+    echo $ac_n "checking if SSL certificate verify is enabled""... $ac_c" 1>&6
+echo "configure:2286: checking if SSL certificate verify is enabled" >&5
+    # Check whether --enable-sslverify or --disable-sslverify was given.
+if test "${enable_sslverify+set}" = set; then
+  enableval="$enable_sslverify"
+  :
+else
+  enable_sslverify="yes"
+fi
+
+    test x"$enable_sslverify" = xyes && cat >> confdefs.h <<\EOF
+#define USE_SSL_VERIFY 1
+EOF
+
+    echo "$ac_t""$enable_sslverify" 1>&6
+  fi
+fi
+
 echo $ac_n "checking for sqrt""... $ac_c" 1>&6
-echo "configure:2303: checking for sqrt" >&5
+echo "configure:2304: checking for sqrt" >&5
 if eval "test \"`echo '$''{'ac_cv_func_sqrt'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2308 "configure"
+#line 2309 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char sqrt(); below.  */
@@ -2327,7 +2328,7 @@ sqrt();
 
 ; return 0; }
 EOF
-if { (eval echo configure:2331: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2332: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_sqrt=yes"
 else
@@ -2345,7 +2346,7 @@ if eval "test \"`echo '$ac_cv_func_'sqrt`\" = yes"; then
 else
   echo "$ac_t""no" 1>&6
 echo $ac_n "checking for sqrt in -lm""... $ac_c" 1>&6
-echo "configure:2349: checking for sqrt in -lm" >&5
+echo "configure:2350: checking for sqrt in -lm" >&5
 ac_lib_var=`echo m'_'sqrt | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -2353,7 +2354,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lm  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 2357 "configure"
+#line 2358 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -2364,7 +2365,7 @@ int main() {
 sqrt()
 ; return 0; }
 EOF
-if { (eval echo configure:2368: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2369: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -2396,7 +2397,7 @@ fi
 if test x"$enable_mouse" = xyes; then
  
  echo $ac_n "checking for Gpm_Open in -lgpm""... $ac_c" 1>&6
-echo "configure:2400: checking for Gpm_Open in -lgpm" >&5
+echo "configure:2401: checking for Gpm_Open in -lgpm" >&5
 ac_lib_var=`echo gpm'_'Gpm_Open | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -2404,7 +2405,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lgpm  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 2408 "configure"
+#line 2409 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -2415,7 +2416,7 @@ int main() {
 Gpm_Open()
 ; return 0; }
 EOF
-if { (eval echo configure:2419: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2420: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -2441,13 +2442,13 @@ fi
 
  
  cat > conftest.$ac_ext <<EOF
-#line 2445 "configure"
+#line 2446 "configure"
 #include "confdefs.h"
 #include <machine/console.h>
    MOUSE_GETINFO
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2451: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2452: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -2464,7 +2465,7 @@ rm -f conftest*
 fi
 
 echo $ac_n "checking terminal library""... $ac_c" 1>&6
-echo "configure:2468: checking terminal library" >&5
+echo "configure:2469: checking terminal library" >&5
 # Check whether --with-termlib or --without-termlib was given.
 if test "${with_termlib+set}" = set; then
   withval="$with_termlib"
@@ -2477,7 +2478,7 @@ fi
  test x"$with_termlib" = xyes && with_termlib="terminfo mytinfo termlib termcap ncurses curses"
  for lib in $with_termlib; do
    echo $ac_n "checking for tgetent in -l$lib""... $ac_c" 1>&6
-echo "configure:2481: checking for tgetent in -l$lib" >&5
+echo "configure:2482: checking for tgetent in -l$lib" >&5
 ac_lib_var=`echo $lib'_'tgetent | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -2485,7 +2486,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-l$lib  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 2489 "configure"
+#line 2490 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -2496,7 +2497,7 @@ int main() {
 tgetent()
 ; return 0; }
 EOF
-if { (eval echo configure:2500: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2501: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -2519,7 +2520,7 @@ fi
  done
 
 echo $ac_n "checking GC library exists""... $ac_c" 1>&6
-echo "configure:2523: checking GC library exists" >&5
+echo "configure:2524: checking GC library exists" >&5
 # Check whether --with-gc or --without-gc was given.
 if test "${with_gc+set}" = set; then
   withval="$with_gc"
@@ -2533,17 +2534,17 @@ fi
  unset ac_cv_header_gc_h
  ac_safe=`echo "gc.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for gc.h""... $ac_c" 1>&6
-echo "configure:2537: checking for gc.h" >&5
+echo "configure:2538: checking for gc.h" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2542 "configure"
+#line 2543 "configure"
 #include "confdefs.h"
 #include <gc.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2547: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2548: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -2566,7 +2567,7 @@ fi
 
  if test x"$ac_cv_header_gc_h" = xno; then
    echo $ac_n "checking GC header location""... $ac_c" 1>&6
-echo "configure:2570: checking GC header location" >&5
+echo "configure:2571: checking GC header location" >&5
    echo "$ac_t""$with_gc" 1>&6
    gcincludedir=no
    for dir in $with_gc; do
@@ -2574,21 +2575,21 @@ echo "configure:2570: checking GC header location" >&5
        cppflags="$CPPFLAGS"
        CPPFLAGS="$CPPFLAGS -I$dir/$inc"
        echo $ac_n "checking $dir/$inc""... $ac_c" 1>&6
-echo "configure:2578: checking $dir/$inc" >&5
+echo "configure:2579: checking $dir/$inc" >&5
        unset ac_cv_header_gc_h
        ac_safe=`echo "gc.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for gc.h""... $ac_c" 1>&6
-echo "configure:2582: checking for gc.h" >&5
+echo "configure:2583: checking for gc.h" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2587 "configure"
+#line 2588 "configure"
 #include "confdefs.h"
 #include <gc.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2592: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2593: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -2621,7 +2622,7 @@ fi
  fi
  unset ac_cv_lib_gc_GC_version
  echo $ac_n "checking for GC_version in -lgc""... $ac_c" 1>&6
-echo "configure:2625: checking for GC_version in -lgc" >&5
+echo "configure:2626: checking for GC_version in -lgc" >&5
 ac_lib_var=`echo gc'_'GC_version | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -2629,7 +2630,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lgc  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 2633 "configure"
+#line 2634 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -2640,7 +2641,7 @@ int main() {
 GC_version()
 ; return 0; }
 EOF
-if { (eval echo configure:2644: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2645: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -2662,17 +2663,17 @@ fi
 
  if test x"$ac_cv_lib_gc_GC_version" = xno; then
     echo $ac_n "checking GC library location""... $ac_c" 1>&6
-echo "configure:2666: checking GC library location" >&5
+echo "configure:2667: checking GC library location" >&5
     echo "$ac_t""$with_gc" 1>&6
     gclibdir=no
     for dir in $with_gc; do
       ldflags="$LDFLAGS"
       LDFLAGS="$LDFLAGS -L$dir/lib"
       echo $ac_n "checking $dir""... $ac_c" 1>&6
-echo "configure:2673: checking $dir" >&5
+echo "configure:2674: checking $dir" >&5
       unset ac_cv_lib_gc_GC_version
       echo $ac_n "checking for GC_version in -lgc""... $ac_c" 1>&6
-echo "configure:2676: checking for GC_version in -lgc" >&5
+echo "configure:2677: checking for GC_version in -lgc" >&5
 ac_lib_var=`echo gc'_'GC_version | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -2680,7 +2681,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lgc  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 2684 "configure"
+#line 2685 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -2691,7 +2692,7 @@ int main() {
 GC_version()
 ; return 0; }
 EOF
-if { (eval echo configure:2695: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2696: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -2718,7 +2719,7 @@ fi
     fi
  fi
 echo $ac_n "checking for zError in -lz""... $ac_c" 1>&6
-echo "configure:2722: checking for zError in -lz" >&5
+echo "configure:2723: checking for zError in -lz" >&5
 ac_lib_var=`echo z'_'zError | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -2726,7 +2727,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lz  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 2730 "configure"
+#line 2731 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -2737,7 +2738,7 @@ int main() {
 zError()
 ; return 0; }
 EOF
-if { (eval echo configure:2741: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2742: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -2776,12 +2777,12 @@ for ac_hdr in dirent.h sys/ndir.h sys/dir.h ndir.h
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr that defines DIR""... $ac_c" 1>&6
-echo "configure:2780: checking for $ac_hdr that defines DIR" >&5
+echo "configure:2781: checking for $ac_hdr that defines DIR" >&5
 if eval "test \"`echo '$''{'ac_cv_header_dirent_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2785 "configure"
+#line 2786 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <$ac_hdr>
@@ -2789,7 +2790,7 @@ int main() {
 DIR *dirp = 0;
 ; return 0; }
 EOF
-if { (eval echo configure:2793: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2794: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   eval "ac_cv_header_dirent_$ac_safe=yes"
 else
@@ -2814,7 +2815,7 @@ done
 # Two versions of opendir et al. are in -ldir and -lx on SCO Xenix.
 if test $ac_header_dirent = dirent.h; then
 echo $ac_n "checking for opendir in -ldir""... $ac_c" 1>&6
-echo "configure:2818: checking for opendir in -ldir" >&5
+echo "configure:2819: checking for opendir in -ldir" >&5
 ac_lib_var=`echo dir'_'opendir | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -2822,7 +2823,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-ldir  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 2826 "configure"
+#line 2827 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -2833,7 +2834,7 @@ int main() {
 opendir()
 ; return 0; }
 EOF
-if { (eval echo configure:2837: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2838: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -2855,7 +2856,7 @@ fi
 
 else
 echo $ac_n "checking for opendir in -lx""... $ac_c" 1>&6
-echo "configure:2859: checking for opendir in -lx" >&5
+echo "configure:2860: checking for opendir in -lx" >&5
 ac_lib_var=`echo x'_'opendir | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -2863,7 +2864,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lx  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 2867 "configure"
+#line 2868 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -2874,7 +2875,7 @@ int main() {
 opendir()
 ; return 0; }
 EOF
-if { (eval echo configure:2878: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2879: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -2897,12 +2898,12 @@ fi
 fi
 
 echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
-echo "configure:2901: checking for ANSI C header files" >&5
+echo "configure:2902: checking for ANSI C header files" >&5
 if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2906 "configure"
+#line 2907 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 #include <stdarg.h>
@@ -2910,7 +2911,7 @@ else
 #include <float.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2914: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2915: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -2927,7 +2928,7 @@ rm -f conftest*
 if test $ac_cv_header_stdc = yes; then
   # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
 cat > conftest.$ac_ext <<EOF
-#line 2931 "configure"
+#line 2932 "configure"
 #include "confdefs.h"
 #include <string.h>
 EOF
@@ -2945,7 +2946,7 @@ fi
 if test $ac_cv_header_stdc = yes; then
   # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
 cat > conftest.$ac_ext <<EOF
-#line 2949 "configure"
+#line 2950 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 EOF
@@ -2966,7 +2967,7 @@ if test "$cross_compiling" = yes; then
   :
 else
   cat > conftest.$ac_ext <<EOF
-#line 2970 "configure"
+#line 2971 "configure"
 #include "confdefs.h"
 #include <ctype.h>
 #define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
@@ -2977,7 +2978,7 @@ if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) exit(2);
 exit (0); }
 
 EOF
-if { (eval echo configure:2981: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:2982: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   :
 else
@@ -3001,12 +3002,12 @@ EOF
 fi
 
 echo $ac_n "checking for sys/wait.h that is POSIX.1 compatible""... $ac_c" 1>&6
-echo "configure:3005: checking for sys/wait.h that is POSIX.1 compatible" >&5
+echo "configure:3006: checking for sys/wait.h that is POSIX.1 compatible" >&5
 if eval "test \"`echo '$''{'ac_cv_header_sys_wait_h'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 3010 "configure"
+#line 3011 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/wait.h>
@@ -3022,7 +3023,7 @@ wait (&s);
 s = WIFEXITED (s) ? WEXITSTATUS (s) : 1;
 ; return 0; }
 EOF
-if { (eval echo configure:3026: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3027: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_header_sys_wait_h=yes
 else
@@ -3044,17 +3045,17 @@ fi
 
 ac_safe=`echo "termios.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for termios.h""... $ac_c" 1>&6
-echo "configure:3048: checking for termios.h" >&5
+echo "configure:3049: checking for termios.h" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 3053 "configure"
+#line 3054 "configure"
 #include "confdefs.h"
 #include <termios.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:3058: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:3059: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -3078,17 +3079,17 @@ else
   echo "$ac_t""no" 1>&6
 ac_safe=`echo "termio.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for termio.h""... $ac_c" 1>&6
-echo "configure:3082: checking for termio.h" >&5
+echo "configure:3083: checking for termio.h" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 3087 "configure"
+#line 3088 "configure"
 #include "confdefs.h"
 #include <termio.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:3092: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:3093: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -3112,17 +3113,17 @@ else
   echo "$ac_t""no" 1>&6
 ac_safe=`echo "sgtty.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for sgtty.h""... $ac_c" 1>&6
-echo "configure:3116: checking for sgtty.h" >&5
+echo "configure:3117: checking for sgtty.h" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 3121 "configure"
+#line 3122 "configure"
 #include "confdefs.h"
 #include <sgtty.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:3126: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:3127: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -3152,17 +3153,17 @@ fi
 
 ac_safe=`echo "float.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for float.h""... $ac_c" 1>&6
-echo "configure:3156: checking for float.h" >&5
+echo "configure:3157: checking for float.h" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 3161 "configure"
+#line 3162 "configure"
 #include "confdefs.h"
 #include <float.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:3166: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:3167: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -3185,17 +3186,17 @@ fi
 
 ac_safe=`echo "sys/select.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for sys/select.h""... $ac_c" 1>&6
-echo "configure:3189: checking for sys/select.h" >&5
+echo "configure:3190: checking for sys/select.h" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 3194 "configure"
+#line 3195 "configure"
 #include "confdefs.h"
 #include <sys/select.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:3199: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:3200: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -3218,7 +3219,7 @@ fi
 
 
 echo $ac_n "checking size of long long""... $ac_c" 1>&6
-echo "configure:3222: checking size of long long" >&5
+echo "configure:3223: checking size of long long" >&5
 if eval "test \"`echo '$''{'ac_cv_sizeof_long_long'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -3226,7 +3227,7 @@ else
   ac_cv_sizeof_long_long=0
 else
   cat > conftest.$ac_ext <<EOF
-#line 3230 "configure"
+#line 3231 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 #include <sys/types.h>
@@ -3238,7 +3239,7 @@ main()
   exit(0);
 }
 EOF
-if { (eval echo configure:3242: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:3243: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   ac_cv_sizeof_long_long=`cat conftestval`
 else
@@ -3261,12 +3262,12 @@ EOF
 for ac_func in strcasecmp strcasestr strchr memcpy strerror bcopy setpgrp chdir getcwd getwd readlink setenv putenv strtoll stroq atoll atoq symlink readlink lstat srand48 srandom getpassphrase waitpid
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:3265: checking for $ac_func" >&5
+echo "configure:3266: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 3270 "configure"
+#line 3271 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -3289,7 +3290,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:3293: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3294: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -3314,12 +3315,12 @@ fi
 done
 
 echo $ac_n "checking for strftime""... $ac_c" 1>&6
-echo "configure:3318: checking for strftime" >&5
+echo "configure:3319: checking for strftime" >&5
 if eval "test \"`echo '$''{'ac_cv_func_strftime'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 3323 "configure"
+#line 3324 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char strftime(); below.  */
@@ -3342,7 +3343,7 @@ strftime();
 
 ; return 0; }
 EOF
-if { (eval echo configure:3346: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3347: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_strftime=yes"
 else
@@ -3364,7 +3365,7 @@ else
   echo "$ac_t""no" 1>&6
 # strftime is in -lintl on SCO UNIX.
 echo $ac_n "checking for strftime in -lintl""... $ac_c" 1>&6
-echo "configure:3368: checking for strftime in -lintl" >&5
+echo "configure:3369: checking for strftime in -lintl" >&5
 ac_lib_var=`echo intl'_'strftime | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -3372,7 +3373,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lintl  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 3376 "configure"
+#line 3377 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -3383,7 +3384,7 @@ int main() {
 strftime()
 ; return 0; }
 EOF
-if { (eval echo configure:3387: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3388: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -3410,7 +3411,7 @@ fi
 fi
 
 echo $ac_n "checking for wait3 that fills in rusage""... $ac_c" 1>&6
-echo "configure:3414: checking for wait3 that fills in rusage" >&5
+echo "configure:3415: checking for wait3 that fills in rusage" >&5
 if eval "test \"`echo '$''{'ac_cv_func_wait3_rusage'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -3418,7 +3419,7 @@ else
   ac_cv_func_wait3_rusage=no
 else
   cat > conftest.$ac_ext <<EOF
-#line 3422 "configure"
+#line 3423 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/time.h>
@@ -3449,7 +3450,7 @@ main() {
   }
 }
 EOF
-if { (eval echo configure:3453: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:3454: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   ac_cv_func_wait3_rusage=yes
 else
@@ -3472,7 +3473,7 @@ EOF
 fi
 
 echo $ac_n "checking whether setpgrp takes no argument""... $ac_c" 1>&6
-echo "configure:3476: checking whether setpgrp takes no argument" >&5
+echo "configure:3477: checking whether setpgrp takes no argument" >&5
 if eval "test \"`echo '$''{'ac_cv_func_setpgrp_void'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -3480,7 +3481,7 @@ else
   { echo "configure: error: cannot check setpgrp if cross compiling" 1>&2; exit 1; }
 else
   cat > conftest.$ac_ext <<EOF
-#line 3484 "configure"
+#line 3485 "configure"
 #include "confdefs.h"
 
 #ifdef HAVE_UNISTD_H
@@ -3500,7 +3501,7 @@ main()
 }
 
 EOF
-if { (eval echo configure:3504: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:3505: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   ac_cv_func_setpgrp_void=no
 else
@@ -3525,16 +3526,16 @@ fi
 
 
 echo $ac_n "checking for sys_errlist""... $ac_c" 1>&6
-echo "configure:3529: checking for sys_errlist" >&5
+echo "configure:3530: checking for sys_errlist" >&5
 cat > conftest.$ac_ext <<EOF
-#line 3531 "configure"
+#line 3532 "configure"
 #include "confdefs.h"
 extern char *sys_errlist[];
 int main() {
 printf(sys_errlist[0]);
 ; return 0; }
 EOF
-if { (eval echo configure:3538: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3539: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   have_sys_errlist="yes"; cat >> confdefs.h <<\EOF
 #define HAVE_SYS_ERRLIST 1
@@ -3550,9 +3551,9 @@ rm -f conftest*
 echo "$ac_t""$have_sys_errlist" 1>&6
 
 echo $ac_n "checking for sigsetjmp""... $ac_c" 1>&6
-echo "configure:3554: checking for sigsetjmp" >&5
+echo "configure:3555: checking for sigsetjmp" >&5
 cat > conftest.$ac_ext <<EOF
-#line 3556 "configure"
+#line 3557 "configure"
 #include "confdefs.h"
 #include <setjmp.h>
 int main() {
@@ -3560,7 +3561,7 @@ int main() {
    if (sigsetjmp(env, 1) != 0) { exit(0); } siglongjmp(env, 1);
 ; return 0; }
 EOF
-if { (eval echo configure:3564: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3565: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   have_sigsetjmp="yes"; cat >> confdefs.h <<\EOF
 #define HAVE_SIGSETJMP 1
@@ -3575,12 +3576,12 @@ fi
 rm -f conftest*
 echo "$ac_t""$have_sigsetjmp" 1>&6
 echo $ac_n "checking return type of signal handlers""... $ac_c" 1>&6
-echo "configure:3579: checking return type of signal handlers" >&5
+echo "configure:3580: checking return type of signal handlers" >&5
 if eval "test \"`echo '$''{'ac_cv_type_signal'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 3584 "configure"
+#line 3585 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <signal.h>
@@ -3597,7 +3598,7 @@ int main() {
 int i;
 ; return 0; }
 EOF
-if { (eval echo configure:3601: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3602: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_type_signal=void
 else
@@ -3828,8 +3829,6 @@ s%@USE_DIGEST_AUTH@%$USE_DIGEST_AUTH%g
 s%@USE_NNTP@%$USE_NNTP%g
 s%@USE_GOPHER@%$USE_GOPHER%g
 s%@INET6@%$INET6%g
-s%@USE_SSL@%$USE_SSL%g
-s%@USE_SSL_VERIFY@%$USE_SSL_VERIFY%g
 s%@USE_DICT@%$USE_DICT%g
 s%@USE_HELP_CGI@%$USE_HELP_CGI%g
 s%@USE_EXTERNAL_URI_LOADER@%$USE_EXTERNAL_URI_LOADER%g
@@ -3839,6 +3838,8 @@ s%@DEF_MIGEMO_COMMAND@%$DEF_MIGEMO_COMMAND%g
 s%@DEF_EDITOR@%$DEF_EDITOR%g
 s%@DEF_MAILER@%$DEF_MAILER%g
 s%@DEF_EXT_BROWSER@%$DEF_EXT_BROWSER%g
+s%@USE_SSL@%$USE_SSL%g
+s%@USE_SSL_VERIFY@%$USE_SSL_VERIFY%g
 s%@USE_W3M@%$USE_W3M%g
 s%@USE_SYSMOUSE@%$USE_SYSMOUSE%g
 s%@AUXBIN_TARGETS@%$AUXBIN_TARGETS%g
diff --git a/configure.in b/configure.in
index 63aadf3..5335291 100644
--- a/configure.in
+++ b/configure.in
@@ -51,7 +51,6 @@ AC_W3M_DIGEST_AUTH
 AC_W3M_NNTP
 AC_W3M_GOPHER
 AC_W3M_IPv6
-AC_W3M_SSL
 
 AC_W3M_DICT
 AC_W3M_HELP_CGI
@@ -68,6 +67,8 @@ do
  AC_W3M_EXTLIBS($lib)
 done
 
+AC_W3M_SSL
+
 dnl Checks for libraries.
 AC_CHECK_FUNC(sqrt,,[AC_CHECK_LIB(m, sqrt)])
 if test x"$enable_mouse" = xyes; then