Commit e3401d57 authored by Sam Hocevar's avatar Sam Hocevar

* ./configure.in: we now require autoconf 2.5x because previous versions

    don't seem to work very well if you are using autopoint, although
    gettext 0.11.5 claims to be fully backwards compatible. Welcome to
    automake hell.
  * ./bootstrap: workaround which uses gettextize if you do not have
    autopoint. We'll probably stay like this for a while, until gettext
    0.11.x (which replaces gettextize with autopoint) becomes more
    widespread. Currently this workaround seems to work, but don't expect
    a clean tarball if you make dist without having used autopoint. Welcome
    to automake hell.
parent 86f23938
$Id: HACKING,v 1.2 2002/08/26 09:38:19 sam Exp $ $Id: HACKING,v 1.3 2002/08/26 20:49:49 sam Exp $
Hacking vlc Hacking vlc
=========== ===========
You will need the following tools if you plan to use the CVS version of vlc: You will need the following tools if you plan to use the CVS version of vlc:
- autoconf version 2.13 or later - autoconf version 2.50 or later
- automake version 1.4 or later - automake version 1.6 or later
- gettext version 0.10.4 or later - gettext version 0.10.4 or later
After retrieving the CVS tree, you need to run the bootstrap script to After retrieving the CVS tree, you need to run the bootstrap script to
......
...@@ -3,4 +3,6 @@ SUBDIRS = src include modules mozilla extras \ ...@@ -3,4 +3,6 @@ SUBDIRS = src include modules mozilla extras \
ACLOCAL_AMFLAGS = -I m4 ACLOCAL_AMFLAGS = -I m4
EXTRA_DIST = config.rpath mkinstalldirs EXTRA_DIST = BUGS FAQ HACKING MAINTAINERS STATUS \
INSTALL.win32 README.MacOSX.rtf \
config.rpath mkinstalldirs
#! /bin/sh #! /bin/sh
## bootstrap.sh file for vlc, the VideoLAN Client ## bootstrap.sh file for vlc, the VideoLAN Client
## $Id: bootstrap,v 1.3 2002/08/26 09:38:20 sam Exp $ ## $Id: bootstrap,v 1.4 2002/08/26 20:49:49 sam Exp $
## ##
## Authors: Samuel Hocevar <sam@zoy.org> ## Authors: Samuel Hocevar <sam@zoy.org>
...@@ -29,21 +29,34 @@ done ...@@ -29,21 +29,34 @@ done
### ###
### classic stuff ### classic stuff
### ###
rm -f aclocal.m4 configure config.guess config.log config.sub ltmain.sh libtool ltconfig missing mkinstalldirs depcomp install-sh configure.in~ Makefile.am~ ChangeLog~ po/ChangeLog~ set -x
rm -f aclocal.m4 configure config.guess config.log config.sub ltmain.sh libtool ltconfig missing mkinstalldirs depcomp install-sh
aclocal if expr `gettextize --version | head -1 | sed 's/[^0-9]*//'` \
autoheader '>' 0.11.3 >/dev/null 2>&1
then
# run gettextize and then fix its cruft autopoint --force
gettextize --force --intl --copy --no-changelog || gettextize --force --copy else
test -f configure.in~ && mv configure.in~ configure.in # What?! User is not using a recent version of gettext? We'll have to
test -f Makefile.am~ && mv Makefile.am~ Makefile.am # cheat a bit, then.
test -f ChangeLog~ && mv ChangeLog~ ChangeLog rm -f po/ChangeLog~
test -f po/ChangeLog~ && mv po/ChangeLog~ po/ChangeLog aclocaldir=`gettextize --copy --force | grep '^from the' | cut -f3 -d' '`
# Yuck!
test -f po/ChangeLog~ && mv po/ChangeLog~ po/ChangeLog
mkdir -p m4
# Yuck!
for file in codeset.m4 gettext.m4 glibc21.m4 iconv.m4 isc-posix.m4 \
lcmessage.m4 progtest.m4
do cp ${aclocaldir}/${file} m4/
done
# Yuck!
echo 'AC_DEFUN([AM_GNU_GETTEXT_VERSION], [])' >> m4/gettext.m4
fi
aclocal -I m4
automake --foreign --add-missing --copy automake --foreign --add-missing --copy
autoconf autoconf
aclocal -I m4 autoheader
# nuahahahahaha !! overwriting Makefile.in with what *I* want! # nuahahahahaha !! overwriting Makefile.in with what *I* want!
cp Makefile.old Makefile.in cp Makefile.old Makefile.in
...@@ -52,14 +65,12 @@ cp Makefile.old Makefile.in ...@@ -52,14 +65,12 @@ cp Makefile.old Makefile.in
## headers which need to be regenerated because of the VLC_EXPORT macro ## headers which need to be regenerated because of the VLC_EXPORT macro
## ##
file=src/misc/modules_plugin.h file=src/misc/modules_plugin.h
echo -n " + creating headers: "
rm -f $file rm -f $file
sed 's#.*\$[I][d]:.*# * Automatically generated from '$file'.in by bootstrap.sh#' < $file.in > $file sed 's#.*\$[I][d]:.*# * Automatically generated from '$file'.in by bootstrap.sh#' < $file.in > $file
echo '#define STORE_SYMBOLS( p_symbols ) \' >> $file echo '#define STORE_SYMBOLS( p_symbols ) \' >> $file
cat include/*.h | grep '^ *VLC_EXPORT.*;' | \ cat include/*.h | grep '^ *VLC_EXPORT.*;' | \
sed 's/VLC_EXPORT( *\([^,]*\), *\([^,]*\), *\(.*\));.*/ (p_symbols)->\2_inner = \2; \\/' >> $file sed 's/VLC_EXPORT( *\([^,]*\), *\([^,]*\), *\(.*\));.*/ (p_symbols)->\2_inner = \2; \\/' >> $file
echo '' >> $file echo '' >> $file
echo -n "$file "
file=include/vlc_symbols.h file=include/vlc_symbols.h
rm -f $file && touch $file rm -f $file && touch $file
...@@ -76,13 +87,11 @@ cat include/*.h | grep '^ *VLC_EXPORT.*;' | \ ...@@ -76,13 +87,11 @@ cat include/*.h | grep '^ *VLC_EXPORT.*;' | \
sed 's/VLC_EXPORT( *\([^,]*\), *\([^,]*\), *\(.*\));.*/# define \2 p_symbols->\2_inner/' | sort >> $file sed 's/VLC_EXPORT( *\([^,]*\), *\([^,]*\), *\(.*\));.*/# define \2 p_symbols->\2_inner/' | sort >> $file
echo '#endif /* __PLUGIN__ */' >> $file echo '#endif /* __PLUGIN__ */' >> $file
echo '' >> $file echo '' >> $file
echo "$file."
## ##
## Glade sometimes sucks ## Glade sometimes sucks
## ##
echo -n " + fixing glade bugs: "
for file in gnome_interface.c gtk_interface.c for file in gnome_interface.c gtk_interface.c
do do
if grep "DO NOT EDIT THIS FILE" modules/gui/gtk/$file 2>&1 > /dev/null if grep "DO NOT EDIT THIS FILE" modules/gui/gtk/$file 2>&1 > /dev/null
...@@ -102,7 +111,6 @@ EOF ...@@ -102,7 +111,6 @@ EOF
>> /tmp/$$.$file.bak >> /tmp/$$.$file.bak
mv -f /tmp/$$.$file.bak modules/gui/gtk/$file mv -f /tmp/$$.$file.bak modules/gui/gtk/$file
fi fi
echo -n "$file "
done done
file=gtk_support.h file=gtk_support.h
...@@ -112,7 +120,6 @@ then ...@@ -112,7 +120,6 @@ then
sed 's/DO NOT EDIT THIS FILE.*/This file was created automatically by glade and fixed by bootstrap.sh/ ; s/#if.*ENABLE_NLS.*/#if defined( ENABLE_NLS ) \&\& defined ( HAVE_GETTEXT )/' < modules/gui/gtk/$file > /tmp/$$.$file.bak sed 's/DO NOT EDIT THIS FILE.*/This file was created automatically by glade and fixed by bootstrap.sh/ ; s/#if.*ENABLE_NLS.*/#if defined( ENABLE_NLS ) \&\& defined ( HAVE_GETTEXT )/' < modules/gui/gtk/$file > /tmp/$$.$file.bak
mv -f /tmp/$$.$file.bak modules/gui/gtk/$file mv -f /tmp/$$.$file.bak modules/gui/gtk/$file
fi fi
echo "$file."
## ##
...@@ -122,10 +129,8 @@ if test "$do_po" = "no" ...@@ -122,10 +129,8 @@ if test "$do_po" = "no"
then then
echo "not updating potfiles. use --update-po to force doing it." echo "not updating potfiles. use --update-po to force doing it."
else else
echo -n " + updating potfiles: "
cd po cd po
make update-po 2>&1 | grep '^[^:]*:$' | cut -f1 -d: | tr '\n' ' ' | sed 's/ $//' make update-po 2>&1 | grep '^[^:]*:$' | cut -f1 -d: | tr '\n' ' ' | sed 's/ $//'
cd .. cd ..
echo "."
fi fi
dnl Autoconf settings for vlc dnl Autoconf settings for vlc
AC_INIT(configure.in) AC_INIT(configure.in)
AM_CONFIG_HEADER(config.h)
AC_PREREQ(2.50)
AC_CANONICAL_SYSTEM AC_CANONICAL_SYSTEM
CONFIGURE_LINE="$0 $*" CONFIGURE_LINE="$0 $*"
...@@ -9,6 +10,9 @@ PACKAGE="vlc" ...@@ -9,6 +10,9 @@ PACKAGE="vlc"
VERSION="0.5.0-cvs" VERSION="0.5.0-cvs"
CODENAME="Natalya" CODENAME="Natalya"
AM_INIT_AUTOMAKE(${PACKAGE}, ${VERSION})
AM_CONFIG_HEADER(config.h)
dnl dnl
dnl Save *FLAGS dnl Save *FLAGS
dnl dnl
...@@ -19,9 +23,10 @@ save_LDFLAGS="${LDFLAGS}" ...@@ -19,9 +23,10 @@ save_LDFLAGS="${LDFLAGS}"
dnl dnl
dnl Check for tools dnl Check for tools
dnl dnl
AC_PROG_MAKE_SET
AC_PROG_CC AC_PROG_CC
AC_PROG_CPP AC_PROG_CPP
AC_PROG_MAKE_SET
AC_PROG_INSTALL
dnl Find the right ranlib, even when cross-compiling dnl Find the right ranlib, even when cross-compiling
AC_CHECK_TOOL(RANLIB, ranlib, :) AC_CHECK_TOOL(RANLIB, ranlib, :)
...@@ -51,6 +56,7 @@ ALL_LINGUAS="de en_GB fr ja no ru nl pl se" ...@@ -51,6 +56,7 @@ ALL_LINGUAS="de en_GB fr ja no ru nl pl se"
AC_DEFINE_UNQUOTED(VLC_PACKAGE, "${PACKAGE}", [Package name]) AC_DEFINE_UNQUOTED(VLC_PACKAGE, "${PACKAGE}", [Package name])
AC_DEFINE_UNQUOTED(VLC_VERSION, "${VERSION}", [Package version]) AC_DEFINE_UNQUOTED(VLC_VERSION, "${VERSION}", [Package version])
AM_GNU_GETTEXT_VERSION(0.10.40)
AM_GNU_GETTEXT AM_GNU_GETTEXT
dnl AM_PROG_LIBTOOL dnl AM_PROG_LIBTOOL
...@@ -2167,8 +2173,17 @@ AC_SUBST(xvideo_LDFLAGS) ...@@ -2167,8 +2173,17 @@ AC_SUBST(xvideo_LDFLAGS)
AC_SUBST(xosd_LDFLAGS) AC_SUBST(xosd_LDFLAGS)
AC_SUBST(id3tag_LDFLAGS) AC_SUBST(id3tag_LDFLAGS)
AC_OUTPUT([Makefile Makefile.config Makefile.opts po/Makefile.in vlc-config m4/Makefile intl/Makefile]) AC_OUTPUT([
chmod a+x vlc-config Makefile
Makefile.config
Makefile.opts
m4/Makefile
intl/Makefile
po/Makefile.in
vlc-config
],[
chmod a+x vlc-config
])
echo " echo "
vlc configuration vlc configuration
......
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