* ./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.

diff --git a/HACKING b/HACKING
index aef5a8a17caa45c76bae07363e5eb45957a8acfd..04db9d77a38fbbf43dbe56617a332961441c3b8b 100644 (file)
--- a/HACKING
+++ b/HACKING
@@ -1,12 +1,12 @@
-$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
 ===========
 
 You will need the following tools if you plan to use the CVS version of vlc:
 
- - autoconf version 2.13 or later
- - automake version 1.4 or later
+ - autoconf version 2.50 or later
+ - automake version 1.6 or later
  - gettext version 0.10.4 or later
 
 After retrieving the CVS tree, you need to run the bootstrap script to

diff --git a/Makefile.am b/Makefile.am
index 8fa1beca75988d31945967117ed3281de0b9b5a3..18f7d700924fe644ea7e9603b5740dcee1356ffd 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -3,4 +3,6 @@ SUBDIRS = src include modules mozilla extras \
 
 ACLOCAL_AMFLAGS = -I m4
 
-EXTRA_DIST = config.rpath mkinstalldirs
+EXTRA_DIST = BUGS FAQ HACKING MAINTAINERS STATUS \
+             INSTALL.win32 README.MacOSX.rtf \
+             config.rpath mkinstalldirs

diff --git a/bootstrap b/bootstrap
index 88fdbe1a54599e50e816d49d40a02e76a531868e..34b31c69ea483479aafdaff529ec69e2d9a1d927 100755 (executable)
--- a/bootstrap
+++ b/bootstrap
@@ -1,7 +1,7 @@
 #! /bin/sh
 
 ##  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>
 
@@ -29,21 +29,34 @@ done
 ###
 ###  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
-autoheader
-
-# run gettextize and then fix its cruft
-gettextize --force --intl --copy --no-changelog || gettextize --force --copy
-test -f configure.in~ && mv configure.in~ configure.in
-test -f Makefile.am~ && mv Makefile.am~ Makefile.am
-test -f ChangeLog~ && mv ChangeLog~ ChangeLog
-test -f po/ChangeLog~ && mv po/ChangeLog~ po/ChangeLog
+if expr `gettextize --version | head -1 | sed 's/[^0-9]*//'` \
+        '>' 0.11.3 >/dev/null 2>&1
+then
+  autopoint --force
+else
+  # What?! User is not using a recent version of gettext? We'll have to
+  # cheat a bit, then.
+  rm -f 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
 autoconf
-aclocal -I m4
+autoheader
 
 # nuahahahahaha !! overwriting Makefile.in with what *I* want!
 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
 ##
 file=src/misc/modules_plugin.h
-echo -n " + creating headers: "
 rm -f $file
 sed 's#.*\$[I][d]:.*# * Automatically generated from '$file'.in by bootstrap.sh#' < $file.in > $file
 echo '#define STORE_SYMBOLS( p_symbols ) \' >> $file
 cat include/*.h | grep '^ *VLC_EXPORT.*;' | \
        sed 's/VLC_EXPORT( *\([^,]*\), *\([^,]*\), *\(.*\));.*/    (p_symbols)->\2_inner = \2; \\/' >> $file
 echo '' >> $file
-echo -n "$file "
 
 file=include/vlc_symbols.h
 rm -f $file && touch $file
@@ -76,13 +87,11 @@ cat include/*.h | grep '^ *VLC_EXPORT.*;' | \
        sed 's/VLC_EXPORT( *\([^,]*\), *\([^,]*\), *\(.*\));.*/#   define \2 p_symbols->\2_inner/' | sort >> $file
 echo '#endif /* __PLUGIN__ */' >> $file
 echo '' >> $file
-echo "$file."
 
 
 ##
 ##  Glade sometimes sucks
 ##
-echo -n " + fixing glade bugs: "
 for file in gnome_interface.c gtk_interface.c
 do
 if grep "DO NOT EDIT THIS FILE" modules/gui/gtk/$file 2>&1 > /dev/null
@@ -102,7 +111,6 @@ EOF
         >> /tmp/$$.$file.bak
     mv -f /tmp/$$.$file.bak modules/gui/gtk/$file
 fi
-echo -n "$file "
 done
 
 file=gtk_support.h
@@ -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
     mv -f /tmp/$$.$file.bak modules/gui/gtk/$file
 fi
-echo "$file."
 
 
 ##
@@ -122,10 +129,8 @@ if test "$do_po" = "no"
 then
   echo "not updating potfiles. use --update-po to force doing it."
 else
-  echo -n " + updating potfiles: "
   cd po
   make update-po 2>&1 | grep '^[^:]*:$' | cut -f1 -d: | tr '\n' ' ' | sed 's/ $//'
   cd ..
-  echo "."
 fi
 

diff --git a/configure.in b/configure.in
index 389078f818ca9e0db6203b2f8e5334f82fe2c28c..1245e1ab1b0c81b3b1a1785a61d9d0e50de23d50 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1,6 +1,7 @@
 dnl Autoconf settings for vlc
 AC_INIT(configure.in)
-AM_CONFIG_HEADER(config.h)
+
+AC_PREREQ(2.50)
 AC_CANONICAL_SYSTEM
 
 CONFIGURE_LINE="$0 $*"
@@ -9,6 +10,9 @@ PACKAGE="vlc"
 VERSION="0.5.0-cvs"
 CODENAME="Natalya"
 
+AM_INIT_AUTOMAKE(${PACKAGE}, ${VERSION})
+AM_CONFIG_HEADER(config.h)
+
 dnl
 dnl  Save *FLAGS
 dnl
@@ -19,9 +23,10 @@ save_LDFLAGS="${LDFLAGS}"
 dnl
 dnl Check for tools
 dnl
-AC_PROG_MAKE_SET
 AC_PROG_CC
 AC_PROG_CPP
+AC_PROG_MAKE_SET
+AC_PROG_INSTALL
 
 dnl Find the right ranlib, even when cross-compiling
 AC_CHECK_TOOL(RANLIB, ranlib, :)
@@ -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_VERSION, "${VERSION}", [Package version])
+AM_GNU_GETTEXT_VERSION(0.10.40)
 AM_GNU_GETTEXT
 
 dnl AM_PROG_LIBTOOL
@@ -2167,8 +2173,17 @@ AC_SUBST(xvideo_LDFLAGS)
 AC_SUBST(xosd_LDFLAGS)
 AC_SUBST(id3tag_LDFLAGS)
         
-AC_OUTPUT([Makefile Makefile.config Makefile.opts po/Makefile.in vlc-config m4/Makefile intl/Makefile])
-chmod a+x vlc-config
+AC_OUTPUT([
+  Makefile
+  Makefile.config
+  Makefile.opts
+  m4/Makefile
+  intl/Makefile
+  po/Makefile.in
+  vlc-config
+],[
+  chmod a+x vlc-config
+])
 
 echo "
 vlc configuration