From: Michael Jerris Date: Wed, 10 Jun 2009 21:45:27 +0000 (+0000) Subject: remove gnu grepisms breaking test on solaris X-Git-Tag: v1.0.4~504 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=de167c4448eacb0a3a57c396ecbdd582177c80dd;p=thirdparty%2Ffreeswitch.git remove gnu grepisms breaking test on solaris git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@13752 d0543943-73ff-0310-b7d9-9358b9ac24b2 --- diff --git a/bootstrap.sh b/bootstrap.sh index 62ad1afac9..f041c2a24d 100755 --- a/bootstrap.sh +++ b/bootstrap.sh @@ -289,7 +289,8 @@ do LTTEST=`grep "AC_PROG_LIBTOOL" ${CFFILE}` LTTEST2=`grep "AM_PROG_LIBTOOL" ${CFFILE}` - AMTEST=`grep "AM_INIT_AUTOMAKE\|AC_PROG_INSTALL" ${CFFILE}` + AMTEST=`grep "AM_INIT_AUTOMAKE" ${CFFILE}` + AMTEST2=`grep "AC_PROG_INSTALL" ${CFFILE}` AHTEST=`grep "AC_CONFIG_HEADERS" ${CFFILE}` echo "Creating aclocal.m4" @@ -315,7 +316,7 @@ do fi #run if AM_INIT_AUTOMAKE / AC_PROG_INSTALL is in configure.in/configure.ac - if [ ! -z "${AMTEST}" ]; then + if [ ! -z "${AMTEST}" -o "${AMTEST2}" ] ; then echo "Creating Makefile.in" ${AUTOMAKE:-automake} --no-force --add-missing --copy ; fi