Rob Lahaye <[EMAIL PROTECTED]> writes:
| +ACLOCAL=aclocal
| +AUTOHEADER="autoheader"
| +AUTOMAKE="automake -a -c --foreign"
| +AUTOCONF="autoconf"
| +
This change is ok.
| echo -n "Locating GNU m4... "
| +GNUM4=
| for prog in $M4 gm4 gnum4 m4 ; do
| - case `$prog --version 2>&1` in
| - *GNU*) ok=yes
| - GNUM4=$prog
| - echo "found: $GNUM4"
| - break ;;
| - *) ;;
| - esac
| + # some m4 compilers (e.g. FreeBSD's m4) make this script hang without
|receiving input
| + case `$prog --version < /dev/null 2>&1` in
| + *GNU*) GNUM4=$prog
| + echo `which $GNUM4`
| + break ;;
| + *) ;;
| + esac
| done
| -if test x$ok != xyes ; then
| - echo "not found."
| +if test -z $GNUM4 ; then
This test looks wrong... what happens if GNUM4 is not set?
Just use the old way.
| + echo "not found."
| + exit
| fi
|
| # Generate acinclude.m4
| @@ -57,7 +58,7 @@
| echo "done."
|
| # Generate the Makefiles and configure files
| -if ( $ACLOCAL --version ) </dev/null > /dev/null 2>&1; then
| +if ( $ACLOCAL --version ) < /dev/null > /dev/null 2>&1; then
adding this space is ok.
| # Autogenerate lib/configure.m4.
| -if test x$GNUM4 != x ; then
| - echo -n "Building lib/configure ... "
| - rm -f lib/configure
| - $GNUM4 lib/configure.m4 > lib/configure
| - chmod a+x lib/configure
| - echo "done."
| -else
| - echo "No GNU m4. Impossible to build lib/configure -- aborting"
| - exit
| -fi
| +echo -n "Building lib/configure ... "
| +rm -f lib/configure
| +$GNUM4 lib/configure.m4 > lib/configure
| +chmod a+x lib/configure
| +echo "done."
ok
--
Lgb
