Explicitly include our m4 files first. This might minimize the impact

that other package's underquoted m4 function definitions have on ours.

1 files changed, 8 insertions, 0 deletions

diff --git a/configure.ac b/configure.ac
index 77e7ce58c..4453f6cf2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -24,6 +24,14 @@ 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/])