[configure.ac] Bug 770. Fix --without-rpath.

[openssh.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 2fe49dde6ffbb6590061fcbf8d64e7d7568f68dd..e50a4079c97cc64e33d78f62b2c0b1d82ed22f5a 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -52,6 +52,18 @@ if test "$GCC" = "yes" || test "$GCC" = "egcs"; then
        CFLAGS="$CFLAGS -Wall -Wpointer-arith -Wno-uninitialized"
 fi
 
+AC_ARG_WITH(rpath,
+       [  --without-rpath         Disable auto-added -R linker paths],
+       [
+               if test "x$withval" = "xno" ; then      
+                       need_dash_r=""
+               fi
+               if test "x$withval" = "xyes" ; then
+                       need_dash_r=1
+               fi
+       ]
+)
+
 # Check for some target-specific stuff
 case "$host" in
 *-*-aix*)
@@ -228,7 +240,9 @@ mips-sony-bsd|mips-sony-newsos4)
        ;;
 *-*-netbsd*)
        check_for_libcrypt_before=1
-       need_dash_r=1
+       if test "x$withval" != "xno" ; then     
+               need_dash_r=1
+       fi
        ;;
 *-*-freebsd*)
        check_for_libcrypt_later=1
@@ -252,8 +266,12 @@ mips-sony-bsd|mips-sony-newsos4)
        ;;
 *-*-solaris*)
        CPPFLAGS="$CPPFLAGS -I/usr/local/include"
-       LDFLAGS="$LDFLAGS -L/usr/local/lib -R/usr/local/lib"
-       need_dash_r=1
+       if test "x$withval" = "xno" ; then      
+               LDFLAGS="$LDFLAGS -L/usr/local/lib"
+       else
+               LDFLAGS="$LDFLAGS -L/usr/local/lib -R/usr/local/lib"
+               need_dash_r=1
+       fi
        AC_DEFINE(PAM_SUN_CODEBASE)
        AC_DEFINE(LOGIN_NEEDS_UTMPX)
        AC_DEFINE(LOGIN_NEEDS_TERM)
@@ -537,18 +555,6 @@ AC_CHECK_FUNC(getspnam, ,
        AC_CHECK_LIB(gen, getspnam, LIBS="$LIBS -lgen"))
 AC_SEARCH_LIBS(basename, gen, AC_DEFINE(HAVE_BASENAME))
 
-AC_ARG_WITH(rpath,
-       [  --without-rpath         Disable auto-added -R linker paths],
-       [
-               if test "x$withval" = "xno" ; then      
-                       need_dash_r=""
-               fi
-               if test "x$withval" = "xyes" ; then
-                       need_dash_r=1
-               fi
-       ]
-)
-
 dnl zlib is required
 AC_ARG_WITH(zlib,
        [  --with-zlib=PATH        Use zlib in PATH],