[svn] GnuPG - r4344 - in trunk: . g10

[svn author wk]

Author: wk
Date: 2006-11-21 16:29:52 +0100 (Tue, 21 Nov 2006)
New Revision: 4344

Modified:
   trunk/configure.ac
   trunk/g10/ChangeLog
   trunk/g10/Makefile.am
Log:
Changed order of libs


Modified: trunk/configure.ac
===================================================================
--- trunk/configure.ac	2006-11-21 11:00:14 UTC (rev 4343)
+++ trunk/configure.ac	2006-11-21 15:29:52 UTC (rev 4344)
@@ -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 @@
 #
 # 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
 
 

Modified: trunk/g10/ChangeLog
===================================================================
--- trunk/g10/ChangeLog	2006-11-21 11:00:14 UTC (rev 4343)
+++ trunk/g10/ChangeLog	2006-11-21 15:29:52 UTC (rev 4344)
@@ -1,5 +1,7 @@
 2006-11-21  Werner Koch  <wk at 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.

Modified: trunk/g10/Makefile.am
===================================================================
--- trunk/g10/Makefile.am	2006-11-21 11:00:14 UTC (rev 4343)
+++ trunk/g10/Makefile.am	2006-11-21 15:29:52 UTC (rev 4344)
@@ -29,7 +29,7 @@
 
 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