summaryrefslogtreecommitdiff
path: root/ares
diff options
context:
space:
mode:
authorYang Tse <yangsita@gmail.com>2008-07-25 13:21:14 +0000
committerYang Tse <yangsita@gmail.com>2008-07-25 13:21:14 +0000
commit6b7e74a03045bae1403039ce9ca1c2aa3302d244 (patch)
treec5f04fea2e5715d4a99fb8a10e26c2918455e347 /ares
parent7fdeb14e6de9cb8cfa8040656de1df869e8ef2ff (diff)
downloadcurl-6b7e74a03045bae1403039ce9ca1c2aa3302d244.tar.gz
move reentrant.m4 to the m4 subdirectory to avoid infinite loop inclusion problem
Diffstat (limited to 'ares')
-rw-r--r--ares/Makefile.am2
-rwxr-xr-xares/buildconf2
-rw-r--r--ares/m4/reentrant.m4 (renamed from ares/reentrant.m4)0
3 files changed, 2 insertions, 2 deletions
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
index 01d2136a7..01d2136a7 100644
--- a/ares/reentrant.m4
+++ b/ares/m4/reentrant.m4