[vlc-commits] commit: Remove dead code (Christophe Mutricy )
git at videolan.org
git at videolan.org
Fri Apr 30 01:24:02 CEST 2010
vlc | branch: master | Christophe Mutricy <xtophe at videolan.org> | Thu Apr 29 22:14:27 2010 +0100| [830a1215175b734c476390dd24c59a444a8a2fec] | committer: Christophe Mutricy
Remove dead code
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=830a1215175b734c476390dd24c59a444a8a2fec
---
configure.ac | 6 ++----
1 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/configure.ac b/configure.ac
index 5ae04f7..8510e84 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3894,15 +3894,13 @@ AS_IF([test "${enable_qt4}" != "no"], [
PKG_CHECK_MODULES(QT4, [QtCore QtGui >= 4.4.0], [
VLC_ADD_PLUGIN([qt4])
ALIASES="${ALIASES} qvlc"
- QT4LOCALEDIR="$(eval $PKG_CONFIG --variable=prefix QtCore)/share/qt4/translations/"
- AC_SUBST(QT4LOCALEDIR)
AS_IF([test "${SYS}" != "mingw32" -a "${SYS}" != "mingwce" -a "${SYS}" != "darwin"], [
VLC_ADD_LIBS([qt4],[$QT4_LIBS ${X_LIBS} ${X_PRE_LIBS} -lX11])
need_xid_provider="no"
- VLC_ADD_CXXFLAGS([qt4],[$QT4_CFLAGS ${X_CFLAGS} -DQT4LOCALEDIR=\\\\\\\"${QT4LOCALEDIR}\\\\\\\"])
+ VLC_ADD_CXXFLAGS([qt4],[$QT4_CFLAGS ${X_CFLAGS}])
], [
VLC_ADD_LIBS([qt4],[$QT4_LIBS -lole32])
- VLC_ADD_CXXFLAGS([qt4],[$QT4_CFLAGS -DQT4LOCALEDIR=\\\\\\\"${QT4LOCALEDIR}\\\\\\\"])
+ VLC_ADD_CXXFLAGS([qt4],[$QT4_CFLAGS])
])
AC_PATH_PROGS(MOC, [moc-qt4 moc], moc,`eval $PKG_CONFIG --variable=exec_prefix QtCore`/bin)
AC_PATH_PROG(RCC, rcc, rcc,`eval $PKG_CONFIG --variable=exec_prefix QtCore`/bin)
More information about the vlc-commits
mailing list