]> git.ipfire.org Git - thirdparty/freeswitch.git/commitdiff
remove gnu grepisms breaking test on solaris
authorMichael Jerris <mike@jerris.com>
Wed, 10 Jun 2009 21:45:27 +0000 (21:45 +0000)
committerMichael Jerris <mike@jerris.com>
Wed, 10 Jun 2009 21:45:27 +0000 (21:45 +0000)
git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@13752 d0543943-73ff-0310-b7d9-9358b9ac24b2

bootstrap.sh

index 62ad1afac9d962971ec13b218000499f7c0e4bab..f041c2a24dec220840d3300a60f2630e120c89c8 100755 (executable)
@@ -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