X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=bootstrap;h=ea59f16bf8b3ae05f45245422b508fce13247931;hb=54b65bedc9a2abe2461f650c0d40b387f0839174;hp=0c5935b391e57133fb34c6ebc8f700fe7c9f600d;hpb=fa9abba62f600b1c019da926c5ed1c6752f80fb5;p=vlc

diff --git a/bootstrap b/bootstrap
index 0c5935b391..ea59f16bf8 100755
--- a/bootstrap
+++ b/bootstrap
@@ -67,12 +67,20 @@ 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
 ##
 
 set +x
-echo "generating modules/**/Makefile.am and m4/private.m4"
+echo "generating modules/**/Makefile.am"
 
 # Prepare m4/private.m4
 rm -f m4/private.m4 && cat > m4/private.m4 << EOF
@@ -87,21 +95,8 @@ AC_DEFUN([PKG_CHECK_MODULES],[ifelse([\$4], , :, [\$4])])
 EOF
 fi
 
-cat >> m4/private.m4 << EOF
-dnl  Helper macro for vlc-config generation
-AC_DEFUN([VLC_CONFIG_HELPER], [
-  cat >> vlc-config.in << BLAH
-EOF
-
-modules=""
-
 modules/genmf `sed -ne 's,modules/\(.*\)/Makefile,\1,p' configure.ac`
 
-cat >> m4/private.m4 << EOF
-BLAH
-])
-EOF
-
 ###
 ###  classic bootstrap stuff
 ###
@@ -109,13 +104,17 @@ 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
 
+# Patch po/Makefile.in.in but it's not a drama if it fails
+patch -p1 < po/makefile-qt4.patch || true
+
 ##
 ##  files which need to be regenerated
 ##
@@ -129,6 +128,17 @@ 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.
+Also check if you have cvs, a dependency of autopoint.
+Otherwise, you will not be able to build a source tarball.
+EOF
+fi
+
 if [ "$PKGCONFIG" = "no" ]; then
   cat << EOF