[cairo-commit] configure.in Makefile.am

[Chris Wilson]

 Makefile.am  |    2 --
 configure.in |    2 +-
 2 files changed, 1 insertion(+), 3 deletions(-)

New commits:
commit d266648276cbd293a5cfa82bdc323695517098d8
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Mon Aug 11 08:40:22 2008 +0100

    [configure.in] Revert addition of MACRO_DIR()
    
    Without it we get a three line warning under Ubuntu. However, it just
    causes more problems than it is worth with older autoconf/automake.

diff --git a/Makefile.am b/Makefile.am
index 936d649..0458998 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -5,8 +5,6 @@ if CAIRO_HAS_PNG_FUNCTIONS
 SUBDIRS += boilerplate test perf
 endif
 
-ACLOCAL_AMFLAGS=-I m4
-
 
 .PHONY: doc test retest recheck check-valgrind
 # We have some generated header files, so we really need to build the
diff --git a/configure.in b/configure.in
index 68a9d65..94aaf46 100644
--- a/configure.in
+++ b/configure.in
@@ -14,7 +14,7 @@ AC_INIT([cairo],
       [http://bugs.freedesktop.org/enter_bug.cgi?product=cairo])
 AC_CONFIG_SRCDIR(src/cairo.h)
 AC_CONFIG_HEADERS(config.h)
-AC_CONFIG_MACRO_DIR([m4])
+dnl AC_CONFIG_MACRO_DIR([m4])
 
 dnl automake 1.8 requires autoconf 2.58
 dnl automake 1.7 requires autoconf 2.54