From: Yang Tse <yangsita@gmail.com>
Date: Fri, 25 Jul 2008 13:21:14 +0000 (+0000)
Subject: move reentrant.m4 to the m4 subdirectory to avoid infinite loop inclusion problem
X-Git-Tag: cares-1_5_3~315
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=6b7e74a03045bae1403039ce9ca1c2aa3302d244;p=curl

move reentrant.m4 to the m4 subdirectory to avoid infinite loop inclusion problem
---

diff --git a/Makefile.am b/Makefile.am
index 5f2257dc6..ee26134b6 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -21,7 +21,7 @@
 # $Id$
 ###########################################################################
 
-ACLOCAL_AMFLAGS = -I .
+ACLOCAL_AMFLAGS = -I m4
 
 AUTOMAKE_OPTIONS = foreign
 
diff --git a/ares/Makefile.am b/ares/Makefile.am
index b265703d0..2c01c6c07 100644
--- a/ares/Makefile.am
+++ b/ares/Makefile.am
@@ -1,4 +1,4 @@
-ACLOCAL_AMFLAGS = -I .
+ACLOCAL_AMFLAGS = -I m4
 
 AUTOMAKE_OPTIONS = foreign
 
diff --git a/ares/buildconf b/ares/buildconf
index ed3f81d1e..434a308fd 100755
--- a/ares/buildconf
+++ b/ares/buildconf
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 ${LIBTOOLIZE:-libtoolize} --copy --automake --force
-ACLOCAL_FLAGS="-I . $ACLOCAL_FLAGS"
+ACLOCAL_FLAGS="-I m4 $ACLOCAL_FLAGS"
 ${ACLOCAL:-aclocal} $ACLOCAL_FLAGS
 ${AUTOHEADER:-autoheader}
 ${AUTOCONF:-autoconf}
diff --git a/ares/reentrant.m4 b/ares/m4/reentrant.m4
similarity index 100%
rename from ares/reentrant.m4
rename to ares/m4/reentrant.m4
diff --git a/buildconf b/buildconf
index 9fc0c5709..b0ef8ee5a 100755
--- a/buildconf
+++ b/buildconf
@@ -209,7 +209,7 @@ PERL=`findtool ${PERL:-perl}`
 echo "buildconf: running libtoolize"
 $libtoolize --copy --automake --force || die "The libtoolize command failed"
 echo "buildconf: running aclocal"
-ACLOCAL_FLAGS="-I . $ACLOCAL_FLAGS"
+ACLOCAL_FLAGS="-I m4 $ACLOCAL_FLAGS"
 ${ACLOCAL:-aclocal} $ACLOCAL_FLAGS || die "The aclocal command line failed"
 if test -n "$PERL"; then
   echo "buildconf: running aclocal hack to convert all mv to mv -f"
diff --git a/reentrant.m4 b/m4/reentrant.m4
similarity index 100%
rename from reentrant.m4
rename to m4/reentrant.m4