evince r3425 - in trunk: . cut-n-paste/smclient

[carlosgc svn gnome org]

Author: carlosgc
Date: Mon Feb  9 17:08:22 2009
New Revision: 3425
URL: http://svn.gnome.org/viewvc/evince?rev=3425&view=rev

Log:
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.

Modified:
   trunk/ChangeLog
   trunk/configure.ac
   trunk/cut-n-paste/smclient/Makefile.am

Modified: trunk/configure.ac
==============================================================================
--- trunk/configure.ac	(original)
+++ trunk/configure.ac	Mon Feb  9 17:08:22 2009
@@ -86,6 +86,18 @@
 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(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)
 

Modified: trunk/cut-n-paste/smclient/Makefile.am
==============================================================================
--- trunk/cut-n-paste/smclient/Makefile.am	(original)
+++ trunk/cut-n-paste/smclient/Makefile.am	Mon Feb  9 17:08:22 2009
@@ -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 @@
 	$(WARNING_CFLAGS)			\
 	$(DISABLE_DEPRECATED)
 
-libsmclient_la_LIBADD = 	\
-	$(SMCLIENT_LIBS)	\
-	$(platform_libs)
+libsmclient_la_LIBADD = $(SMCLIENT_LIBS)
 
 EXTRA_DIST =			\
 	eggsmclient-win32.c	\