1 files changed, 17 insertions, 0 deletions

diff --git a/configure.in b/configure.in
index 81265f1e8..0eeda65ef 100644
--- a/configure.in
+++ b/configure.in
@@ -29,6 +29,9 @@ case "$host" in
         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*)
@@ -239,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"
@@ -646,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"
@@ -826,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)