File vlc-autoconf-compat.patch of Package vlc

File vlc-autoconf-compat.patch of Package vlc (Revision 9fd10fb09cf79a2f7836c43156c83118)

Currently displaying revision 9fd10fb09cf79a2f7836c43156c83118, show latest

--- test/Makefile.am.orig	2012-04-04 20:36:27.936566467 +0200
+++ test/Makefile.am	2012-04-04 20:36:33.391566272 +0200
@@ -4,8 +4,8 @@
 
 AUTOMAKE_OPTIONS = subdir-objects
 
-extra_check_verbose = $(extra_check_verbose_$(V))
-extra_check_verbose_ = $(extra_check_flags__$(AM_DEFAULT_VERBOSITY))
+extra_check_verbose = 
+extra_check_verbose_ = 
 extra_check_verbose_0 = @echo TEST $@
 extra_check_verbose__0 = $(extra_check_verbose_0)
 
--- modules/gui/qt4/Modules.am.orig	2012-04-04 20:33:21.908573084 +0200
+++ modules/gui/qt4/Modules.am	2012-04-04 20:34:09.460571393 +0200
@@ -213,13 +213,13 @@
 
 BUILT_SOURCES += $(nodist_SOURCES_qt4)
 
-moc_verbose = $(moc_verbose_$(V))
-moc_verbose_ = $(moc_verbose__$(AM_DEFAULT_VERBOSITY))
+moc_verbose = 
+moc_verbose_ = 
 moc_verbose_0 = @echo "  MOC   " $@;
 moc_verbose__0 = $(moc_verbose_0)
 
-uic_verbose = $(uic_verbose_$(V))
-uic_verbose_ = $(uic_verbose__$(AM_DEFAULT_VERBOSITY))
+uic_verbose = 
+uic_verbose_ = 
 uic_verbose_0 = @echo "  UIC   " $@;
 uic_verbose__0 = $(uic_verbose_0)
 
--- Makefile.am.orig	2012-04-04 20:36:13.981566963 +0200
+++ Makefile.am	2012-04-04 20:39:16.025560486 +0200
@@ -77,11 +77,9 @@
 
 ACLOCAL_AMFLAGS = -I m4
 AUTOMAKE_OPTIONS = \
-	1.11 \
+	1.10 \
 	-Wall \
-	check-news \
-	dist-xz \
-	no-dist-gzip
+	check-news
 #	std-options
 
 ChangeLog: Makefile.am
@@ -469,8 +467,8 @@
 uninstall-hook:
 	rm -f -- "$(DESTDIR)$(vlclibdir)/plugins/plugins.dat"
 
-silentstd = $(silentstd_$(V))
-silentstd_ = $(silentstd_$(AM_DEFAULT_VERBOSITY))
+silentstd = 
+silentstd_ = 
 silentstd_0 = 2>&1 >/dev/null
 
 ###############################################################################
--- configure.ac.orig	2012-04-04 19:03:21.841765198 +0200
+++ configure.ac	2012-04-04 23:29:27.142197216 +0200
@@ -24,12 +24,9 @@
 AC_CANONICAL_HOST
 AC_PRESERVE_HELP_ORDER
 
-AM_INIT_AUTOMAKE(tar-ustar color-tests)
+AM_INIT_AUTOMAKE(tar-ustar)
 AM_CONFIG_HEADER(config.h)
 
-# Disable with "./configure --disable-silent-rules" or "make V=1"
-AM_SILENT_RULES([yes])
-
 dnl Too many people are not aware of maintainer mode:
 dnl If you want to use it, you definitely know what you are doing, so
 dnl you can specify "--disable-maintainer-mode". But if you want the default
@@ -4298,20 +4295,6 @@
   modules/arm_neon/Makefile
 ])
 
-AM_COND_IF([HAVE_WIN32], [
-  AC_CONFIG_FILES([
-    extras/package/win32/spad.nsi
-    extras/package/win32/vlc.win32.nsi
-  ])
-])
-
-AM_COND_IF([HAVE_DARWIN], [
-  AC_CONFIG_FILES([
-    extras/package/macosx/Info.plist
-    extras/package/macosx/Resources/English.lproj/InfoPlist.strings
-  ])
-])
-
 dnl Generate makefiles
 AC_OUTPUT
 
--- share/Makefile.am.orig	2012-04-04 20:35:58.986567496 +0200
+++ share/Makefile.am	2012-04-04 20:36:05.170567277 +0200
@@ -137,8 +137,8 @@
 #
 # LUA
 #
-luac_verbose = $(luac_verbose_$(V))
-luac_verbose_ = $(luac_verbose_$(AM_DEFAULT_VERBOSITY))
+luac_verbose = 
+luac_verbose_ = 
 luac_verbose_0 = @echo "  LUAC   $@";
 
 .lua.luac: