diff options
| author | Tim Rice <tim@multitalents.net> | 2003-12-08 12:36:57 -0800 |
|---|---|---|
| committer | Tim Rice <tim@multitalents.net> | 2003-12-08 12:36:57 -0800 |
| commit | a83a88435d4ae2473207bbf0638027e77203f9ae (patch) | |
| tree | 082ff4fb9752b4a0bcad327c5f991788352718cf | |
| parent | 76a3190b7352f4d599c81f67d236bf35ddb46b45 (diff) | |
[configure.ac] Bug 770. Fix --without-rpath.
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | configure.ac | 38 |
2 files changed, 26 insertions, 17 deletions
@@ -1,3 +1,6 @@ +20031208 + - (tim) [configure.ac] Bug 770. Fix --without-rpath. + 20031115 - (dtucker) [regress/agent-ptrace.sh] Test for GDB output from Solaris and HP-UX, skip test on AIX. @@ -1283,4 +1286,4 @@ - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo. Report from murple@murple.net, diagnosis from dtucker@zip.com.au -$Id: ChangeLog,v 1.2994.2.61 2003/11/15 01:14:10 dtucker Exp $ +$Id: ChangeLog,v 1.2994.2.62 2003/12/08 20:36:57 tim Exp $ diff --git a/configure.ac b/configure.ac index f04ec616..958d804a 100644 --- a/configure.ac +++ b/configure.ac @@ -1,4 +1,4 @@ -# $Id: configure.ac,v 1.154.2.14 2003/10/07 10:35:29 dtucker Exp $ +# $Id: configure.ac,v 1.154.2.15 2003/12/08 20:36:58 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*) @@ -225,7 +237,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 @@ -249,8 +263,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) @@ -535,18 +553,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], |