Fix libmodplug patch

[vlc] / bootstrap

diff --git a/bootstrap b/bootstrap
index 839037042ebf812134c27869aa1e76036de7c60f..f6e67db5e39c91d9479c5ad8d6d4a9f7622f2927 100755 (executable)
--- a/bootstrap
+++ b/bootstrap
@@ -67,6 +67,14 @@ else
   PKGCONFIG=no
 fi
 
+# Check for autopoint (GNU gettext)
+export AUTOPOINT
+test "$AUTOPOINT" || AUTOPOINT=autopoint
+if ! "$AUTOPOINT" --dry-run --force >/dev/null 2>&1; then
+  AUTOPOINT=true
+  echo > ABOUT-NLS
+fi
+
 ##
 ## Generate the modules makefile, by parsing modules/**/Modules.am
 ##
@@ -95,14 +103,6 @@ EOF
 
 modules=""
 
-rm -f modules/Makefile.am && cat > modules/Makefile.am << EOF
-# Autogenerated by bootstrap - DO NOT EDIT
-EXTRA_DIST = LIST
-dist_noinst_SCRIPTS = genmf
-SUBDIRS = `sed -ne 's,modules/\([^/]*\)/Makefile,\1,p' configure.ac | xargs`
-
-EOF
-
 modules/genmf `sed -ne 's,modules/\(.*\)/Makefile,\1,p' configure.ac`
 
 cat >> m4/private.m4 << EOF
@@ -117,10 +117,11 @@ set -x
 
 # Automake complains if these are not present
 echo > vlc-config.in
+echo > ABOUT-NLS
 cp -f INSTALL INSTALL.git
 
 autoreconf --install --force --verbose ${ACLOCAL_ARGS}
-rm -f po/Makevars.template
+rm -f po/Makevars.template ABOUT-NLS
 echo > ABOUT-NLS
 mv -f INSTALL.git INSTALL
 
@@ -137,6 +138,16 @@ set +x
 ##
 ##  Tell the user about gettext, pkg-config and sed
 ##
+if [ "$AUTOPOINT" = "true" ]; then
+  cat << EOF
+
+==============================================================
+NOTE: GNU gettext appears to be missing or out-of-date.
+Please install or update GNU gettext.
+Otherwise, you will not be able to build a source tarball.
+EOF
+fi
+
 if [ "$PKGCONFIG" = "no" ]; then
   cat << EOF