Remove explicit inclusion of our m4 files first. It was interesting as a test,

but it breaks aclocal execution on some systems, with the following error:

Can't locate object method "rel2abs" via package "File::Spec" at /usr/local/bin/aclocal line 256.

diff --git a/ares/configure.ac b/ares/configure.ac
index 8d24043763266dce8678d1fe281668719c5effe2..c188bd1a3b2ee245ad9361e0b14f5a0e1139cbf6 100644 (file)
--- a/ares/configure.ac
+++ b/ares/configure.ac
@@ -1,13 +1,5 @@
 AC_PREREQ(2.57)
 
-dnl Explicitly include our m4 files first. Without these explicit inclusions
-dnl aclocal will actually find and include them automatically, but before it
-dnl does it might fully scan all other system installed m4 files. Doing this
-dnl explicit inclusion also allows us to override definitions of macros done
-dnl elsewhere in other packages with the ones done in our included files.
-m4_include([m4/reentrant.m4])
-m4_include([acinclude.m4])
-
 dnl Version not hardcoded here. Fetched later from ares_version.h
 AC_INIT([c-ares], [-],
   [c-ares mailing list => http://cool.haxx.se/mailman/listinfo/c-ares])

diff --git a/configure.ac b/configure.ac
index 609ecf6b08870bcef0e7e4f84f63fe1e90a0238a..7e0e3f35168ee81aee32f9fc1dff0595c08ab039 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -24,14 +24,6 @@ dnl Process this file with autoconf to produce a configure script.
 
 AC_PREREQ(2.57)
 
-dnl Explicitly include our m4 files first. Without these explicit inclusions
-dnl aclocal will actually find and include them automatically, but before it
-dnl does it might fully scan all other system installed m4 files. Doing this
-dnl explicit inclusion also allows us to override definitions of macros done
-dnl elsewhere in other packages with the ones done in our included files.
-m4_include([m4/reentrant.m4])
-m4_include([acinclude.m4])
-
 dnl We don't know the version number "statically" so we use a dash here
 AC_INIT([curl], [-], [a suitable curl mailing list => http://curl.haxx.se/mail/])