]> git.ipfire.org Git - thirdparty/freeswitch.git/commitdiff
[bootstrap] Now that some autogenerated files have been deleted
authorStefan Knoblich <stkn@freeswitch.org>
Mon, 8 Jun 2009 18:57:29 +0000 (18:57 +0000)
committerStefan Knoblich <stkn@freeswitch.org>
Mon, 8 Jun 2009 18:57:29 +0000 (18:57 +0000)
git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@13685 d0543943-73ff-0310-b7d9-9358b9ac24b2

bootstrap.sh

index e7b66356c2d2a1d3caa94842366f077d956f5062..0da40f64fcf2c1edd7b437097b7bf1db21a593f4 100755 (executable)
@@ -289,7 +289,7 @@ do
 
       LTTEST=`grep "AC_PROG_LIBTOOL" ${CFFILE}`
       LTTEST2=`grep "AM_PROG_LIBTOOL" ${CFFILE}`
-      AMTEST=`grep "AM_INIT_AUTOMAKE" ${CFFILE}`
+      AMTEST=`grep "AM_INIT_AUTOMAKE\|AC_PROG_INSTALL" ${CFFILE}`
       AHTEST=`grep "AC_CONFIG_HEADERS" ${CFFILE}`
 
       echo "Creating aclocal.m4"
@@ -314,12 +314,11 @@ do
           ${AUTOHEADER:-autoheader} ;
       fi
 
-#only run if AM_INIT_AUTOMAKE is in configure.in/configure.ac
-      if [ ! -z "${AMTEST}" ] ; then
-          if [ -f ${LIBDIR}/${i}/Makefile.am ] ; then
-              echo "Creating Makefile.in"
-              ${AUTOMAKE:-automake} --no-force --add-missing --copy ;
-          fi
+#run if AM_INIT_AUTOMAKE / AC_PROG_INSTALL is in configure.in/configure.ac
+#or Makefile.am exists
+      if [ ! -z "${AMTEST}" ]; then
+          echo "Creating Makefile.in"
+          ${AUTOMAKE:-automake} --no-force --add-missing --copy ;
       fi
       rm -rf autom4te*.cache
   fi