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

This commit is contained in:
Yang Tse
2008-07-25 13:21:14 +00:00
parent 7fdeb14e6d
commit 6b7e74a030
6 changed files with 4 additions and 4 deletions

View File

@@ -21,7 +21,7 @@
# $Id$ # $Id$
########################################################################### ###########################################################################
ACLOCAL_AMFLAGS = -I . ACLOCAL_AMFLAGS = -I m4
AUTOMAKE_OPTIONS = foreign AUTOMAKE_OPTIONS = foreign

View File

@@ -1,4 +1,4 @@
ACLOCAL_AMFLAGS = -I . ACLOCAL_AMFLAGS = -I m4
AUTOMAKE_OPTIONS = foreign AUTOMAKE_OPTIONS = foreign

View File

@@ -1,7 +1,7 @@
#!/bin/sh #!/bin/sh
${LIBTOOLIZE:-libtoolize} --copy --automake --force ${LIBTOOLIZE:-libtoolize} --copy --automake --force
ACLOCAL_FLAGS="-I . $ACLOCAL_FLAGS" ACLOCAL_FLAGS="-I m4 $ACLOCAL_FLAGS"
${ACLOCAL:-aclocal} $ACLOCAL_FLAGS ${ACLOCAL:-aclocal} $ACLOCAL_FLAGS
${AUTOHEADER:-autoheader} ${AUTOHEADER:-autoheader}
${AUTOCONF:-autoconf} ${AUTOCONF:-autoconf}

View File

@@ -209,7 +209,7 @@ PERL=`findtool ${PERL:-perl}`
echo "buildconf: running libtoolize" echo "buildconf: running libtoolize"
$libtoolize --copy --automake --force || die "The libtoolize command failed" $libtoolize --copy --automake --force || die "The libtoolize command failed"
echo "buildconf: running aclocal" 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" ${ACLOCAL:-aclocal} $ACLOCAL_FLAGS || die "The aclocal command line failed"
if test -n "$PERL"; then if test -n "$PERL"; then
echo "buildconf: running aclocal hack to convert all mv to mv -f" echo "buildconf: running aclocal hack to convert all mv to mv -f"