From aaf935747f65a1084ba4ffa3cf32a1e1ea93c987 Mon Sep 17 00:00:00 2001
From: Christian Persch <chpe@gnome.org>
Date: Thu, 04 Jun 2009 21:49:00 +0000
Subject: Make smclient optional

Add --with-smclient configure option, and conditionalise the code. Use
--without-smclient to disable smclient. Smclient is disabled by default
on hildon platform.
---
(limited to 'cut-n-paste')

diff --git a/cut-n-paste/smclient/Makefile.am b/cut-n-paste/smclient/Makefile.am
index 4493922..cbf5f35 100644
--- a/cut-n-paste/smclient/Makefile.am
+++ b/cut-n-paste/smclient/Makefile.am
@@ -1,33 +1,38 @@
 noinst_LTLIBRARIES = libsmclient.la
 
-if OS_WIN32
-platform_sources = eggsmclient-win32.c
-else
-platform_sources = 		\
-	eggsmclient-xsmp.c	\
-	eggdesktopfile.c	\
-	eggdesktopfile.h
-platform_defines = -DEGG_SM_CLIENT_BACKEND_XSMP
-endif
+NULL =
+
+if WITH_SMCLIENT
+libsmclient_la_SOURCES = \
+        eggdesktopfile.c \
+        eggdesktopfile.h \
+        eggsmclient.c \
+        eggsmclient.h \
+        eggsmclient-private.h \
+        $(NULL)
 
-libsmclient_la_SOURCES = 	\
-	eggsmclient.c		\
-	eggsmclient.h		\
-	eggsmclient-private.h	\
-	$(platform_sources)
+libsmclient_la_CPPFLAGS = \
+	-DG_LOG_DOMAIN=\""EggSMClient"\" \
+	$(DISABLE_DEPRECATED) \
+	$(AM_CPPFLAGS)
 
-libsmclient_la_CFLAGS =				\
-	-DG_LOG_DOMAIN=\""EggSMClient"\"	\
-	$(platform_defines)			\
-	$(SMCLIENT_CFLAGS)			\
-	$(WARNING_CFLAGS)			\
-	$(DISABLE_DEPRECATED)
+libsmclient_la_CFLAGS = \
+	$(SMCLIENT_CFLAGS) \
+	$(WARNING_CFLAGS) \
+	$(AM_CFLAGS)
 
-libsmclient_la_LIBADD = $(SMCLIENT_LIBS)
+libsmclient_la_LIBADD = \
+	$(SMCLIENT_LIBS)
 
-EXTRA_DIST =			\
-	eggsmclient-win32.c	\
-	eggsmclient-xsmp.c	\
-	eggdesktopfile.c	\
-	eggdesktopfile.h
+if WITH_SMCLIENT_XSMP
+libsmclient_la_SOURCES += eggsmclient-xsmp.c
+libsmclient_la_CPPFLAGS += -DEGG_SM_CLIENT_BACKEND_XSMP
+endif
+if WITH_SMCLIENT_WIN32
+libsmclient_la_SOURCES += eggsmclient-win32.c
+endif
+if WITH_SMCLIENT_QUARTZ
+libsmclient_la_SOURCES += eggsmclient-osx.c
+endif
 
+endif # WITH_SMCLIENT
--
cgit v0.9.1