* ./bootstrap: another fix for old versions of autoconf which don't seem

    to like the gettext m4 files.

diff --git a/bootstrap b/bootstrap
index 34b31c69ea483479aafdaff529ec69e2d9a1d927..5960df532a08c59521c4e8637c1cf5b56610c30d 100755 (executable)
--- a/bootstrap
+++ b/bootstrap
@@ -1,7 +1,7 @@
 #! /bin/sh
 
 ##  bootstrap.sh file for vlc, the VideoLAN Client
-##  $Id: bootstrap,v 1.4 2002/08/26 20:49:49 sam Exp $
+##  $Id: bootstrap,v 1.5 2002/08/26 21:46:06 sam Exp $
 ##
 ##  Authors: Samuel Hocevar <sam@zoy.org>
 
@@ -44,19 +44,19 @@ else
   # Yuck!
   test -f po/ChangeLog~ && mv po/ChangeLog~ po/ChangeLog
   mkdir -p m4
+  # Yuck! - don't copy anything, it makes old autoconf barf.
+  #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!
-  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
+  echo 'AC_DEFUN([AM_GNU_GETTEXT_VERSION], [])' > m4/gettext.m4
 fi
 
 aclocal -I m4
+autoheader
 automake --foreign --add-missing --copy
 autoconf
-autoheader
 
 # nuahahahahaha !! overwriting Makefile.in with what *I* want!
 cp Makefile.old Makefile.in

diff --git a/po/Makevars b/po/Makevars
deleted file mode 100644 (file)
index c942818..0000000
--- a/po/Makevars
+++ /dev/null
@@ -1,25 +0,0 @@
-# Makefile variables for PO directory in any package using GNU gettext.
-
-# Usually the message domain is the same as the package name.
-DOMAIN = $(PACKAGE)
-
-# These two variables depend on the location of this directory.
-subdir = po
-top_builddir = ..
-
-# These options get passed to xgettext.
-XGETTEXT_OPTIONS = --keyword=_ --keyword=N_
-
-# This is the copyright holder that gets inserted into the header of the
-# $(DOMAIN).pot file.  Set this to the copyright holder of the surrounding
-# package.  (Note that the msgstr strings, extracted from the package's
-# sources, belong to the copyright holder of the package.)  Translators are
-# expected to transfer the copyright for their translations to this person
-# or entity, or to disclaim their copyright.  The empty string stands for
-# the public domain; in this case the translators are expected to disclaim
-# their copyright.
-COPYRIGHT_HOLDER = 
-
-# This is the list of locale categories, beyond LC_MESSAGES, for which the
-# message catalogs shall be used.  It is usually empty.
-EXTRA_LOCALE_CATEGORIES =