summaryrefslogtreecommitdiff
path: root/shell
diff options
context:
space:
mode:
authorVincent Untz <vuntz@gnome.org>2009-08-11 12:11:58 +0200
committerJens Granseuer <jensgr@gmx.net>2009-10-24 14:19:30 +0200
commit480416907e4b014b94bea498aa917a0b5563f798 (patch)
treea584243000d24c9c766cd926db02e7d1d4c32ea3 /shell
parentc831bc1539ce2c601c5fd735e0cbfe44df45f935 (diff)
downloadgnome-control-center-480416907e4b014b94bea498aa917a0b5563f798.tar.gz
Use external libslab when available
Diffstat (limited to 'shell')
-rw-r--r--shell/Makefile.am12
1 files changed, 10 insertions, 2 deletions
diff --git a/shell/Makefile.am b/shell/Makefile.am
index e55715f39..915d75a7b 100644
--- a/shell/Makefile.am
+++ b/shell/Makefile.am
@@ -1,6 +1,14 @@
+if HAVE_LIBSLAB_DEPS
+REAL_LIBSLAB_CFLAGS = -I$(top_srcdir)/libslab
+REAL_LIBSLAB_LIBS = $(top_builddir)/libslab/libslab.la
+else
+REAL_LIBSLAB_CFLAGS = $(EXTERNAL_LIBSLAB_CFLAGS)
+REAL_LIBSLAB_LIBS = $(EXTERNAL_LIBSLAB_LIBS)
+endif
+
INCLUDES = \
-I$(top_srcdir) \
- -I$(top_srcdir)/libslab \
+ $(REAL_LIBSLAB_CFLAGS) \
$(GNOMECC_SHELL_CFLAGS)
bin_PROGRAMS = gnome-control-center
@@ -10,7 +18,7 @@ gnome_control_center_SOURCES = \
gnome_control_center_LDADD = \
$(GNOMECC_SHELL_LIBS) \
- $(top_builddir)/libslab/libslab.la
+ $(REAL_LIBSLAB_LIBS)
AM_CPPFLAGS = \
-DGNOMELOCALEDIR="\"$(datadir)/locale\""