summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDarren Tucker <dtucker@zip.com.au>2006-08-20 21:43:19 +1000
committerDarren Tucker <dtucker@zip.com.au>2006-08-20 21:43:19 +1000
commit0eb810015f9ba94ac04464fc6a714b17e604acbc (patch)
treec2020d5caebcf49feb38afdc8d293557f5671007
parent639bbe8bfe3d5038c279c97699de06cb0f120458 (diff)
- (dtucker) [configure.ac] Remove errant "-".
-rw-r--r--ChangeLog3
-rw-r--r--configure.ac6
2 files changed, 5 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 62adc612b..d7bf2d9d3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -6,6 +6,7 @@
6 fixing bug #1181. No changes yet. 6 fixing bug #1181. No changes yet.
7 - (dtucker) [configure.ac] Bug #1181: Explicitly test to see if OpenSSL 7 - (dtucker) [configure.ac] Bug #1181: Explicitly test to see if OpenSSL
8 (0.9.8a and presumably newer) requires -ldl to successfully link. 8 (0.9.8a and presumably newer) requires -ldl to successfully link.
9 - (dtucker) [configure.ac] Remove errant "-".
9 10
1020060819 1120060819
11 - (djm) OpenBSD CVS Sync 12 - (djm) OpenBSD CVS Sync
@@ -5283,4 +5284,4 @@
5283 - (djm) Trim deprecated options from INSTALL. Mention UsePAM 5284 - (djm) Trim deprecated options from INSTALL. Mention UsePAM
5284 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu 5285 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
5285 5286
5286$Id: ChangeLog,v 1.4502 2006/08/20 10:17:53 dtucker Exp $ 5287$Id: ChangeLog,v 1.4503 2006/08/20 11:43:19 dtucker Exp $
diff --git a/configure.ac b/configure.ac
index b2939eeed..90cfbea9a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
1# $Id: configure.ac,v 1.354 2006/08/20 10:17:53 dtucker Exp $ 1# $Id: configure.ac,v 1.355 2006/08/20 11:43:19 dtucker Exp $
2# 2#
3# Copyright (c) 1999-2004 Damien Miller 3# Copyright (c) 1999-2004 Damien Miller
4# 4#
@@ -15,7 +15,7 @@
15# OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. 15# OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
16 16
17AC_INIT(OpenSSH, Portable, openssh-unix-dev@mindrot.org) 17AC_INIT(OpenSSH, Portable, openssh-unix-dev@mindrot.org)
18AC_REVISION($Revision: 1.354 $) 18AC_REVISION($Revision: 1.355 $)
19AC_CONFIG_SRCDIR([ssh.c]) 19AC_CONFIG_SRCDIR([ssh.c])
20 20
21AC_CONFIG_HEADER(config.h) 21AC_CONFIG_HEADER(config.h)
@@ -1966,7 +1966,7 @@ AC_ARG_WITH(pam,
1966 # libdl already in LIBS 1966 # libdl already in LIBS
1967 ;; 1967 ;;
1968 *) 1968 *)
1969 LIBPAM="-$LIBPAM -ldl" 1969 LIBPAM="$LIBPAM -ldl"
1970 ;; 1970 ;;
1971 esac 1971 esac
1972 fi 1972 fi