Commit 9397093e authored by Christophe Mutricy's avatar Christophe Mutricy

Detect also .exe when looking for programs under win

parent 7a5e8f42
...@@ -257,6 +257,18 @@ AM_CONDITIONAL(HAVE_WIN32, test "${SYS}" = "mingw32") ...@@ -257,6 +257,18 @@ AM_CONDITIONAL(HAVE_WIN32, test "${SYS}" = "mingw32")
AM_CONDITIONAL(HAVE_WINCE, test "${SYS}" = "mingwce") AM_CONDITIONAL(HAVE_WINCE, test "${SYS}" = "mingwce")
dnl dnl
dnl Sadly autoconf doesn't think about testing foo.exe when ask to test
dnl for program foo on win32
case "${build_os}" in
cygwin|msys)
ac_executable_extensions=".exe"
;;
*)
;;
esac
dnl
dnl Libtool dnl Libtool
dnl It's very bad, but our former custom system was worst dnl It's very bad, but our former custom system was worst
dnl -- Courmisch dnl -- Courmisch
...@@ -4915,9 +4927,10 @@ AS_IF([test "${enable_qt4}" != "no" && ...@@ -4915,9 +4927,10 @@ AS_IF([test "${enable_qt4}" != "no" &&
enableqt4=true enableqt4=true
VLC_ADD_LDFLAGS([qt4],[$QT4_LIBS]) VLC_ADD_LDFLAGS([qt4],[$QT4_LIBS])
VLC_ADD_CXXFLAGS([qt4],[$QT4_CFLAGS]) VLC_ADD_CXXFLAGS([qt4],[$QT4_CFLAGS])
MOC=`$PKG_CONFIG --variable=exec_prefix QtCore`/bin/moc AC_PATH_PROG(MOC, moc, moc,`$PKG_CONFIG --variable=exec_prefix QtCore`/bin)
RCC=`$PKG_CONFIG --variable=exec_prefix QtCore`/bin/rcc AC_PATH_PROG(RCC, rcc, rcc,`$PKG_CONFIG --variable=exec_prefix QtCore`/bin)
UIC=`$PKG_CONFIG --variable=exec_prefix QtCore`/bin/uic], AC_PATH_PROG(UIC, uic, uic,`$PKG_CONFIG --variable=exec_prefix QtCore`/bin)
],
AS_IF([test "${enable_qt4}" = "yes"],[ AS_IF([test "${enable_qt4}" = "yes"],[
AC_MSG_ERROR(QT4 library not found) AC_MSG_ERROR(QT4 library not found)
],[ ],[
......
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