- Include macro for IN6_IS_ADDR_V4MAPPED. Report from

[openssh.git] / configure.in

diff --git a/configure.in b/configure.in
index 4b5ee92cf4d8e74c509d1429f1802541345e9b89..4f1e4796e413dad55dcc3a76f46a2b53b51d4991 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -55,7 +55,8 @@ case "$host" in
        ;;
 *-*-linux*)
        no_dev_ptmx=1
-       need_pty_removed_on_close=1
+       AC_DEFINE(DONT_TRY_OTHER_AF)
+       inet6_default_4in6=yes
        ;;
 *-*-netbsd*)
        need_dash_r=1
@@ -152,46 +153,58 @@ fi
 AC_MSG_CHECKING([for OpenSSL/SSLeay directory])
 for ssldir in "" $tryssldir /usr /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"
+               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"
+                       LIBS="$LIBS -R$ssldir/lib -L$ssldir"
                fi
+       else
+               LIBS="$saved_LIBS -lcrypto"
        fi
-       LIBS="$LIBS -lcrypto"
 
-       AC_TRY_RUN(
-               [
-                       #include <openssl/rsa.h>
-                       #include <openssl/bn.h>
-                       #include <openssl/sha.h>
-                       int main(void) 
-                       {RSA *key; char seed[2048];memset(seed, 0, sizeof(seed));
-                       RAND_seed(seed, sizeof(seed));key=RSA_generate_key(32,3,NULL,NULL);
-                       return(key==NULL);}
-               ],
-               [
-                       AC_DEFINE(HAVE_OPENSSL)
-                       found_crypto=1
-                       break;
-               ], []
-       )
-       AC_TRY_RUN(
-               [
-                       #include <ssl/rsa.h>
-                       #include <ssl/bn.h>
-                       #include <ssl/sha.h>
-                       int main(void) 
-                       {RSA *key; char seed[2048];memset(seed, 0, sizeof(seed));
-                       RAND_seed(seed, sizeof(seed));key=RSA_generate_key(32,3,NULL,NULL);
-                       return(key==NULL);}
-               ],
-               [
-                       AC_DEFINE(HAVE_SSL)
-                       found_crypto=1
-                       break;
-               ], []
-       )
+       for WANTS_RSAREF in "" 1 ; do
+               
+               if test ! -z "$WANTS_RSAREF" ; then
+                       LIBS="$LIBS -lRSAglue -lrsaref"
+               fi
+
+               AC_TRY_RUN(
+                       [
+                               #include <openssl/rsa.h>
+                               #include <openssl/bn.h>
+                               #include <openssl/sha.h>
+                               int main(void) 
+                               {RSA *key; char seed[2048];memset(seed, 0, sizeof(seed));
+                               RAND_seed(seed, sizeof(seed));key=RSA_generate_key(32,3,NULL,NULL);
+                               return(key==NULL);}
+                       ],
+                       [
+                               AC_DEFINE(HAVE_OPENSSL)
+                               found_crypto=1
+                               break;
+                       ], []
+               )
+               AC_TRY_RUN(
+                       [
+                               #include <ssl/rsa.h>
+                               #include <ssl/bn.h>
+                               #include <ssl/sha.h>
+                               int main(void) 
+                               {RSA *key; char seed[2048];memset(seed, 0, sizeof(seed));
+                               RAND_seed(seed, sizeof(seed));key=RSA_generate_key(32,3,NULL,NULL);
+                               return(key==NULL);}
+                       ],
+                       [
+                               AC_DEFINE(HAVE_SSL)
+                               found_crypto=1
+                               break;
+                       ], []
+               )
+       done
+
+       if test ! -z "$found_crypto" ; then
+               break;
+       fi
 done
 
 if test -z "$found_crypto" ; then
@@ -207,6 +220,9 @@ else
        fi
 fi
 LIBS="$saved_LIBS -lcrypto"
+if test ! -z $WANTS_RSAREF ; then
+       LIBS="$LIBS -lRSAglue -lrsaref"
+fi
 AC_MSG_RESULT($ssldir)
 
 # Checks for data types
