Skip to content

V
vlc-2-2
Commit 9542cc88 authored by Sam Hocevar's avatar Sam Hocevar
Browse files
Options

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

    bootstrap generates the proper magic for us.
parent 00aa8b77
Show whitespace changes
Inline Side-by-side
Showing with 52 additions and 47 deletions
HACKING
View file @ 9542cc88
$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 Hacking vlc
=========== ===========
...@@ -43,8 +43,8 @@ The bootstrap script does the following actions: ...@@ -43,8 +43,8 @@ The bootstrap script does the following actions:
which contains additional build rules for modules, and includes all the which contains additional build rules for modules, and includes all the
Modules.am files that were found in modules/ Modules.am files that were found in modules/
- create a top-level configure.ac file from configure.ac.in, generating - create an m4/vlc.m4 from configure.ac, generating the AC_SUBST and
the AC_SUBST and AM_CONDITIONAL rules that will be needed. AM_CONDITIONAL rules that will be needed by configure.ac.
- run autopoint (previously gettextize) to create an intl/ directory, - run autopoint (previously gettextize) to create an intl/ directory,
needed when libgettext is not available. needed when libgettext is not available.
......
Makefile.am
View file @ 9542cc88
...@@ -17,7 +17,6 @@ EXTRA_DIST = \ ...@@ -17,7 +17,6 @@ EXTRA_DIST = \
Modules.am \ Modules.am \
README.MacOSX.rtf \ README.MacOSX.rtf \
bootstrap \ bootstrap \
configure.ac.in \
install-win32 \ install-win32 \
src/extras/COPYING \ src/extras/COPYING \
toolbox \ toolbox \
...@@ -43,7 +42,7 @@ noinst_HEADERS = ...@@ -43,7 +42,7 @@ noinst_HEADERS =
# Tell aclocal to use -I m4. Wonder if it really works. # Tell aclocal to use -I m4. Wonder if it really works.
ACLOCAL_AMFLAGS = -I m4 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. # because old versions of automake don't support them in configure.ac.
AUTOMAKE_OPTIONS = dist-bzip2 subdir-objects AUTOMAKE_OPTIONS = dist-bzip2 subdir-objects
......
bootstrap
View file @ 9542cc88
#! /bin/sh #! /bin/sh
## bootstrap file for the VLC media player ## 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> ## Authors: Samuel Hocevar <sam@zoy.org>
...@@ -43,22 +43,18 @@ if test x`uname -s` = xDarwin; then ulimit -s 20000; fi ...@@ -43,22 +43,18 @@ if test x`uname -s` = xDarwin; then ulimit -s 20000; fi
## Generate the modules makefile, by parsing modules/**/Modules.am ## 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 # Prepare Modules.am and m4/vlc.m4
rm -f Modules.am && echo > Modules.am
echo > Modules.am rm -f m4/vlc.m4 && cat > m4/vlc.m4 << EOF
echo > configure.ac dnl Private VLC macros - generated by bootstrap
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 ################################################################
dnl The required AM_CONDITIONAL an AC_SUBST calls
AC_DEFUN([VLC_VARIABLES], [
EOF 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="" modules=""
for mf in `sed -ne 's@[^a-z]*\([^ ]*\)am.*@modules/\1am@p' < modules/Makefile.am` for mf in `sed -ne 's@[^a-z]*\([^ ]*\)am.*@modules/\1am@p' < modules/Makefile.am`
...@@ -77,24 +73,24 @@ EOF ...@@ -77,24 +73,24 @@ EOF
do do
LINKER="LINK" LINKER="LINK"
if echo "$ALL_FLAGS" | grep '^CPPFLAGS_'${mod}'=$' >/dev/null 2>&1; then 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 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 if echo "$ALL_FLAGS" | grep '^CXXFLAGS_'${mod}'=$' >/dev/null 2>&1; then
LINKER="CXXLINK" 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 if echo "$ALL_FLAGS" | grep '^OBJCFLAGS_'${mod}'=$' >/dev/null 2>&1; then
LINKER="OBJCLINK" 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 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 if grep '^SOURCES_'${mod}'.*=.*PRIVATE' < ${mf} >/dev/null 2>&1; then
PRIVATE='#'; else PRIVATE='#'; else
PRIVATE=''; fi PRIVATE=''; fi
if grep '^nodist_SOURCES_'${mod}'' < ${mf} >/dev/null 2>&1; then if grep '^nodist_SOURCES_'${mod}'' < ${mf} >/dev/null 2>&1; then
NODIST=''; else NODIST=''; else
NODIST='#'; fi NODIST='#'; fi
cat >> configure.ac << EOF cat >> m4/vlc.m4 << EOF
AM_CONDITIONAL(${mod}_plugin, test x\$${mod}_plugin = xyes) AM_CONDITIONAL(${mod}_plugin, test x\$${mod}_plugin = xyes)
AM_CONDITIONAL(${mod}_builtin, test x\$${mod}_builtin = xyes) AM_CONDITIONAL(${mod}_builtin, test x\$${mod}_builtin = xyes)
EOF EOF
...@@ -164,8 +160,10 @@ EOF ...@@ -164,8 +160,10 @@ EOF
done done
done done
echo "AM_CONDITIONAL(UNTRUE, false)" >> configure.ac cat >> m4/vlc.m4 << EOF
sed -n -e '/dnl do not touch this line/,//p' < configure.ac.in >> configure.ac AM_CONDITIONAL(UNTRUE, false)
])
EOF
echo "done." echo "done."
...@@ -175,7 +173,7 @@ echo "done." ...@@ -175,7 +173,7 @@ echo "done."
set -x set -x
# remove autotools cruft # 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 # remove old autotools extra cruft
rm -f config.guess config.sub missing mkinstalldirs compile depcomp install-sh rm -f config.guess config.sub missing mkinstalldirs compile depcomp install-sh
# remove new autotools extra cruft # remove new autotools extra cruft
...@@ -185,8 +183,6 @@ rm -f ltmain.sh libtool ltconfig ...@@ -185,8 +183,6 @@ rm -f ltmain.sh libtool ltconfig
# remove gettext cruft # remove gettext cruft
rm -f m4/oldgettext.m4 ABOUT-NLS rm -f m4/oldgettext.m4 ABOUT-NLS
rm -Rf intl rm -Rf intl
# update m4 local macros
rm -f m4/vlc.m4 && echo "dnl Private VLC macros" > m4/vlc.m4
# Check for gettext # Check for gettext
if gettextize --version >/dev/null 2>&1 if gettextize --version >/dev/null 2>&1
...@@ -202,14 +198,22 @@ else ...@@ -202,14 +198,22 @@ else
echo > ABOUT-NLS echo > ABOUT-NLS
mkdir -p intl mkdir -p intl
echo > intl/Makefile.am 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 GETTEXT=old
fi;else fi;else
# we don't have gettext. grmbl. try to continue anyway. # we don't have gettext. grmbl. try to continue anyway.
echo > ABOUT-NLS echo > ABOUT-NLS
mkdir -p intl mkdir -p intl
echo > intl/Makefile.am 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 GETTEXT=no
fi fi
...@@ -220,7 +224,11 @@ then ...@@ -220,7 +224,11 @@ then
PKGCONFIG=yes PKGCONFIG=yes
else else
# Not present, use a workaround. # 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 PKGCONFIG=no
fi fi
......
configure.ac.in → configure.ac
View file @ 9542cc88
...@@ -3154,9 +3154,6 @@ then ...@@ -3154,9 +3154,6 @@ then
fi] fi]
AM_CONDITIONAL(HAVE_BUILTINS, ${builtin_support}) AM_CONDITIONAL(HAVE_BUILTINS, ${builtin_support})
dnl do not touch this line (bootstrap needs it)
dnl dnl
dnl Stuff used by the program dnl Stuff used by the program
dnl dnl
...@@ -3189,6 +3186,11 @@ dnl ...@@ -3189,6 +3186,11 @@ dnl
AUTOMAKE_SUCKS="\$(L_builtin) \$(LDFLAGS_builtin)" AUTOMAKE_SUCKS="\$(L_builtin) \$(LDFLAGS_builtin)"
AC_SUBST(AUTOMAKE_SUCKS) AC_SUBST(AUTOMAKE_SUCKS)
dnl
dnl Import substitution variables generated by bootstrap
dnl
VLC_VARIABLES
dnl dnl
dnl Create the vlc-config script dnl Create the vlc-config script
dnl dnl
......
doc/release-howto.txt
View file @ 9542cc88
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
- générer un timestamp de release (par exemple avec 822-date) - générer un timestamp de release (par exemple avec 822-date)
- updater le numéro de version partout où c'est nécessaire - updater le numéro de version partout où c'est nécessaire
· configure.ac.in (relancer autoconf) · configure.ac (relancer autoconf)
· vlc.spec · vlc.spec
· ipkg/control · ipkg/control
· debian/changelog · debian/changelog
......
toolbox
View file @ 9542cc88
#! /bin/sh #! /bin/sh
## toolbox for the VLC media player ## 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 <sam@zoy.org> ## Authors: Samuel Hocevar <sam@zoy.org>
...@@ -109,9 +109,9 @@ then ...@@ -109,9 +109,9 @@ then
# The evil ^M # The evil ^M
M=' ' M=' '
# Variables we get from configure.ac.in # Variables we get from configure.ac
LIBVLC_VERSION=`sed -ne '/AC_INIT/s/.*,\(.*\))/\1/p' < configure.ac.in` LIBVLC_VERSION=`sed -ne '/AC_INIT/s/.*,\(.*\))/\1/p' < configure.ac`
LIBVLC_CODENAME=`sed -ne '/CODENAME=/s/.*"\(.*\)"/\1/p' < configure.ac.in` LIBVLC_CODENAME=`sed -ne '/CODENAME=/s/.*"\(.*\)"/\1/p' < configure.ac`
LIBVLC_SYMBOL=`echo $LIBVLC_VERSION | sed -e 'y/.-/__/'` LIBVLC_SYMBOL=`echo $LIBVLC_VERSION | sed -e 'y/.-/__/'`
# Sources that get built under Win32 - FIXME: anyone wanna deuglify this? :) # Sources that get built under Win32 - FIXME: anyone wanna deuglify this? :)
...@@ -518,7 +518,7 @@ then ...@@ -518,7 +518,7 @@ then
find evc -type f -name '*.vcp' -exec rm -f '{}' ';' find evc -type f -name '*.vcp' -exec rm -f '{}' ';'
#find . -type d -name '.deps' -exec rm -Rf '{}' ';' #find . -type d -name '.deps' -exec rm -Rf '{}' ';'
# there's some more cruft all around # 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 -f vlc vlc-config Makefile Modules.am
rm -Rf autom4te.cache rm -Rf autom4te.cache
rm -f mozilla/vlcintf.h mozilla/vlcintf.xpt rm -f mozilla/vlcintf.h mozilla/vlcintf.xpt
......
vlc.ebuild
View file @ 9542cc88
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
# vlc.ebuild: A Gentoo ebuild for vlc # vlc.ebuild: A Gentoo ebuild for vlc
############################################################################### ###############################################################################
# Copyright (C) 2003 VideoLAN # 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 <thedj at users.sf.net> # Authors: Derk-Jan Hartman <thedj at users.sf.net>
# #
...@@ -100,10 +100,6 @@ src_unpack() { ...@@ -100,10 +100,6 @@ src_unpack() {
cp configure.ac configure.ac.orig cp configure.ac configure.ac.orig
sed "s:-lkfile::" \ sed "s:-lkfile::" \
configure.ac.orig > configure.ac 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 cd ${S}/modules/gui/kde
cp interface.h interface.h.orig cp interface.h interface.h.orig
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment