fix doh

[openssh.git] / configure.in

diff --git a/configure.in b/configure.in
index 4f1e4796e413dad55dcc3a76f46a2b53b51d4991..7f7326fbd2cde582cb0a86a1ce7b01fad0bd4da9 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -20,6 +20,8 @@ AC_SUBST(PERL)
 case "$host" in
 *-*-aix*)
        AFS_LIBS="-lld"
+       CFLAGS="$CFLAGS -I/usr/local/include"
+       LDFLAGS="$LDFLAGS -L/usr/local/lib"
        AC_DEFINE(BROKEN_GETADDRINFO)
        ;;
 *-*-hpux10*)
@@ -27,6 +29,8 @@ case "$host" in
                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)
@@ -43,11 +47,15 @@ case "$host" in
        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
@@ -62,11 +70,15 @@ case "$host" in
        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
@@ -146,26 +158,29 @@ AC_ARG_WITH(ssl-dir,
 )
 
 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/lib -L$ssldir -lcrypto"
-               CFLAGS="$CFLAGS -I$ssldir/include"
-               if test "x$need_dash_r" = "x1" ; then
-                       LIBS="$LIBS -R$ssldir/lib -L$ssldir"
+               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
-               LIBS="$saved_LIBS -lcrypto"
+               LDFLAGS="$saved_LDFLAGS"
        fi
 
        for WANTS_RSAREF in "" 1 ; do
                
-               if test ! -z "$WANTS_RSAREF" ; then
-                       LIBS="$LIBS -lRSAglue -lrsaref"
+               if test -z "$WANTS_RSAREF" ; then
+                       LIBS="$saved_LIBS -lcrypto"
+               else
+                       LIBS="$saved_LIBS -lcrypto -lRSAglue -lrsaref"
                fi
 
                AC_TRY_RUN(
@@ -213,15 +228,16 @@ fi
 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="$LIBS -lRSAglue -lrsaref"
+if test -z "$WANTS_RSAREF" ; then
+       LIBS="$saved_LIBS -lcrypto"
+else
+       LIBS="$saved_LIBS -lcrypto -lRSAglue -lrsaref"
 fi
 AC_MSG_RESULT($ssldir)
 
@@ -561,25 +577,6 @@ AC_CHECK_FILE("/dev/ptc",
 
 # 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)],