X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=bootstrap;h=ea59f16bf8b3ae05f45245422b508fce13247931;hb=4e9597b800d1140dfab1cf33c3df8c608d58878f;hp=f6e67db5e39c91d9479c5ad8d6d4a9f7622f2927;hpb=f895fb1d94f7bd854b916b2d687f3e5781c51d85;p=vlc

diff --git a/bootstrap b/bootstrap
index f6e67db5e3..ea59f16bf8 100755
--- a/bootstrap
+++ b/bootstrap
@@ -80,7 +80,7 @@ fi
 ##
 
 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
@@ -95,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
 ###
@@ -125,6 +112,9 @@ 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
 ##
@@ -144,6 +134,7 @@ if [ "$AUTOPOINT" = "true" ]; then
 ==============================================================
 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