Commit f452fcbe authored by Jean-Baptiste Kempf's avatar Jean-Baptiste Kempf
Browse files

Configure: regroup win32 checks

parent 0ed8238e
...@@ -412,8 +412,10 @@ dnl Iconv stuff ...@@ -412,8 +412,10 @@ dnl Iconv stuff
dnl dnl
AM_ICONV AM_ICONV
dnl Check for broken versions of mingw-runtime compatability library dnl
dnl checks for mingw
AS_IF([test "${SYS}" = "mingw32"], [ AS_IF([test "${SYS}" = "mingw32"], [
dnl Check for broken versions of mingw-runtime compatability library
AC_MSG_CHECKING(for broken mingw-runtime) AC_MSG_CHECKING(for broken mingw-runtime)
AC_PREPROC_IFELSE([AC_LANG_SOURCE([ AC_PREPROC_IFELSE([AC_LANG_SOURCE([
#include <_mingw.h> #include <_mingw.h>
...@@ -432,18 +434,14 @@ AS_IF([test "${SYS}" = "mingw32"], [ ...@@ -432,18 +434,14 @@ AS_IF([test "${SYS}" = "mingw32"], [
]) ])
dnl force use of mingw provided c99 *printf over msvcrt dnl force use of mingw provided c99 *printf over msvcrt
CPPFLAGS="${CPPFLAGS} -D__USE_MINGW_ANSI_STDIO=1" CPPFLAGS="${CPPFLAGS} -D__USE_MINGW_ANSI_STDIO=1"
])
dnl Check for the need to include the mingwex lib for mingw32 dnl Check for the need to include the mingwex lib for mingw32
if test "${SYS}" = "mingw32" ; then
AC_CHECK_LIB(mingwex,opendir, AC_CHECK_LIB(mingwex,opendir,
AC_CHECK_LIB(mingw32,opendir,, AC_CHECK_LIB(mingw32,opendir,,
[VLC_ADD_LIBS([libvlccore],[-lmingwex])]) [VLC_ADD_LIBS([libvlccore],[-lmingwex])])
) )
fi
dnl Check for fnative-struct or mms-bitfields support for mingw32 dnl Check for fnative-struct or mms-bitfields support for mingw32
if test "${SYS}" = "mingw32" ; then
VLC_SAVE_FLAGS VLC_SAVE_FLAGS
CFLAGS="${CFLAGS} -mms-bitfields" CFLAGS="${CFLAGS} -mms-bitfields"
CXXFLAGS="${CXXFLAGS} -mms-bitfields" CXXFLAGS="${CXXFLAGS} -mms-bitfields"
...@@ -459,7 +457,7 @@ if test "${SYS}" = "mingw32" ; then ...@@ -459,7 +457,7 @@ if test "${SYS}" = "mingw32" ; then
[AC_TRY_COMPILE([],,ac_cv_c_fnative_struct=yes, ac_cv_c_fnative_struct=no)]) [AC_TRY_COMPILE([],,ac_cv_c_fnative_struct=yes, ac_cv_c_fnative_struct=no)])
"${ac_cv_c_fnative_struct}" = "no" && VLC_RESTORE_FLAGS "${ac_cv_c_fnative_struct}" = "no" && VLC_RESTORE_FLAGS
fi fi
fi ])
dnl dnl
dnl Buggy glibc prevention. Purposedly not cached. dnl Buggy glibc prevention. Purposedly not cached.
......
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