gedit r6879 - in trunk: . gedit/smclient

[pborelli svn gnome org]

Author: pborelli
Date: Thu Feb  5 10:52:12 2009
New Revision: 6879
URL: http://svn.gnome.org/viewvc/gedit?rev=6879&view=rev

Log:
2009-02-03  Paolo Borelli  <pborelli katamail com>

	* configure.ac:
	* gedit/smclient/Makefile.am:
	Fix smclient libs on cycgwin. Bug #570582.



Modified:
   trunk/ChangeLog
   trunk/configure.ac
   trunk/gedit/smclient/Makefile.am

Modified: trunk/configure.ac
==============================================================================
--- trunk/configure.ac	(original)
+++ trunk/configure.ac	Thu Feb  5 10:52:12 2009
@@ -60,6 +60,19 @@
 AC_MSG_RESULT([$platform_win32])
 AM_CONDITIONAL(PLATFORM_WIN32, test "$platform_win32" = "yes")
 
+AC_MSG_CHECKING([for native Win32])
+LIB_EXE_MACHINE_FLAG=X86
+case "$host" in
+  *-*-mingw*)
+    os_win32=yes
+    ;;
+  *)
+    os_win32=no
+    ;;
+esac
+AC_MSG_RESULT([$os_win32])
+AM_CONDITIONAL(OS_WIN32, test "$os_win32" = "yes")
+
 dnl check for osx platform
 AC_MSG_CHECKING([for Mac OS X platform])
 case "$host" in
@@ -218,11 +231,10 @@
 AM_CONDITIONAL(BUILD_SEXY, test "$gtkatleast" = "no")
 
 if test "$platform_osx" = "no" &&
-   test "$platform_win32" = no; then
+   test "$os_win32" = no; then
 	PKG_CHECK_MODULES(EGG_SMCLIENT, [
 		sm >= 1.0.0
 	])
-	SM_LIBS="${EGG_SMCLIENT_LIBS}"
 else
 	EGG_SMCLIENT_CFLAGS=
 	EGG_SMCLIENT_LIBS=

Modified: trunk/gedit/smclient/Makefile.am
==============================================================================
--- trunk/gedit/smclient/Makefile.am	(original)
+++ trunk/gedit/smclient/Makefile.am	Thu Feb  5 10:52:12 2009
@@ -1,4 +1,4 @@
-if PLATFORM_WIN32
+if OS_WIN32
 platform_sources = eggsmclient-win32.c
 platform_logout_test_ldflags = -mwindows
 else
@@ -8,7 +8,7 @@
 platform_sources = eggsmclient-osx.c
 else
 platform_defines = -DEGG_SM_CLIENT_BACKEND_XSMP
-platform_libs = libeggdesktopfile.la -lSM -lICE
+platform_libs = libeggdesktopfile.la
 platform_ltlibraries = libeggdesktopfile.la
 platform_sources = eggsmclient-xsmp.c
 endif