summaryrefslogtreecommitdiff
path: root/server
diff options
context:
space:
mode:
authorStephen Gallagher <sgallagh@redhat.com>2010-02-01 10:33:28 -0500
committerStephen Gallagher <sgallagh@redhat.com>2010-02-03 10:35:17 -0500
commit6e9b349b2738064f6d03b2b127ad47af399aaa10 (patch)
tree6ac7f4f4ea6e3e5447df08f0b287d2381b721e5a /server
parentee08a65d418413515645278734de1ae984a60456 (diff)
downloadsssd-6e9b349b2738064f6d03b2b127ad47af399aaa10.tar.gz
sssd-6e9b349b2738064f6d03b2b127ad47af399aaa10.tar.bz2
sssd-6e9b349b2738064f6d03b2b127ad47af399aaa10.zip
Split off libcollection into a shared library
Diffstat (limited to 'server')
-rw-r--r--server/Makefile.am17
-rw-r--r--server/configure.ac1
-rw-r--r--server/external/libcollection.m412
3 files changed, 24 insertions, 6 deletions
diff --git a/server/Makefile.am b/server/Makefile.am
index 3c02f65a..38b96088 100644
--- a/server/Makefile.am
+++ b/server/Makefile.am
@@ -133,12 +133,17 @@ dist_noinst_DATA = \
###############################
# Global compilation settings #
###############################
-COLLECTION_CFLAGS = \
- -I$(srcdir)/../common/collection \
- -I$(srcdir)/../common/trace
-COLLECTION_LIBS = \
- -L$(builddir)/../common/collection/.libs/ \
- -lcollection
+
+if HAVE_SYSTEM_COLLECTION
+ COLLECTION_CFLAGS = $(SYSTEM_COLLECTION_CFLAGS)
+ COLLECTION_LIBS = $(SYSTEM_COLLECTION_LIBS)
+else
+ COLLECTION_CFLAGS = \
+ -I$(srcdir)/../common/collection
+ COLLECTION_LIBS = \
+ -L$(builddir)/../common/collection \
+ -lcollection
+endif
INI_CFG_CFLAGS = \
-I$(srcdir)/../common/ini
diff --git a/server/configure.ac b/server/configure.ac
index 75c07dab..a67dd15d 100644
--- a/server/configure.ac
+++ b/server/configure.ac
@@ -66,6 +66,7 @@ m4_include([external/libtdb.m4])
m4_include([external/libtevent.m4])
m4_include([external/libldb.m4])
m4_include([external/libdhash.m4])
+m4_include([external/libcollection.m4])
m4_include([external/pam.m4])
m4_include([external/ldap.m4])
m4_include([external/libpcre.m4])
diff --git a/server/external/libcollection.m4 b/server/external/libcollection.m4
new file mode 100644
index 00000000..8fc37e8c
--- /dev/null
+++ b/server/external/libcollection.m4
@@ -0,0 +1,12 @@
+AC_SUBST(SYSTEM_COLLECTION_OBJ)
+AC_SUBST(SYSTEM_COLLECTION_CFLAGS)
+AC_SUBST(SYSTEM_COLLECTION_LIBS)
+
+PKG_CHECK_MODULES(SYSTEM_COLLECTION, collection >= 0.4.0,
+ have_system_collection=true,
+ have_system_collection=false
+ )
+# This is future-compatible. Right now, we'll force the use of our
+# in-tree copy. When collection is split off as its own source package, we'll
+# fix this test
+AM_CONDITIONAL(HAVE_SYSTEM_COLLECTION, test x$have_system_collection = xtrue_FORCE_IN_TREE)