summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--configure.ac6
2 files changed, 8 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index f26dae2fd..78abba7d1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
120060923
2 - (dtucker) [configure.ac] Bug #1234: Put opensc libs into $LIBS rather than
3 $LDFLAGS. Patch from vapier at gentoo org.
4
120060922 520060922
2 - (dtucker) [packet.c canohost.c] Include arpa/inet.h for htonl macros on 6 - (dtucker) [packet.c canohost.c] Include arpa/inet.h for htonl macros on
3 some platforms (eg HP-UX 11.00). From santhi.amirta at gmail com. 7 some platforms (eg HP-UX 11.00). From santhi.amirta at gmail com.
@@ -5474,4 +5478,4 @@
5474 - (djm) Trim deprecated options from INSTALL. Mention UsePAM 5478 - (djm) Trim deprecated options from INSTALL. Mention UsePAM
5475 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu 5479 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
5476 5480
5477$Id: ChangeLog,v 1.4556 2006/09/22 09:22:17 dtucker Exp $ 5481$Id: ChangeLog,v 1.4557 2006/09/23 06:25:19 dtucker Exp $
diff --git a/configure.ac b/configure.ac
index f790f9a51..01e84104d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
1# $Id: configure.ac,v 1.365 2006/09/18 13:17:41 dtucker Exp $ 1# $Id: configure.ac,v 1.366 2006/09/23 06:25:20 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.365 $) 18AC_REVISION($Revision: 1.366 $)
19AC_CONFIG_SRCDIR([ssh.c]) 19AC_CONFIG_SRCDIR([ssh.c])
20 20
21AC_CONFIG_HEADER(config.h) 21AC_CONFIG_HEADER(config.h)
@@ -3086,7 +3086,7 @@ AC_ARG_WITH(opensc,
3086 LIBOPENSC_CFLAGS=`$OPENSC_CONFIG --cflags` 3086 LIBOPENSC_CFLAGS=`$OPENSC_CONFIG --cflags`
3087 LIBOPENSC_LIBS=`$OPENSC_CONFIG --libs` 3087 LIBOPENSC_LIBS=`$OPENSC_CONFIG --libs`
3088 CPPFLAGS="$CPPFLAGS $LIBOPENSC_CFLAGS" 3088 CPPFLAGS="$CPPFLAGS $LIBOPENSC_CFLAGS"
3089 LDFLAGS="$LDFLAGS $LIBOPENSC_LIBS" 3089 LIBS="$LIBS $LIBOPENSC_LIBS"
3090 AC_DEFINE(SMARTCARD) 3090 AC_DEFINE(SMARTCARD)
3091 AC_DEFINE(USE_OPENSC, 1, 3091 AC_DEFINE(USE_OPENSC, 1,
3092 [Define if you want smartcard support 3092 [Define if you want smartcard support