* configure.ac.in is no more, we can now use configure.ac like normal people,

[vlc] / bootstrap

diff --git a/bootstrap b/bootstrap
index e2f085ca481043d5426f9785deaf527ecf721d40..546a4a3329dcf90ef8a3928200d47f6a204e5e3b 100755 (executable)
--- a/bootstrap
+++ b/bootstrap
@@ -1,7 +1,7 @@
 #! /bin/sh
 
 ##  bootstrap file for the VLC media player
-##  $Id: bootstrap,v 1.48 2003/05/25 22:36:33 titer Exp $
+##  $Id: bootstrap,v 1.49 2003/06/21 17:04:20 sam Exp $
 ##
 ##  Authors: Samuel Hocevar <sam@zoy.org>
 
@@ -43,22 +43,18 @@ if test x`uname -s` = xDarwin; then ulimit -s 20000; fi
 ## Generate the modules makefile, by parsing modules/**/Modules.am
 ##
 
-printf "generating Modules.am and configure.ac"
+printf "generating Modules.am and vlc.m4"
 
-rm -f Modules.am configure.ac
-
-echo > Modules.am
-echo > configure.ac
-
-ALL_FLAGS="`sed -n -e '/^[^=A-Z]*[A-Z]*FLAGS_[^=]*=/s/[^=A-Z]*\([A-Z]*FLAGS_[^=]*=\).*/\1/p' < configure.ac.in | sort | uniq`"
-
-cat >> configure.ac << EOF
-dnl ################################################################
-dnl # Do not edit this file, it was generated from configure.ac.in #
-dnl ################################################################
+# Prepare Modules.am and m4/vlc.m4
+rm -f Modules.am && echo > Modules.am
+rm -f m4/vlc.m4 && cat > m4/vlc.m4 << EOF
+dnl  Private VLC macros - generated by bootstrap
 
+dnl  The required AM_CONDITIONAL an AC_SUBST calls
+AC_DEFUN([VLC_VARIABLES], [
 EOF
-sed -n -e '/dnl do not touch this line/q;p' < configure.ac.in >> configure.ac
+
+ALL_FLAGS="`sed -n -e '/^[^=A-Z]*[A-Z]*FLAGS_[^=]*=/s/[^=A-Z]*\([A-Z]*FLAGS_[^=]*=\).*/\1/p' < configure.ac | sort | uniq`"
 
 modules=""
 for mf in `sed -ne 's@[^a-z]*\([^ ]*\)am.*@modules/\1am@p' < modules/Makefile.am`
@@ -77,24 +73,24 @@ EOF
   do
     LINKER="LINK"
     if echo "$ALL_FLAGS" | grep '^CPPFLAGS_'${mod}'=$' >/dev/null 2>&1; then
-        echo "AC_SUBST(CPPFLAGS_${mod})" >> configure.ac; fi
+        echo "AC_SUBST(CPPFLAGS_${mod})" >> m4/vlc.m4; fi
     if echo "$ALL_FLAGS" | grep '^CFLAGS_'${mod}'=$' >/dev/null 2>&1; then
-        echo "AC_SUBST(CFLAGS_${mod})" >> configure.ac; fi
+        echo "AC_SUBST(CFLAGS_${mod})" >> m4/vlc.m4; fi
     if echo "$ALL_FLAGS" | grep '^CXXFLAGS_'${mod}'=$' >/dev/null 2>&1; then
         LINKER="CXXLINK"
-        echo "AC_SUBST(CXXFLAGS_${mod})" >> configure.ac; fi
+        echo "AC_SUBST(CXXFLAGS_${mod})" >> m4/vlc.m4; fi
     if echo "$ALL_FLAGS" | grep '^OBJCFLAGS_'${mod}'=$' >/dev/null 2>&1; then
         LINKER="OBJCLINK"
-        echo "AC_SUBST(OBJCFLAGS_${mod})" >> configure.ac; fi
+        echo "AC_SUBST(OBJCFLAGS_${mod})" >> m4/vlc.m4; fi
     if echo "$ALL_FLAGS" | grep '^LDFLAGS_'${mod}'=$' >/dev/null 2>&1; then
-        echo "AC_SUBST(LDFLAGS_${mod})" >> configure.ac; fi
+        echo "AC_SUBST(LDFLAGS_${mod})" >> m4/vlc.m4; fi
     if grep '^SOURCES_'${mod}'.*=.*PRIVATE' < ${mf} >/dev/null 2>&1; then
         PRIVATE='#'; else
         PRIVATE=''; fi
     if grep '^nodist_SOURCES_'${mod}'' < ${mf} >/dev/null 2>&1; then
         NODIST=''; else
         NODIST='#'; fi
-    cat >> configure.ac << EOF
+    cat >> m4/vlc.m4 << EOF
 AM_CONDITIONAL(${mod}_plugin, test x\$${mod}_plugin = xyes)
 AM_CONDITIONAL(${mod}_builtin, test x\$${mod}_builtin = xyes)
 EOF
@@ -164,8 +160,10 @@ EOF
   done
 done
 
-echo "AM_CONDITIONAL(UNTRUE, false)" >> configure.ac
-sed -n -e '/dnl do not touch this line/,//p' < configure.ac.in >> configure.ac
+cat >> m4/vlc.m4 << EOF
+AM_CONDITIONAL(UNTRUE, false)
+])
+EOF
 
 echo "done."
 
@@ -175,7 +173,7 @@ echo "done."
 set -x
 
 # remove autotools cruft
-rm -f aclocal.m4 configure config.log
+rm -f aclocal.m4 configure configure.ac.in config.log
 # remove old autotools extra cruft
 rm -f config.guess config.sub missing mkinstalldirs compile depcomp install-sh
 # remove new autotools extra cruft
@@ -185,8 +183,6 @@ rm -f ltmain.sh libtool ltconfig
 # remove gettext cruft
 rm -f m4/oldgettext.m4 ABOUT-NLS
 rm -Rf intl
-# update m4 local macros
-rm -f m4/vlc.m4 && echo "dnl  Private VLC macros" > m4/vlc.m4
 
 # Check for gettext
 if gettextize --version >/dev/null 2>&1
@@ -202,14 +198,22 @@ else
   echo > ABOUT-NLS
   mkdir -p intl
   echo > intl/Makefile.am
-  echo 'AC_DEFUN([AM_GNU_GETTEXT_VERSION], [])' >> m4/vlc.m4
+  cat >> m4/vlc.m4 << EOF
+dnl  User's gettext is too old, so this is a no-op
+AC_DEFUN([AM_GNU_GETTEXT_VERSION], [])
+
+EOF
   GETTEXT=old
 fi;else
   # we don't have gettext. grmbl. try to continue anyway.
   echo > ABOUT-NLS
   mkdir -p intl
   echo > intl/Makefile.am
-  echo 'AC_DEFUN([AM_GNU_GETTEXT_VERSION], [])' >> m4/vlc.m4
+  cat >> m4/vlc.m4 << EOF
+dnl  User does not have gettext, so this is a no-op
+AC_DEFUN([AM_GNU_GETTEXT_VERSION], [])
+
+EOF
   GETTEXT=no
 fi
 
@@ -220,7 +224,11 @@ then
   PKGCONFIG=yes
 else
   # Not present, use a workaround.
-  echo 'AC_DEFUN([PKG_CHECK_MODULES], [])' > m4/vlc.m4
+  cat >> m4/vlc.m4 << EOF
+dnl  User does not have pkg-config, so this is a no-op
+AC_DEFUN([PKG_CHECK_MODULES], [])
+
+EOF
   PKGCONFIG=no
 fi