commit ecb344a5d27e07fc8b5402afac9d2939d9ad3c13
parent a2e8e406a5ae7ee0680a580dfa1edb2bbdd3127e
Author: Paul Mangan <paul@claws-mail.org>
Date: Fri, 3 Apr 2009 09:13:09 +0000
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
Diffstat:
4 files changed, 11 insertions(+), 15 deletions(-)
diff --git 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
@@ -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
@@ -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
@@ -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
-])