@@ -449,7 +465,7 @@ AC_TRY_LINK([],
 AC_ARG_WITH(rsh,
        [  --with-rsh=PATH         Specify path to remote shell program ],
        [
-               if test "x$withval" != "$xno" ; then
+               if test "x$withval" != "$no" ; then
                        AC_DEFINE_UNQUOTED(RSH_PATH, "$withval")
                fi
        ],
@@ -543,14 +559,6 @@ AC_CHECK_FILE("/dev/ptc",
        ]
 )
 
-# Some systems (defined in platform-specific code above) automagically remove
-# Unix98 ptys when they are closed
-if test "x$ac_cv_func_openpty" = "xyes" -o "x$have_dev_ptmx" = "x1" -o "x$have_dev_ptc" = "x1" ; then
-       if test "x$need_pty_removed_on_close" = "x1" ; then
-               AC_DEFINE(PTY_REMOVED_ON_CLOSE)
-       fi
-fi
-
 # Options from here on. Some of these are preset by platform above
 
 # Check whether user wants GNOME ssh-askpass
@@ -558,7 +566,7 @@ AC_MSG_CHECKING([whether to build GNOME ssh-askpass])
 AC_ARG_WITH(gnome-askpass,
        [  --with-gnome-askpass    Build the GNOME passphrase requester (default=no)],
        [
-               if test x$withval = xno ; then
+               if test "x$withval" = "xno" ; then
                        GNOME_ASKPASS="";
                else
                        GNOME_ASKPASS="gnome-ssh-askpass";
@@ -630,7 +638,7 @@ AC_SUBST(mansubdir)
 AC_ARG_WITH(kerberos4,
        [  --with-kerberos4=PATH   Enable Kerberos 4 support],
        [
-               if test "x$withval" != "$xno" ; then
+               if test "x$withval" != "xno" ; then
        
                        if test "x$withval" != "$xyes" ; then
                                CFLAGS="$CFLAGS -I${withval}/include"
@@ -662,7 +670,7 @@ AC_ARG_WITH(kerberos4,
 AC_ARG_WITH(afs,
        [  --with-afs=PATH         Enable AFS support],
        [
-               if test "x$withval" != "$xno" ; then
+               if test "x$withval" != "xno" ; then
 
                        if test "x$withval" != "$xyes" ; then
                                CFLAGS="$CFLAGS -I${withval}/include"
@@ -687,7 +695,7 @@ LIBS="$LIBS $KLIBS"
 AC_ARG_WITH(skey,
        [  --with-skey             Enable S/Key support],
        [
-               if test "x$withval" != "$xno" ; then
+               if test "x$withval" != "xno" ; then
                        AC_DEFINE(SKEY)
                        LIBS="$LIBS -lskey"
                fi
@@ -698,7 +706,7 @@ AC_ARG_WITH(skey,
 AC_ARG_WITH(tcp-wrappers,
        [  --with-tcp-wrappers     Enable tcpwrappers support],
        [
-               if test "x$withval" != "$xno" ; then
+               if test "x$withval" != "xno" ; then
                        saved_LIBS="$LIBS"
                        LIBS="$LIBS -lwrap"
                        AC_MSG_CHECKING(for libwrap)
@@ -726,7 +734,7 @@ AC_ARG_WITH(tcp-wrappers,
 AC_ARG_WITH(md5-passwords,
        [  --with-md5-passwords    Enable use of MD5 passwords],
        [
-               if test "x$withval" != "$xno" ; then
+               if test "x$withval" != "xno" ; then
                        AC_DEFINE(HAVE_MD5_PASSWORDS)
                fi
        ]
@@ -782,6 +790,26 @@ AC_ARG_WITH(ipv4-default,
        ]
 )
 
+AC_MSG_CHECKING([to convert IPv4 in IPv6-mapped addresses])
+AC_ARG_WITH(4in6,
+       [  --with-4in6             Check for and convert IPv4 in IPv6 mapped addresses],
+       [
+               if test "x$withval" != "xno" ; then
+                       AC_MSG_RESULT(yes)
+                       AC_DEFINE(IPV4_IN_IPV6)
+               else
+                       AC_MSG_RESULT(no)
+               fi
+       ],[
+               if test "x$inet6_default_4in6" = "xyes"; then
+                       AC_MSG_RESULT([yes (default)])
+                       AC_DEFINE(IPV4_IN_IPV6)
+               else
+                       AC_MSG_RESULT([no (default)])
+               fi
+       ]
+)
+
 # Where to place sshd.pid
 piddir=/var/run
 AC_ARG_WITH(pid-dir,