[gnome-control-center] Update to latest libslab, and do not install libslab on the system

[Vincent Untz <vuntz src gnome org>]

commit 1dee15363d484d09d9ff00ed9c2b8dcd1a684fa8
Author: Vincent Untz <vuntz gnome org>
Date:   Sat Aug 8 14:36:46 2009 +0200

    Update to latest libslab, and do not install libslab on the system

 configure.in          |    8 +--
 libslab/.cvsignore    |    8 --
 libslab/ChangeLog     |  248 -------------------------------------------------
 libslab/Makefile.am   |    7 ++
 libslab/libslab.pc.in |   12 ---
 5 files changed, 8 insertions(+), 275 deletions(-)
---
diff --git a/configure.in b/configure.in
index a0ed56a..d3cd6bb 100644
--- a/configure.in
+++ b/configure.in
@@ -121,14 +121,9 @@ WARN_CFLAGS="-Wall"
 AC_SUBST(LIBSLAB_CFLAGS)
 AC_SUBST(LIBSLAB_LIBS)
 AC_SUBST(WARN_CFLAGS)
+AM_CONDITIONAL(LIBSLAB_FOR_INTERNAL_USE, test "yes" = "yes")
 AM_CONDITIONAL(HAVE_LIBSLAB_DEPS, [test $have_libslab_deps = yes])
 
-# When copying libslab, make sure to change this to match the value specified
-# in libslab's configure.ac file
-
-LT_VERSION=1:2:1
-AC_SUBST(LT_VERSION)
-
 dnl
 dnl Check for Xft version 2; we build in extra functionality to the font capplet
 dnl when we have it.
@@ -348,7 +343,6 @@ libwindow-settings/Makefile
 libwindow-settings/gnome-window-settings-2.0.pc
 po/Makefile.in
 libslab/Makefile
-libslab/libslab.pc
 shell/Makefile
 shell/gnomecc.desktop.in
 typing-break/Makefile
diff --git a/libslab/Makefile.am b/libslab/Makefile.am
index 520c61e..771e840 100644
--- a/libslab/Makefile.am
+++ b/libslab/Makefile.am
@@ -26,7 +26,11 @@ HEADER_FILES=					\
 	system-tile.h				\
 	tile.h
 
+if !LIBSLAB_FOR_INTERNAL_USE
 lib_LTLIBRARIES = libslab.la
+else
+noinst_LTLIBRARIES = libslab.la
+endif
 
 libslab_la_SOURCES =				\
 	$(MARSHAL_GENERATED)			\
@@ -53,10 +57,12 @@ libslab_la_SOURCES =				\
 	tile-action.c				\
 	tile.c
 
+if !LIBSLAB_FOR_INTERNAL_USE
 libslab_includedir = $(includedir)/libslab
 libslab_include_HEADERS = $(HEADER_FILES)
 
 libslab_la_LDFLAGS = -version-info $(LT_VERSION)
+endif
 
 libslab_la_LIBADD = $(LIBSLAB_LIBS)
 
@@ -65,6 +71,7 @@ search-entry-watermark.h: search-entry-watermark.svg
 	sed -e 's/"/\\"/g' -e 's/$$/\\/' -e 's/#000000/#%s/g' $< >> $@; \
 	echo '"' >> $@
 
+
 MARSHAL_GENERATED = nld-marshal.c nld-marshal.h
 
 nld-marshal.h: nld-marshal.list