bootstrap generates the proper magic for us.
-$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 $
which contains additional build rules for modules, and includes all the
Modules.am files that were found in modules/
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.
- run autopoint (previously gettextize) to create an intl/ directory,
needed when libgettext is not available.
Modules.am \
README.MacOSX.rtf \
bootstrap \
Modules.am \
README.MacOSX.rtf \
bootstrap \
install-win32 \
src/extras/COPYING \
toolbox \
install-win32 \
src/extras/COPYING \
toolbox \
# Tell aclocal to use -I m4. Wonder if it really works.
ACLOCAL_AMFLAGS = -I m4
# 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
# because old versions of automake don't support them in configure.ac.
AUTOMAKE_OPTIONS = dist-bzip2 subdir-objects
#! /bin/sh
## bootstrap file for the VLC media player
#! /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>
##
## Authors: Samuel Hocevar <sam@zoy.org>
## 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
-
-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], [
-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`
modules=""
for mf in `sed -ne 's@[^a-z]*\([^ ]*\)am.*@modules/\1am@p' < modules/Makefile.am`
do
LINKER="LINK"
if echo "$ALL_FLAGS" | grep '^CPPFLAGS_'${mod}'=$' >/dev/null 2>&1; then
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
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"
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"
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
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
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
AM_CONDITIONAL(${mod}_plugin, test x\$${mod}_plugin = xyes)
AM_CONDITIONAL(${mod}_builtin, test x\$${mod}_builtin = xyes)
EOF
-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
set -x
# remove autotools cruft
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
# remove old autotools extra cruft
rm -f config.guess config.sub missing mkinstalldirs compile depcomp install-sh
# remove new autotools extra cruft
# remove gettext cruft
rm -f m4/oldgettext.m4 ABOUT-NLS
rm -Rf intl
# 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
# Check for gettext
if gettextize --version >/dev/null 2>&1
echo > ABOUT-NLS
mkdir -p intl
echo > intl/Makefile.am
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
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
PKGCONFIG=yes
else
# Not present, use a workaround.
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
fi]
AM_CONDITIONAL(HAVE_BUILTINS, ${builtin_support})
fi]
AM_CONDITIONAL(HAVE_BUILTINS, ${builtin_support})
-dnl do not touch this line (bootstrap needs it)
-
-
dnl
dnl Stuff used by the program
dnl
dnl
dnl Stuff used by the program
dnl
AUTOMAKE_SUCKS="\$(L_builtin) \$(LDFLAGS_builtin)"
AC_SUBST(AUTOMAKE_SUCKS)
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
dnl
dnl Create the vlc-config script
dnl
- générer un timestamp de release (par exemple avec 822-date)
- updater le numéro de version partout où c'est nécessaire
- 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
· vlc.spec
· ipkg/control
· debian/changelog
#! /bin/sh
## toolbox for the VLC media player
#! /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 <sam@zoy.org>
##
## Authors: Samuel Hocevar <sam@zoy.org>
- # 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? :)
LIBVLC_SYMBOL=`echo $LIBVLC_VERSION | sed -e 'y/.-/__/'`
# Sources that get built under Win32 - FIXME: anyone wanna deuglify this? :)
find evc -type f -name '*.vcp' -exec rm -f '{}' ';'
#find . -type d -name '.deps' -exec rm -Rf '{}' ';'
# there's some more cruft all around
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
rm -f vlc vlc-config Makefile Modules.am
rm -Rf autom4te.cache
rm -f mozilla/vlcintf.h mozilla/vlcintf.xpt
# vlc.ebuild: A Gentoo ebuild for vlc
###############################################################################
# Copyright (C) 2003 VideoLAN
# 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 <thedj at users.sf.net>
#
#
# Authors: Derk-Jan Hartman <thedj at users.sf.net>
#
cp configure.ac configure.ac.orig
sed "s:-lkfile::" \
configure.ac.orig > configure.ac
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
cd ${S}/modules/gui/kde
cp interface.h interface.h.orig