Author: mikej Date: Wed Jun 10 16:45:27 2009 New Revision: 13752 Log: remove gnu grepisms breaking test on solaris Modified: freeswitch/trunk/bootstrap.sh Modified: freeswitch/trunk/bootstrap.sh ============================================================================== --- freeswitch/trunk/bootstrap.sh (original) +++ freeswitch/trunk/bootstrap.sh Wed Jun 10 16:45:27 2009 @@ -289,7 +289,8 @@ 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 @@ 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
participants (1)
-
FreeSWITCH SVN