summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
-rw-r--r--configure.ac14
2 files changed, 16 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 67c16acb..70cc5278 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -35,6 +35,8 @@
[sftp-int.c sftp-int.h]
API cleanup and backwards compat for filexfer v.0 servers; ok markus@
- (djm) Sync openbsd-compat with OpenBSD CVS too
+ - (djm) Bug #106: Add --without-rpath configure option. Patch from
+ Nicolas.Williams@ubsw.com
20020210
- (djm) OpenBSD CVS Sync
@@ -7582,4 +7584,4 @@
- Wrote replacements for strlcpy and mkdtemp
- Released 1.0pre1
-$Id: ChangeLog,v 1.1849 2002/02/13 05:00:15 djm Exp $
+$Id: ChangeLog,v 1.1850 2002/02/13 12:06:56 djm Exp $
diff --git a/configure.ac b/configure.ac
index 80d3e48d..62eeac0b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-# $Id: configure.ac,v 1.17 2002/01/31 06:14:03 tim Exp $
+# $Id: configure.ac,v 1.18 2002/02/13 12:06:57 djm Exp $
AC_INIT
AC_CONFIG_SRCDIR([ssh.c])
@@ -333,6 +333,18 @@ fi
AC_CHECK_FUNC(getspnam, ,
AC_CHECK_LIB(gen, getspnam, LIBS="$LIBS -lgen"))
+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],