From 82423b1e94e1443be48f91c838d0cb701ecac8d9 Mon Sep 17 00:00:00 2001
From: Werner Koch <wk@gnupg.org>
Date: Tue, 21 Nov 2006 15:29:52 +0000
Subject: [PATCH] Changed order of libs

---
 configure.ac    | 8 ++++----
 g10/ChangeLog   | 2 ++
 g10/Makefile.am | 2 +-
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/configure.ac b/configure.ac
index 38c343895..c180247b1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -20,7 +20,7 @@
 # USA.
 
 # Process this file with autoconf to produce a configure script.
-AC_PREREQ(2.52)
+AC_PREREQ(2.59)
 min_automake_version="1.9.3"
 
 # Remember to change the version number immediately *after* a release.
@@ -978,9 +978,9 @@ AC_CHECK_FUNCS([flockfile funlockfile fopencookie funopen])
 #
 # gnulib checks
 #
-gl_SOURCE_BASE(gl)
-gl_M4_BASE(gl/m4)
-gl_MODULES(setenv mkdtemp vasprintf xsize)
+gl_SOURCE_BASE([gl])
+gl_M4_BASE([gl/m4])
+gl_MODULES([setenv mkdtemp vasprintf xsize])
 gl_INIT
 
 
diff --git a/g10/ChangeLog b/g10/ChangeLog
index 2040d7876..9c5deb307 100644
--- a/g10/ChangeLog
+++ b/g10/ChangeLog
@@ -1,5 +1,7 @@
 2006-11-21  Werner Koch  <wk@g10code.com>
 
+	* Makefile.am (needed_libs): libgnu needs to come after libcommon.
+
 	* keygen.c (ask_expire_interval): Print y2038 warning only for 32
 	bit time_t.
 	(save_unprotected_key_to_card): Made RSA_N_LEN et al a size_t.
diff --git a/g10/Makefile.am b/g10/Makefile.am
index bf1e19b5b..a38e03bab 100644
--- a/g10/Makefile.am
+++ b/g10/Makefile.am
@@ -29,7 +29,7 @@ include $(top_srcdir)/am/cmacros.am
 
 AM_CFLAGS = $(LIBGCRYPT_CFLAGS) $(LIBASSUAN_CFLAGS) $(GPG_ERROR_CFLAGS)
 
-needed_libs = ../gl/libgnu.a ../common/libcommon.a ../jnlib/libjnlib.a
+needed_libs = ../common/libcommon.a ../jnlib/libjnlib.a ../gl/libgnu.a 
 
 bin_PROGRAMS = gpg2 gpgv2