Skip to content

V
vlc-2-2
Commit f52a08fd authored by Jean-Paul Saman's avatar Jean-Paul Saman
Browse files
Options

Revert [24765]: Add -lX11 to qt4 linking on non-Windows systems only.

parent 3707af9d
Show whitespace changes
Inline Side-by-side
Showing with 15 additions and 11 deletions
configure.ac
View file @ f52a08fd
...@@ -5156,7 +5156,11 @@ AS_IF([test "${enable_qt4}" != "no" && ...@@ -5156,7 +5156,11 @@ AS_IF([test "${enable_qt4}" != "no" &&
AC_DEFINE([HAVE_QT4], 1, [Define to 1 if you have QT4 library.]) AC_DEFINE([HAVE_QT4], 1, [Define to 1 if you have QT4 library.])
ALIASES="${ALIASES} qvlc" ALIASES="${ALIASES} qvlc"
enableqt4=true enableqt4=true
if test "${SYS}" != "mingw32" -o "${SYS}" != "mingwce" -o "${SYS}" != "cygwin"; then
VLC_ADD_LIBS([qt4],[$QT4_LIBS -lX11])
else
VLC_ADD_LIBS([qt4],[$QT4_LIBS]) VLC_ADD_LIBS([qt4],[$QT4_LIBS])
fi
VLC_ADD_CXXFLAGS([qt4],[$QT4_CFLAGS -DQT4LOCALEDIR=\\\\\\\"$($PKG_CONFIG --variable=prefix QtCore)/share/qt4/translations/\\\\\\\"]) VLC_ADD_CXXFLAGS([qt4],[$QT4_CFLAGS -DQT4LOCALEDIR=\\\\\\\"$($PKG_CONFIG --variable=prefix QtCore)/share/qt4/translations/\\\\\\\"])
AC_PATH_PROGS(MOC, [moc-qt4 moc], moc,`$PKG_CONFIG --variable=exec_prefix QtCore`/bin) AC_PATH_PROGS(MOC, [moc-qt4 moc], moc,`$PKG_CONFIG --variable=exec_prefix QtCore`/bin)
AC_PATH_PROG(RCC, rcc, rcc,`$PKG_CONFIG --variable=exec_prefix QtCore`/bin) AC_PATH_PROG(RCC, rcc, rcc,`$PKG_CONFIG --variable=exec_prefix QtCore`/bin)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment