case "$host" in
*-*-aix*)
AFS_LIBS="-lld"
+ CFLAGS="$CFLAGS -I/usr/local/include"
+ LDFLAGS="$LDFLAGS -L/usr/local/lib"
AC_DEFINE(BROKEN_GETADDRINFO)
;;
*-*-hpux10*)
CFLAGS="$CFLAGS -Aa"
fi
CFLAGS="$CFLAGS -D_HPUX_SOURCE"
+ CFLAGS="$CFLAGS -I/usr/local/include"
+ LDFLAGS="$LDFLAGS -L/usr/local/lib"
AC_DEFINE(IPADDR_IN_DISPLAY)
AC_DEFINE(USE_UTMPX)
AC_MSG_CHECKING(for HPUX trusted system password database)
mansubdir=cat
;;
*-*-irix5*)
+ CFLAGS="$CFLAGS -I/usr/local/include"
+ LDFLAGS="$LDFLAGS -L/usr/local/lib"
MANTYPE='$(CATMAN)'
no_libsocket=1
no_libnsl=1
;;
*-*-irix6*)
+ CFLAGS="$CFLAGS -I/usr/local/include"
+ LDFLAGS="$LDFLAGS -L/usr/local/lib"
MANTYPE='$(CATMAN)'
AC_MSG_WARN([*** Irix 6.x is not tested, please report you experiences *** ])
no_libsocket=1
;;
*-*-linux*)
no_dev_ptmx=1
+ AC_DEFINE(DONT_TRY_OTHER_AF)
+ inet6_default_4in6=yes
;;
*-*-netbsd*)
need_dash_r=1
;;
*-*-solaris*)
+ CFLAGS="$CFLAGS -I/usr/local/include"
+ LDFLAGS="$LDFLAGS -L/usr/local/lib -R/usr/local/lib"
need_dash_r=1
- LDFLAGS="-L/usr/ucblib"
+ LDFLAGS="-L/usr/ucblib -R/usr/ucblib"
AC_DEFINE(USE_UTMPX)
;;
*-*-sysv*)
+ CFLAGS="$CFLAGS -I/usr/local/include"
+ LDFLAGS="$LDFLAGS -L/usr/local/lib"
AC_DEFINE(USE_UTMPX)
MANTYPE='$(CATMAN)'
mansubdir=cat
)
saved_LIBS="$LIBS"
+saved_LDFLAGS="$LDFLAGS"
saved_CFLAGS="$CFLAGS"
if test "x$prefix" != "xNONE" ; then
tryssldir="$tryssldir $prefix"
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
+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"
- CFLAGS="$CFLAGS -I$ssldir/include"
- if test "x$need_dash_r" = "x1" ; then
- LIBS="$LIBS -R$ssldir/lib"
+ 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
+ LDFLAGS="$saved_LDFLAGS"
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="$saved_LIBS -lcrypto"
+ else
+ LIBS="$saved_LIBS -lcrypto -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
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="$saved_LIBS -lcrypto"
+else
+ LIBS="$saved_LIBS -lcrypto -lRSAglue -lrsaref"
+fi
AC_MSG_RESULT($ssldir)
# Checks for data types
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
],
# Options from here on. Some of these are preset by platform above
-# Check whether user wants GNOME ssh-askpass
-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
- GNOME_ASKPASS="";
- else
- GNOME_ASKPASS="gnome-ssh-askpass";
- fi
- ])
-AC_SUBST(GNOME_ASKPASS)
-
-if test -z "$GNOME_ASKPASS" ; then
- AC_MSG_RESULT(no)
-else
- AC_MSG_RESULT(yes)
-fi
-
# Check for user-specified random device, otherwise check /dev/urandom
AC_ARG_WITH(random,
[ --with-random=FILE read randomness from FILE (default=/dev/urandom)],
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"
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"
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
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)
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
]
]
)
+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,
andersk / openssh.git / blobdiff