[gnome-games] build: move win32 platform check up
- From: Christian Persch <chpe src gnome org>
- To: svn-commits-list gnome org
- Subject: [gnome-games] build: move win32 platform check up
- Date: Thu, 9 Jul 2009 23:10:30 +0000 (UTC)
commit f96a2e0dc69b581792e744c5ecca101e83cea42f
Author: Christian Persch <chpe gnome org>
Date: Sat Jun 27 20:35:03 2009 +0200
build: move win32 platform check up
So checking for win32 in the various existing tests actually works.
configure.in | 82 ++++++++++++++++++++++++++++++++-------------------------
1 files changed, 46 insertions(+), 36 deletions(-)
---
diff --git a/configure.in b/configure.in
index 9e85acc..86e7961 100644
--- a/configure.in
+++ b/configure.in
@@ -288,9 +288,41 @@ if test "$with_platform" = "hildon"; then
fi
fi
+# Win32 platform
+
+AC_CANONICAL_HOST
+
+AC_MSG_CHECKING([for some Win32 platform])
+case "$host" in
+ *-*-cygwin*|*-*-mingw*)
+ platform_win32=yes
+ ;;
+ *)
+ platform_win32=no
+ ;;
+esac
+AC_MSG_RESULT([$platform_win32])
+AM_CONDITIONAL([PLATFORM_WIN32],[test "$platform_win32" = "yes"])
+
+AC_MSG_CHECKING([for native Win32])
+case "$host" in
+ *-*-mingw*)
+ os_win32=yes
+ ;;
+ *)
+ os_win32=no
+ ;;
+esac
+AC_MSG_RESULT([$os_win32])
+AM_CONDITIONAL([PLATFORM_WIN32_NATIVE],[test "$os_win32" = "yes"])
+
+# ********
# Features
+# ********
+# *****
# Sound
+# *****
if test "$want_sound" = "yes"; then
AC_MSG_CHECKING([whether to enable sound support])
@@ -344,7 +376,9 @@ case "$with_platform" in
;;
esac
+# ******************
# Card theme formats
+# ******************
AC_MSG_CHECKING([for requested card theme formats])
AC_ARG_WITH([card-theme-formats],
@@ -435,7 +469,9 @@ esac
AC_DEFINE_UNQUOTED([GAMES_CARD_THEME_DEFAULT_FORMAT_STRING],["$with_default_card_theme_format"],[The default card theme format type string])
+# ********************
# Card theme installer
+# ********************
AC_MSG_CHECKING([whether card themes installer support is requested])
AC_ARG_ENABLE([card-themes-installer],
@@ -692,7 +728,9 @@ AM_CONDITIONAL([WITH_SMCLIENT_XSMP],[test "$with_smclient" = "xsmp"])
AM_CONDITIONAL([WITH_SMCLIENT_WIN32],[test "$with_smclient" = "win32"])
AM_CONDITIONAL([WITH_SMCLIENT_QUARTZ],[test "$with_smclient" = "quartz"])
-# *************
+# *****************
+# Extra build tools
+# *****************
AC_PATH_PROG([GLIB_GENMARSHAL],[glib-genmarshal])
@@ -704,6 +742,13 @@ else
fi
AC_SUBST([GLIB_GENMARSHAL_INTERNAL])
+if test "$platform_win32" = "yes" -a "$os_win32" = "yes"; then
+ AC_CHECK_TOOL([WINDRES],[windres],[no])
+ if test "$WINDRES" = "no"; then
+ AC_MSG_ERROR([windres is required for native win32])
+ fi
+fi
+
# *************
# Check for GGZ
# *************
@@ -895,41 +940,6 @@ AC_C_INLINE
AC_TYPE_SIZE_T
AC_HEADER_TIME
-# *****
-# Win32
-# *****
-
-AC_MSG_CHECKING([for some Win32 platform])
-case "$host" in
- *-*-cygwin*|*-*-mingw*)
- platform_win32=yes
- ;;
- *)
- platform_win32=no
- ;;
-esac
-AC_MSG_RESULT([$platform_win32])
-AM_CONDITIONAL([PLATFORM_WIN32],[test "$platform_win32" = "yes"])
-
-AC_MSG_CHECKING([for native Win32])
-case "$host" in
- *-*-mingw*)
- os_win32=yes
- ;;
- *)
- os_win32=no
- ;;
-esac
-AC_MSG_RESULT([$os_win32])
-AM_CONDITIONAL([PLATFORM_WIN32_NATIVE],[test "$os_win32" = "yes"])
-
-if test "$platform_win32" = "yes" -a "$os_win32" = "yes"; then
- AC_CHECK_TOOL([WINDRES],[windres],[no])
- if test "$WINDRES" = "no"; then
- AC_MSG_ERROR([windres is required for native win32])
- fi
-fi
-
# *************
# Documentation
# *************
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]