gnome-terminal r3274 - in trunk: . src

[chpe svn gnome org]

Author: chpe
Date: Sat Jan 10 17:25:45 2009
New Revision: 3274
URL: http://svn.gnome.org/viewvc/gnome-terminal?rev=3274&view=rev

Log:
Check for sm cflags and libs, and add them to the g-t cflags/libs

Modified:
   trunk/configure.ac
   trunk/src/Makefile.am

Modified: trunk/configure.ac
==============================================================================
--- trunk/configure.ac	(original)
+++ trunk/configure.ac	Sat Jan 10 17:25:45 2009
@@ -57,12 +57,13 @@
 # Check the smclient backend
 GDK_TARGET="$($PKG_CONFIG --variable target gdk-2.0)"
 
+SMCLIENT_PKGS=
 AC_MSG_CHECKING([which smclient backend to use])
 AC_ARG_WITH([smclient],
   [AS_HELP_STRING([--with-smclient-backend],[which smclient backend to use (xsmp/win32/quartz)])],
   [],
   [case "$GDK_TARGET" in
-    x11) with_smclient=xsmp ;;
+    x11) with_smclient=xsmp SMCLIENT_PKGS="sm" ;;
     win32|quartz) with_smclient=$GDK_TARGET ;;
     *) with_smclient=no ;;
    esac])
@@ -72,6 +73,12 @@
   AC_DEFINE([WITH_SMCLIENT],[1],[Define if smclient is enabled])
 fi
 
+if test -n "$SMCLIENT_PKGS"; then
+  PKG_CHECK_MODULES([SMCLIENT],[$SMCLIENT_PKGS])
+  AC_SUBST([SMCLIENT_CFLAGS])
+  AC_SUBST([SMCLIENT_LIBS])
+fi
+
 AM_CONDITIONAL([WITH_SMCLIENT],[test "$with_smclient" != "no"])
 AM_CONDITIONAL([WITH_SMCLIENT_XSMP],[test "$with_smclient" = "xsmp"])
 AM_CONDITIONAL([WITH_SMCLIENT_WIN32],[test "$with_smclient" = "win32"])

Modified: trunk/src/Makefile.am
==============================================================================
--- trunk/src/Makefile.am	(original)
+++ trunk/src/Makefile.am	Sat Jan 10 17:25:45 2009
@@ -81,6 +81,9 @@
 	eggsmclient.h \
 	eggsmclient-private.h \
 	$(NULL)
+gnome_terminal_CFLAGS += $(SMCLIENT_CFLAGS)
+gnome_terminal_LDADD += $(SMCLIENT_LIBS)
+
 if WITH_SMCLIENT_XSMP
 gnome_terminal_SOURCES += eggsmclient-xsmp.c
 gnome_terminal_CPPFLAGS += -DEGG_SM_CLIENT_BACKEND_XSMP