diff options
Diffstat (limited to 'server')
| -rw-r--r-- | server/Makefile.am | 17 | ||||
| -rw-r--r-- | server/configure.ac | 1 | ||||
| -rw-r--r-- | server/external/libcollection.m4 | 12 |
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) |