[vlc-commits] configure: move winrt detection closer to the other OS

[Jean-Baptiste Kempf]

vlc | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Mon May 16 10:54:19 2016 +0200| [0058b54f37541333ae50a8bd24e605f08298a5de] | committer: Jean-Baptiste Kempf

configure: move winrt detection closer to the other OS

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=0058b54f37541333ae50a8bd24e605f08298a5de
---

 configure.ac |   38 ++++++++++++++++++++------------------
 1 file changed, 20 insertions(+), 18 deletions(-)

diff --git a/configure.ac b/configure.ac
index 25a283c..cb57bb6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -299,11 +299,30 @@ case "${host_os}" in
     SYS="${host_os}"
     ;;
 esac
+
+dnl WinRT
+AC_ARG_ENABLE(winstore_app,
+     AS_HELP_STRING([--enable-winstore-app],
+                    [Build targetted for Windows Store apps (default disabled)]))
+
+vlc_winstore_app=0
+AS_IF([test "${SYS}" = "mingw32"],[
+  AS_IF([test "${enable_winstore_app}" = "yes"], [
+    vlc_winstore_app=1
+     VLC_ADD_LIBS([libvlccore], [-lole32 -lruntimeobject])
+     AC_LIBOBJ([gai_strerror])
+    ],[
+     VLC_ADD_LIBS([libvlccore],[-lwinmm])
+    ])
+  ])
+AC_DEFINE_UNQUOTED(VLC_WINSTORE_APP, ${vlc_winstore_app}, [Define to 1 if you want to build for Windows Store apps])
+
 AM_CONDITIONAL(HAVE_DARWIN,  test "${SYS}" = "darwin")
 AM_CONDITIONAL(HAVE_LINUX,   test "${SYS}" = "linux")
 AM_CONDITIONAL(HAVE_OS2,     test "${SYS}" = "os2")
 AM_CONDITIONAL(HAVE_WIN32,   test "${SYS}" = "mingw32")
-AM_CONDITIONAL(HAVE_WIN64,   test "${HAVE_WIN64}" = "1")
+AM_CONDITIONAL(HAVE_WIN64,   test "${HAVE_WIN64}" = "1") dnl Only used for the packaging
+AM_CONDITIONAL([HAVE_WINSTORE], [test "$vlc_winstore_app" = "1"])
 AM_CONDITIONAL(HAVE_IOS,     test "${HAVE_IOS}" = "1")
 AM_CONDITIONAL(HAVE_OSX,     test "${HAVE_OSX}" = "1")
 AM_CONDITIONAL(HAVE_TVOS,    test "${HAVE_TVOS}" = "1")
@@ -527,23 +546,6 @@ dnl Check for broken versions of mingw-runtime compatability library
     fi
 ])
 
-AC_ARG_ENABLE(winstore_app,
-     AS_HELP_STRING([--enable-winstore-app],
-                    [Build targetted for Windows Store apps (default disabled)]))
-
-vlc_winstore_app=0
-AS_IF([test "${SYS}" = "mingw32"],[
-  AS_IF([test "${enable_winstore_app}" = "yes"], [
-    vlc_winstore_app=1
-     VLC_ADD_LIBS([libvlccore], [-lole32 -lruntimeobject])
-     AC_LIBOBJ([gai_strerror])
-    ],[
-     VLC_ADD_LIBS([libvlccore],[-lwinmm])
-    ])
-  ])
-AC_DEFINE_UNQUOTED(VLC_WINSTORE_APP, ${vlc_winstore_app}, [Define to 1 if you want to build for Windows Store apps])
-AM_CONDITIONAL([HAVE_WINSTORE], [test "$vlc_winstore_app" = "1"])
-
 
 dnl
 dnl Buggy glibc prevention. Purposedly not cached.