dirmngr (ChangeLog configure.ac src/ChangeLog src/Makefile.am)

[cvs user wk]

    Date: Thursday, November 25, 2004 @ 14:19:07
  Author: wk
    Path: /cvs/dirmngr/dirmngr

Modified: ChangeLog configure.ac src/ChangeLog src/Makefile.am

config changes


-----------------+
 ChangeLog       |    5 +++++
 configure.ac    |    4 ++--
 src/ChangeLog   |    5 +++++
 src/Makefile.am |    2 +-
 4 files changed, 13 insertions(+), 3 deletions(-)


Index: dirmngr/ChangeLog
diff -u dirmngr/ChangeLog:1.77 dirmngr/ChangeLog:1.78
--- dirmngr/ChangeLog:1.77	Fri Nov 19 16:27:28 2004
+++ dirmngr/ChangeLog	Thu Nov 25 14:19:07 2004
@@ -1,3 +1,8 @@
+2004-11-25  Werner Koch  <wk at g10code.com>
+
+	* configure.ac: Reverted to require autoconf/make 2.57/1.7.6 as
+	they still seem to work alhough I am using newer versions.
+
 2004-11-19  Werner Koch  <wk at g10code.com>
 
 	* configure.ac: Require libassuan 0.6.8.
Index: dirmngr/configure.ac
diff -u dirmngr/configure.ac:1.62 dirmngr/configure.ac:1.63
--- dirmngr/configure.ac:1.62	Fri Nov 19 16:27:28 2004
+++ dirmngr/configure.ac	Thu Nov 25 14:19:07 2004
@@ -19,8 +19,8 @@
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
 
 # Process this file with autoconf to produce a configure script.
-AC_PREREQ(2.59)
-min_automake_version="1.7.9"
+AC_PREREQ(2.57)
+min_automake_version="1.7.6"
 
 AC_INIT(dirmngr, 0.9.0-cvs, gpa-dev at gnupg.org)
 
Index: dirmngr/src/ChangeLog
diff -u dirmngr/src/ChangeLog:1.29 dirmngr/src/ChangeLog:1.30
--- dirmngr/src/ChangeLog:1.29	Wed Nov 24 18:19:25 2004
+++ dirmngr/src/ChangeLog	Thu Nov 25 14:19:07 2004
@@ -1,3 +1,8 @@
+2004-11-25  Werner Koch  <wk at g10code.com>
+
+	* Makefile.am (dirmngr_ldap_CFLAGS): Added GPG_ERROR_CFLAGS.
+	Noted by Bernhard Herzog.
+
 2004-11-24  Werner Koch  <wk at g10code.com>
 
 	* ldap.c (ldap_wrapper): Fixed default name of the ldap wrapper.
Index: dirmngr/src/Makefile.am
diff -u dirmngr/src/Makefile.am:1.20 dirmngr/src/Makefile.am:1.21
--- dirmngr/src/Makefile.am:1.20	Tue Nov 23 14:20:44 2004
+++ dirmngr/src/Makefile.am	Thu Nov 25 14:19:07 2004
@@ -50,7 +50,7 @@
 
 dirmngr_ldap_SOURCES = dirmngr_ldap.c i18n.h util.h \
                        no-libgcrypt.c no-libgcrypt.h 
-dirmngr_ldap_CFLAGS = $(LDAP_INCS)
+dirmngr_ldap_CFLAGS = $(LDAP_INCS) $(GPG_ERROR_CFLAGS)
 dirmngr_ldap_LDFLAGS = $(LDAP_RPATH)
 dirmngr_ldap_LDADD = ../jnlib/libjnlib.a $(LIBOBJS) $(GPG_ERROR_LIBS) \
 		    $(LDAP_LIBS)