Commit 6b7e74a0 authored by Yang Tse's avatar Yang Tse
Browse files

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

parent 7fdeb14e

Makefile.am

+1 −1
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ 
# $Id$

###########################################################################



ACLOCAL_AMFLAGS = -I .

ACLOCAL_AMFLAGS = -I m4



AUTOMAKE_OPTIONS = foreign

ares/Makefile.am

+1 −1
Original line number Diff line number Diff line 
ACLOCAL_AMFLAGS = -I .

ACLOCAL_AMFLAGS = -I m4



AUTOMAKE_OPTIONS = foreign

ares/buildconf

+1 −1
Original line number Diff line number Diff line 
#!/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}

ares/reentrant.m4→ares/m4/reentrant.m4

+0 −0

File moved.

View file

buildconf

+1 −1
Original line number Diff line number Diff line
@@ -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"