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 @@
+20060923
+ - (dtucker) [configure.ac] Bug #1234: Put opensc libs into $LIBS rather than
+   $LDFLAGS.  Patch from vapier at gentoo org.
+
 20060922
  - (dtucker) [packet.c canohost.c] Include arpa/inet.h for htonl macros on
    some platforms (eg HP-UX 11.00).  From santhi.amirta at gmail com.
@@ -5474,4 +5478,4 @@
    - (djm) Trim deprecated options from INSTALL. Mention UsePAM
    - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
 
-$Id: ChangeLog,v 1.4556 2006/09/22 09:22:17 dtucker Exp $
+$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 @@
-# $Id: configure.ac,v 1.365 2006/09/18 13:17:41 dtucker Exp $
+# $Id: configure.ac,v 1.366 2006/09/23 06:25:20 dtucker Exp $
 #
 # Copyright (c) 1999-2004 Damien Miller
 #
@@ -15,7 +15,7 @@
 # OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 AC_INIT(OpenSSH, Portable, openssh-unix-dev@mindrot.org)
-AC_REVISION($Revision: 1.365 $)
+AC_REVISION($Revision: 1.366 $)
 AC_CONFIG_SRCDIR([ssh.c])
 
 AC_CONFIG_HEADER(config.h)
@@ -3086,7 +3086,7 @@ AC_ARG_WITH(opensc,
                         LIBOPENSC_CFLAGS=`$OPENSC_CONFIG --cflags`
                         LIBOPENSC_LIBS=`$OPENSC_CONFIG --libs`
                         CPPFLAGS="$CPPFLAGS $LIBOPENSC_CFLAGS"
-                        LDFLAGS="$LDFLAGS $LIBOPENSC_LIBS"
+                        LIBS="$LIBS $LIBOPENSC_LIBS"
                         AC_DEFINE(SMARTCARD)
                         AC_DEFINE(USE_OPENSC, 1,
                                 [Define if you want smartcard support