[patch] Fix autoreconf with automake-1.12

vlc-2.0.1-automake-1.12.patch (text/plain), 1.34 KB, created by Bernard Cafarelli on 2012-06-08 08:35:16 UTC

From fc55e4a1df2e691c73a28c6d6bc18143d60b97de Mon Sep 17 00:00:00 2001
From: =?utf8?q?R=C3=A9mi=20Denis-Courmont?= <[e-mail]>
Date: Sun, 3 Jun 2012 16:50:25 +0300
Subject: [PATCH 1/1] qt4: remove ObjC++ hacks

This should fix the build with recent automake (fix #6911).
---
 modules/gui/qt4/Modules.am |    9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/modules/gui/qt4/Modules.am b/modules/gui/qt4/Modules.am
index ae626fd..777d6c7 100644
--- a/modules/gui/qt4/Modules.am
+++ b/modules/gui/qt4/Modules.am
@@ -12,7 +12,7 @@
 
 AUTOMAKE_OPTIONS = subdir-objects
 MOSTLYCLEANFILES = $(UIH)
-SUFFIXES = .ui .h .hpp .moc.cpp .mm
+SUFFIXES = .ui .h .hpp .moc.cpp
 
 nodist_SOURCES_qt4 = \
 		main_interface.moc.cpp \
@@ -246,9 +246,6 @@ endif
 	$(AM_V_at)sed -e 's/Q_(\"_(\\\"\(.*\)\\\")"/Q_("\1"/' $@.tmp >$@
 	$(AM_V_at)rm -f $@.tmp
 
-.mm.lo: 
-	$(top_builddir)/libtool --verbose --mode=compile $(CXX) $(objcxxflags) -DQ_WS_MAC -I$(top_srcdir)/include -I$(top_builddir)/include -I$(top_builddir) $(CXXFLAGS_qt4) -c $< -o $@ 
-
 SOURCES_qt4 = 	qt4.cpp \
 		menus.cpp \
 		main_interface.cpp \
@@ -319,10 +316,6 @@ SOURCES_qt4 = 	qt4.cpp \
 		util/buttons/RoundButton.cpp \
 		styles/seekstyle.cpp
 
-if HAVE_DARWIN
-SOURCES_qt4 +=  util/searchlineedit_mac.mm
-endif
-
 if HAVE_WIN32
 SOURCES_qt4 += main_interface_win32.cpp
 endif
-- 
1.7.10