From fa1009b6fcfa2af29fd41ca29b5ec6dd767fc146 Mon Sep 17 00:00:00 2001
From: Yang Tse <yangsita@gmail.com>
Date: Sat, 26 Jul 2008 14:45:16 +0000
Subject: [PATCH] Explicitly include our m4 files first. This might minimize
 the impact that other package's underquoted m4 function definitions have on
 ours.

---
 ares/configure.ac | 8 ++++++++
 configure.ac      | 8 ++++++++
 2 files changed, 16 insertions(+)

diff --git a/ares/configure.ac b/ares/configure.ac
index 705fa27755..783116e668 100644
--- a/ares/configure.ac
+++ b/ares/configure.ac
@@ -1,5 +1,13 @@
 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 77e7ce58c4..4453f6cf20 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/])
 
-- 
GitLab