2009-04-03 [paul] 3.7.1cvs35

	* configure.ac
		add AC_CONFIG_MACRO_DIR([m4])
		remove CLAWS_ACLOCAL_INCLUDE(m4)
	* m4/aclocal-include.m4
		removed this now unneeded file

diff --git a/ChangeLog b/ChangeLog
index c265462b3448c88503e0fe66c79b3f6cfb607308..502601d2c284ba63b411f747942e92945873d257 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2009-04-03 [paul]      3.7.1cvs35
+
+       * configure.ac
+               add AC_CONFIG_MACRO_DIR([m4])
+               remove CLAWS_ACLOCAL_INCLUDE(m4)
+       * m4/aclocal-include.m4
+               removed this now unneeded file
+
 2009-04-02 [colin]     3.7.1cvs34
 
        * src/common/utils.h

diff --git a/PATCHSETS b/PATCHSETS
index 23e8777599fcda4ec3bc8d0a717de7851dce58dc..c4afb85628c12bbdbb846abcb6013bb356b44651 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -3774,3 +3774,4 @@
 ( cvs diff -u -r 1.2.2.34 -r 1.2.2.35 src/folder_item_prefs.c;  ) > 3.7.1cvs32.patchset
 ( cvs diff -u -r 1.20.2.68 -r 1.20.2.69 src/common/utils.h;  cvs diff -u -r 1.1.4.12 -r 1.1.4.13 src/etpan/etpan-thread-manager.c;  ) > 3.7.1cvs33.patchset
 ( cvs diff -u -r 1.20.2.69 -r 1.20.2.70 src/common/utils.h;  ) > 3.7.1cvs34.patchset
+( cvs diff -u -r 1.654.2.3842 -r 1.654.2.3843 configure.ac;  cvs diff -u -r -1.1.4.2 -r -1.1.4.3 m4/aclocal-include.m4;  ) > 3.7.1cvs35.patchset

diff --git a/configure.ac b/configure.ac
index d27416d8c896ce19d49e37c6556a00ec49987203..2a3e8ad22301a82bbec6402a43d100a3e8631b60 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -2,6 +2,7 @@
 AC_PREREQ(2.60)
 AC_INIT(src/main.c)
 AC_CONFIG_AUX_DIR(config)
+AC_CONFIG_MACRO_DIR([m4])
 
 PACKAGE=claws-mail
 
@@ -11,7 +12,7 @@ MINOR_VERSION=7
 MICRO_VERSION=1
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=34
+EXTRA_VERSION=35
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
@@ -90,8 +91,6 @@ LT_AC_PROG_RC
 AC_LIBTOOL_RC
 AC_PROG_LIBTOOL
 
-CLAWS_ACLOCAL_INCLUDE(m4)
-  
 dnl ******************************
 dnl Checks for host
 dnl Not needed anymore because we 

diff --git a/m4/aclocal-include.m4 b/m4/aclocal-include.m4
deleted file mode 100644 (file)
index 443387a..0000000
--- a/m4/aclocal-include.m4
+++ /dev/null
@@ -1,12 +0,0 @@
-# aclocal-include.m4
-#
-# This macro adds the name macrodir to the set of directories
-# that `aclocal' searches for macros.
-
-dnl CLAWS_ACLOCAL_INCLUDE(macrodir)
-AC_DEFUN([CLAWS_ACLOCAL_INCLUDE],
-[
-       test -n "$ACLOCAL_FLAGS" && ACLOCAL="$ACLOCAL $ACLOCAL_FLAGS"
-
-       for k in $1 ; do ACLOCAL="$ACLOCAL -I $k" ; done
-])