[gimp] Add AC_CONFIG_MACRO_DIR() to configure.ac as suggested by libtoolize



commit 6601625af7682a1ccd71718190dcb10206b903c5
Author: Sven Neumann <s neumann raumfeld com>
Date:   Mon Feb 1 00:02:28 2010 +0100

    Add AC_CONFIG_MACRO_DIR() to configure.ac as suggested by libtoolize
    
    Also set ACLOCAL_AMFLAGS in the top-level Makefile.am and update
    the .gitignore file in the m4macros directory. This fixes the build
    from a fresh checkout for me. Please revert if it causes problems.

 Makefile.am         |    2 ++
 configure.ac        |    1 +
 m4macros/.gitignore |   11 +++++++++--
 3 files changed, 12 insertions(+), 2 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 6f675f0..14e91a3 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,5 +1,7 @@
 ## Process this file with automake to produce Makefile.in
 
+ACLOCAL_AMFLAGS = -I m4macros
+
 SUBDIRS = \
 	m4macros	\
 	tools		\
diff --git a/configure.ac b/configure.ac
index b2058d4..4c90be6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -68,6 +68,7 @@ AC_INIT([GIMP], [gimp_version],
         [gimp])
 
 AC_CONFIG_SRCDIR([app/core/gimp.c])
+AC_CONFIG_MACRO_DIR([m4macros])
 
 AM_INIT_AUTOMAKE(no-define dist-bzip2)
 AM_CONFIG_HEADER(config.h)
diff --git a/m4macros/.gitignore b/m4macros/.gitignore
index b336cc7..5953da9 100644
--- a/m4macros/.gitignore
+++ b/m4macros/.gitignore
@@ -1,2 +1,9 @@
-/Makefile
-/Makefile.in
+Makefile
+Makefile.in
+gtk-doc.m4
+intltool.m4
+libtool.m4
+lt~obsolete.m4
+ltoptions.m4
+ltsugar.m4
+ltversion.m4



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]