]> andersk Git - openssh.git/blobdiff - configure.in
- Clarified --with-default-path option.
[openssh.git] / configure.in
index 90aadd98fd108b0e5e950664091ba35ba60d6401..0eeda65ef60cd4c3fdb650208736059f79392745 100644 (file)
@@ -1,14 +1,10 @@
 AC_INIT(ssh.c)
 
 AC_CONFIG_HEADER(config.h)
+AC_PROG_CC
 AC_CANONICAL_HOST
 
-# C Compiler features
-if test "$GCC" = "yes"; then CFLAGS="$CFLAGS -Wall"; fi
-AC_C_INLINE
-
 # Checks for programs.
-AC_PROG_CC
 AC_PROG_CPP
 AC_PROG_RANLIB
 AC_PROG_INSTALL
@@ -16,10 +12,26 @@ AC_CHECK_PROG(AR, ar, ar)
 AC_PATH_PROG(PERL, perl)
 AC_SUBST(PERL)
 
+if test -z "$LD" ; then
+       LD=$CC
+fi
+AC_SUBST(LD)
+       
+# C Compiler features
+AC_C_INLINE
+if test "$GCC" = "yes"; then 
+       CFLAGS="$CFLAGS -Wall"
+fi
+
 # Check for some target-specific stuff
 case "$host" in
 *-*-aix*)
        AFS_LIBS="-lld"
+       CFLAGS="$CFLAGS -I/usr/local/include"
+       LDFLAGS="$LDFLAGS -L/usr/local/lib"
+       if test "$LD" != "gcc" -a -z "$blibpath"; then
+               blibpath="/usr/lib:/lib:/usr/local/lib"
+       fi
        AC_DEFINE(BROKEN_GETADDRINFO)
        ;;
 *-*-hpux10*)
@@ -27,6 +39,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 +57,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
@@ -55,16 +73,21 @@ case "$host" in
        ;;
 *-*-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 -L/usr/ucblib -R/usr/ucblib"
        need_dash_r=1
-       LDFLAGS="-L/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
@@ -144,26 +167,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(
@@ -211,15 +237,19 @@ 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
+       if test ! -z "$blibpath" ; then
+               blibpath="$blibpath:$ssldir:$ssldir/lib"
        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)
 
@@ -559,25 +589,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)],
@@ -641,6 +652,12 @@ AC_ARG_WITH(kerberos4,
                        if test "x$withval" != "$xyes" ; then
                                CFLAGS="$CFLAGS -I${withval}/include"
                                LDFLAGS="$LDFLAGS -L${withval}/lib"
+                               if test ! -z "$need_dash_r" ; then
+                                       LDFLAGS="$LDFLAGS -R${withval}/lib"
+                               fi
+                               if test ! -z "$blibpath" ; then
+                                       blibpath="$blibpath:${withval}/lib"
+                               fi
                        else
                                if test -d /usr/include/kerberosIV ; then
                                        CFLAGS="$CFLAGS -I/usr/include/kerberosIV"
@@ -788,6 +805,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,
@@ -801,4 +838,9 @@ AC_ARG_WITH(pid-dir,
 AC_DEFINE_UNQUOTED(PIDDIR, "$piddir")
 AC_SUBST(piddir)
 
+if test ! -z "$blibpath" ; then
+       LDFLAGS="$LDFLAGS -blibpath:$blibpath"
+       AC_MSG_WARN([Please check and edit -blibpath in LDFLAGS in Makefile])
+fi
+
 AC_OUTPUT(Makefile)
This page took 0.042169 seconds and 4 git commands to generate.