summaryrefslogtreecommitdiff
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 67c16acbb..70cc5278f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -35,6 +35,8 @@
35 [sftp-int.c sftp-int.h] 35 [sftp-int.c sftp-int.h]
36 API cleanup and backwards compat for filexfer v.0 servers; ok markus@ 36 API cleanup and backwards compat for filexfer v.0 servers; ok markus@
37 - (djm) Sync openbsd-compat with OpenBSD CVS too 37 - (djm) Sync openbsd-compat with OpenBSD CVS too
38 - (djm) Bug #106: Add --without-rpath configure option. Patch from
39 Nicolas.Williams@ubsw.com
38 40
3920020210 4120020210
40 - (djm) OpenBSD CVS Sync 42 - (djm) OpenBSD CVS Sync
@@ -7582,4 +7584,4 @@
7582 - Wrote replacements for strlcpy and mkdtemp 7584 - Wrote replacements for strlcpy and mkdtemp
7583 - Released 1.0pre1 7585 - Released 1.0pre1
7584 7586
7585$Id: ChangeLog,v 1.1849 2002/02/13 05:00:15 djm Exp $ 7587$Id: ChangeLog,v 1.1850 2002/02/13 12:06:56 djm Exp $
diff --git a/configure.ac b/configure.ac
index 80d3e48d1..62eeac0b6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
1# $Id: configure.ac,v 1.17 2002/01/31 06:14:03 tim Exp $ 1# $Id: configure.ac,v 1.18 2002/02/13 12:06:57 djm Exp $
2 2
3AC_INIT 3AC_INIT
4AC_CONFIG_SRCDIR([ssh.c]) 4AC_CONFIG_SRCDIR([ssh.c])
@@ -333,6 +333,18 @@ fi
333AC_CHECK_FUNC(getspnam, , 333AC_CHECK_FUNC(getspnam, ,
334 AC_CHECK_LIB(gen, getspnam, LIBS="$LIBS -lgen")) 334 AC_CHECK_LIB(gen, getspnam, LIBS="$LIBS -lgen"))
335 335
336AC_ARG_WITH(rpath,
337 [ --without-rpath Disable auto-added -R linker paths],
338 [
339 if test "x$withval" = "xno" ; then
340 need_dash_r=""
341 fi
342 if test "x$withval" = "xyes" ; then
343 need_dash_r=1
344 fi
345 ]
346)
347
336dnl zlib is required 348dnl zlib is required
337AC_ARG_WITH(zlib, 349AC_ARG_WITH(zlib,
338 [ --with-zlib=PATH Use zlib in PATH], 350 [ --with-zlib=PATH Use zlib in PATH],