diff options
| author | Tim Rice <tim@multitalents.net> | 2003-12-08 12:35:59 -0800 |
|---|---|---|
| committer | Tim Rice <tim@multitalents.net> | 2003-12-08 12:35:59 -0800 |
| commit | 88368a3034f3fff742c3a4c79b873e2cb6a4c1bb (patch) | |
| tree | 606b4a9bb472b5ae5474e6004bb546487976b5e5 /configure.ac | |
| parent | 3db2e4daf7333ac0b3ae90f23aa9668c7723ddfb (diff) | |
[configure.ac] Bug 770. Fix --without-rpath.
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 38 |
1 files changed, 22 insertions, 16 deletions
diff --git a/configure.ac b/configure.ac index b56d37f4..e7249b9c 100644 --- a/configure.ac +++ b/configure.ac @@ -1,4 +1,4 @@ -# $Id: configure.ac,v 1.175 2003/11/22 03:25:16 dtucker Exp $ +# $Id: configure.ac,v 1.176 2003/12/08 20:35:59 tim Exp $ AC_INIT AC_CONFIG_SRCDIR([ssh.c]) @@ -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], |