- Clarified --with-default-path option.

[openssh.git] / configure.in

diff --git a/configure.in b/configure.in
index 154330d6eb3f4ab4aef1873c41b6a053770d5f2c..0eeda65ef60cd4c3fdb650208736059f79392745 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -4,10 +4,6 @@ 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_CPP
 AC_PROG_RANLIB
@@ -16,12 +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*)
@@ -71,9 +81,8 @@ case "$host" in
        ;;
 *-*-solaris*)
        CFLAGS="$CFLAGS -I/usr/local/include"
-       LDFLAGS="$LDFLAGS -L/usr/local/lib -R/usr/local/lib"
+       LDFLAGS="$LDFLAGS -L/usr/local/lib -R/usr/local/lib -L/usr/ucblib -R/usr/ucblib"
        need_dash_r=1
-       LDFLAGS="-L/usr/ucblib -R/usr/ucblib"
        AC_DEFINE(USE_UTMPX)
        ;;
 *-*-sysv*)
@@ -233,6 +242,9 @@ else
        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
 if test -z "$WANTS_RSAREF" ; then
        LIBS="$saved_LIBS -lcrypto"
@@ -640,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"
@@ -820,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)