[glibmm] Clean up configure check for Windows host

[Daniel Elstner <daniel src gnome org>]

commit 151582839433591cc9021b6b10a7d7cb79ba3b0a
Author: Daniel Elstner <danielk openismus com>
Date:   Mon Aug 10 22:43:44 2009 +0200

    Clean up configure check for Windows host
    
    * configure.ac (OS_WIN32): Rename conditional to HOST_WINDOWS_NATIVE
    because the OS vs platform terminology confused the hell out of me.
    Remove the check for a non-native Windows host such as Cygwin, since
    the corresponding conditional is not used anymore.

 ChangeLog           |    9 +++++++++
 configure.ac        |   17 ++++++-----------
 gio/src/filelist.am |    2 +-
 3 files changed, 16 insertions(+), 12 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index e1b3a3a..8dc6c3e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,14 @@
 2009-08-10  Daniel Elstner  <danielk openismus com>
 
+	Clean up configure check for Windows host
+
+	* configure.ac (OS_WIN32): Rename conditional to HOST_WINDOWS_NATIVE
+	because the OS vs platform terminology confused the hell out of me.
+	Remove the check for a non-native Windows host such as Cygwin, since
+	the corresponding conditional is not used anymore.
+
+2009-08-10  Daniel Elstner  <danielk openismus com>
+
 	Have mm-common-prepare install the doc utils
 
 	* configure.ac: Call MM_CONFIG_DOCTOOL_DIR([docs]) to set
diff --git a/configure.ac b/configure.ac
index 7e92125..6058072 100644
--- a/configure.ac
+++ b/configure.ac
@@ -40,15 +40,10 @@ AC_DISABLE_STATIC
 AC_LIBTOOL_WIN32_DLL
 AC_PROG_LIBTOOL
 
-AC_MSG_CHECKING([for Windows operating system])
-AS_CASE([$host_os], [cygwin*|mingw*], [glibmm_platform_win32=yes], [glibmm_platform_win32=no])
-AC_MSG_RESULT([$glibmm_platform_win32])
-AM_CONDITIONAL([PLATFORM_WIN32], [test "x$glibmm_platform_win32" = xyes])
-
-AC_MSG_CHECKING([for native Win32 host environment])
-AS_CASE([$host_os], [mingw*], [glibmm_os_win32=yes], [glibmm_os_win32=no])
-AC_MSG_RESULT([$glibmm_os_win32])
-AM_CONDITIONAL([OS_WIN32], [test "x$glibmm_os_win32" = xyes])
+AC_MSG_CHECKING([for native Windows host])
+AS_CASE([$host_os], [mingw*], [glibmm_host_windows=yes], [glibmm_host_windows=no])
+AC_MSG_RESULT([$glibmm_host_windows])
+AM_CONDITIONAL([HOST_WINDOWS_NATIVE], [test "x$glibmm_host_windows" = xyes])
 
 AS_IF([test "x$enable_static" = xyes],
 [
@@ -61,13 +56,13 @@ AC_CHECK_FUNCS([flockfile funlockfile getc_unlocked mkfifo])
 glibreq='2.0 >= 2.21.1'
 GLIBMM_MODULES="sigc++-2.0 >= 2.0 glib-$glibreq gobject-$glibreq gmodule-$glibreq"
 GIOMM_MODULES="$GLIBMM_MODULES gio-$glibreq"
-test "x$glibmm_os_win32" = xyes || GIOMM_MODULES="$GIOMM_MODULES gio-unix-$glibreq"
+test "x$glibmm_host_windows" = xyes || GIOMM_MODULES="$GIOMM_MODULES gio-unix-$glibreq"
 
 PKG_CHECK_MODULES([GLIBMM], [$GLIBMM_MODULES])
 PKG_CHECK_MODULES([GIOMM],  [$GIOMM_MODULES])
 
 MM_PKG_CONFIG_SUBST([GTHREAD_CFLAGS], [--cflags-only-other gthread-2.0])
-MM_PKG_CONFIG_SUBST([GTHREAD_LIBS], [--libs gthread-2.0])
+MM_PKG_CONFIG_SUBST([GTHREAD_LIBS], [--libs-only-other --libs-only-l gthread-2.0])
 
 AC_CHECK_PROGS([M4], [gm4 m4], [m4])
 
diff --git a/gio/src/filelist.am b/gio/src/filelist.am
index 9de60ff..333351c 100644
--- a/gio/src/filelist.am
+++ b/gio/src/filelist.am
@@ -66,7 +66,7 @@ giomm_files_posix_hg =			\
 	unixinputstream.hg		\
 	unixoutputstream.hg
 
-if OS_WIN32
+if HOST_WINDOWS_NATIVE
 giomm_files_arch_hg =
 else
 giomm_files_arch_hg = $(giomm_files_posix_hg)