From 9542cc88a8e24d615d9461ab33c89470f508a14a Mon Sep 17 00:00:00 2001 From: Sam Hocevar Date: Sat, 21 Jun 2003 17:04:20 +0000 Subject: [PATCH] * configure.ac.in is no more, we can now use configure.ac like normal people, bootstrap generates the proper magic for us. --- HACKING | 6 ++-- Makefile.am | 3 +- bootstrap | 64 ++++++++++++++++++--------------- configure.ac.in => configure.ac | 8 +++-- doc/release-howto.txt | 2 +- toolbox | 10 +++--- vlc.ebuild | 6 +--- 7 files changed, 52 insertions(+), 47 deletions(-) rename configure.ac.in => configure.ac (99%) diff --git a/HACKING b/HACKING index c5425dfb62..2ee0317201 100644 --- a/HACKING +++ b/HACKING @@ -1,4 +1,4 @@ -$Id: HACKING,v 1.6 2002/10/07 21:58:40 massiot Exp $ +$Id: HACKING,v 1.7 2003/06/21 17:04:20 sam Exp $ Hacking vlc =========== @@ -43,8 +43,8 @@ The bootstrap script does the following actions: which contains additional build rules for modules, and includes all the Modules.am files that were found in modules/ - - create a top-level configure.ac file from configure.ac.in, generating - the AC_SUBST and AM_CONDITIONAL rules that will be needed. + - create an m4/vlc.m4 from configure.ac, generating the AC_SUBST and + AM_CONDITIONAL rules that will be needed by configure.ac. - run autopoint (previously gettextize) to create an intl/ directory, needed when libgettext is not available. diff --git a/Makefile.am b/Makefile.am index 0a4af38b4f..0a2ae37bff 100644 --- a/Makefile.am +++ b/Makefile.am @@ -17,7 +17,6 @@ EXTRA_DIST = \ Modules.am \ README.MacOSX.rtf \ bootstrap \ - configure.ac.in \ install-win32 \ src/extras/COPYING \ toolbox \ @@ -43,7 +42,7 @@ noinst_HEADERS = # Tell aclocal to use -I m4. Wonder if it really works. ACLOCAL_AMFLAGS = -I m4 -# XXX: these flags could be set in configure.ac.in, but we set them here +# XXX: these flags could be set in configure.ac, but we set them here # because old versions of automake don't support them in configure.ac. AUTOMAKE_OPTIONS = dist-bzip2 subdir-objects diff --git a/bootstrap b/bootstrap index e2f085ca48..546a4a3329 100755 --- 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 @@ -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 diff --git a/configure.ac.in b/configure.ac similarity index 99% rename from configure.ac.in rename to configure.ac index 372aa4e647..d62966fb01 100644 --- a/configure.ac.in +++ b/configure.ac @@ -3154,9 +3154,6 @@ then fi] AM_CONDITIONAL(HAVE_BUILTINS, ${builtin_support}) -dnl do not touch this line (bootstrap needs it) - - dnl dnl Stuff used by the program dnl @@ -3189,6 +3186,11 @@ dnl AUTOMAKE_SUCKS="\$(L_builtin) \$(LDFLAGS_builtin)" AC_SUBST(AUTOMAKE_SUCKS) +dnl +dnl Import substitution variables generated by bootstrap +dnl +VLC_VARIABLES + dnl dnl Create the vlc-config script dnl diff --git a/doc/release-howto.txt b/doc/release-howto.txt index b43edf58d5..2cb4996917 100644 --- a/doc/release-howto.txt +++ b/doc/release-howto.txt @@ -10,7 +10,7 @@ - générer un timestamp de release (par exemple avec 822-date) - updater le numéro de version partout où c'est nécessaire - · configure.ac.in (relancer autoconf) + · configure.ac (relancer autoconf) · vlc.spec · ipkg/control · debian/changelog diff --git a/toolbox b/toolbox index 07ad1707f5..dc75194a78 100755 --- a/toolbox +++ b/toolbox @@ -1,7 +1,7 @@ #! /bin/sh ## toolbox for the VLC media player -## $Id: toolbox,v 1.25 2003/05/24 12:34:31 sam Exp $ +## $Id: toolbox,v 1.26 2003/06/21 17:04:20 sam Exp $ ## ## Authors: Samuel Hocevar @@ -109,9 +109,9 @@ then # The evil ^M M=' ' - # Variables we get from configure.ac.in - LIBVLC_VERSION=`sed -ne '/AC_INIT/s/.*,\(.*\))/\1/p' < configure.ac.in` - LIBVLC_CODENAME=`sed -ne '/CODENAME=/s/.*"\(.*\)"/\1/p' < configure.ac.in` + # Variables we get from configure.ac + LIBVLC_VERSION=`sed -ne '/AC_INIT/s/.*,\(.*\))/\1/p' < configure.ac` + LIBVLC_CODENAME=`sed -ne '/CODENAME=/s/.*"\(.*\)"/\1/p' < configure.ac` LIBVLC_SYMBOL=`echo $LIBVLC_VERSION | sed -e 'y/.-/__/'` # Sources that get built under Win32 - FIXME: anyone wanna deuglify this? :) @@ -518,7 +518,7 @@ then find evc -type f -name '*.vcp' -exec rm -f '{}' ';' #find . -type d -name '.deps' -exec rm -Rf '{}' ';' # there's some more cruft all around - rm -f configure.ac config.h config.log config.status + rm -f config.h config.log config.status rm -f vlc vlc-config Makefile Modules.am rm -Rf autom4te.cache rm -f mozilla/vlcintf.h mozilla/vlcintf.xpt diff --git a/vlc.ebuild b/vlc.ebuild index d9cea4b492..1bf54694c0 100644 --- a/vlc.ebuild +++ b/vlc.ebuild @@ -2,7 +2,7 @@ # vlc.ebuild: A Gentoo ebuild for vlc ############################################################################### # Copyright (C) 2003 VideoLAN -# $Id: vlc.ebuild,v 1.6 2003/06/20 01:27:55 hartman Exp $ +# $Id: vlc.ebuild,v 1.7 2003/06/21 17:04:20 sam Exp $ # # Authors: Derk-Jan Hartman # @@ -100,10 +100,6 @@ src_unpack() { cp configure.ac configure.ac.orig sed "s:-lkfile::" \ configure.ac.orig > configure.ac - # adding configure.ac.in - cp configure.ac.in configure.ac.in.orig - sed "s:-lkfile::" \ - configure.ac.in.orig > configure.ac.in cd ${S}/modules/gui/kde cp interface.h interface.h.orig -- 2.39.2