From 3573eb72e4df9df6e502ed6418425b08ea88e1f6 Mon Sep 17 00:00:00 2001
From: Carlos Garcia Campos <carlosgc@gnome.org>
Date: Mon, 09 Feb 2009 17:08:22 +0000
Subject: Fix smclient libs on cycgwin. See bug #339172.

2009-02-09  Carlos Garcia Campos  <carlosgc@gnome.org>

	* configure.ac:
	* cut-n-paste/smclient/Makefile.am:

	Fix smclient libs on cycgwin. See bug #339172.

svn path=/trunk/; revision=3425
---
diff --git a/ChangeLog b/ChangeLog
index 05cdf41..3d97a7b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2009-02-09  Carlos Garcia Campos  <carlosgc@gnome.org>
+
+	* configure.ac:
+	* cut-n-paste/smclient/Makefile.am:
+
+	Fix smclient libs on cycgwin. See bug #339172.
+	
 2009-02-08  Christian Persch  <chpe@gnome.org>
 
 	* configure.ac:
diff --git a/configure.ac b/configure.ac
index 435e0c0..4ee26a9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -86,6 +86,18 @@ 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(OS_WIN32, test "$os_win32" = "yes")
+
 dnl Check dependencies
 
 # LIB_CFLAGS       for helpers and generic widgets. (libdocument, cut-and-paste)
@@ -111,7 +123,12 @@ PKG_CHECK_MODULES(BACKEND, gtk+-2.0 >= $GTK_REQUIRED)
 PKG_CHECK_MODULES(FRONTEND_CORE, gtk+-2.0 >= $GTK_REQUIRED gthread-2.0 gio-2.0 >= $GLIB_REQUIRED)
 PKG_CHECK_MODULES(SHELL_CORE, libxml-2.0 >= $LIBXML_REQUIRED gtk+-2.0 >= $GTK_REQUIRED gtk+-unix-print-2.0 >= $GTK_REQUIRED gio-2.0 >= $GLIB_REQUIRED gnome-icon-theme >= $GNOME_ICON_THEME_REQUIRED gthread-2.0)
 
-PKG_CHECK_MODULES(SMCLIENT, gtk+-2.0 gthread-2.0)
+if test "$os_win32" = no; then
+	PKG_CHECK_MODULES(SMCLIENT, gtk+-2.0 gthread-2.0 sm >= 1.0.0)
+else
+	PKG_CHECK_MODULES(SMCLIENT, gtk+-2.0 gthread-2.0)
+fi
+
 AC_SUBST(SMCLIENT_CFLAGS)
 AC_SUBST(SMCLIENT_LIBS)
 
diff --git a/cut-n-paste/smclient/Makefile.am b/cut-n-paste/smclient/Makefile.am
index 7cc76bc..4493922 100644
--- a/cut-n-paste/smclient/Makefile.am
+++ b/cut-n-paste/smclient/Makefile.am
@@ -1,9 +1,8 @@
 noinst_LTLIBRARIES = libsmclient.la
 
-if PLATFORM_WIN32
+if OS_WIN32
 platform_sources = eggsmclient-win32.c
 else
-platform_libs = -lSM -lICE
 platform_sources = 		\
 	eggsmclient-xsmp.c	\
 	eggdesktopfile.c	\
@@ -24,9 +23,7 @@ libsmclient_la_CFLAGS =				\
 	$(WARNING_CFLAGS)			\
 	$(DISABLE_DEPRECATED)
 
-libsmclient_la_LIBADD = 	\
-	$(SMCLIENT_LIBS)	\
-	$(platform_libs)
+libsmclient_la_LIBADD = $(SMCLIENT_LIBS)
 
 EXTRA_DIST =			\
 	eggsmclient-win32.c	\
--
cgit v0.9.1