summaryrefslogtreecommitdiffstats
path: root/collection
diff options
context:
space:
mode:
authorStephen Gallagher <sgallagh@redhat.com>2009-05-12 11:51:20 -0400
committerSimo Sorce <ssorce@redhat.com>2009-05-14 11:34:04 -0400
commite54ce04c11c4a6ff8b5c7bbbd738f70e3da4e101 (patch)
treec2f1993b7192d9b8dd2b8c6c3e96de6884362743 /collection
parent5d237157deefb39db63acdd950bd67c7809415f6 (diff)
downloadding-libs2-e54ce04c11c4a6ff8b5c7bbbd738f70e3da4e101.tar.gz
ding-libs2-e54ce04c11c4a6ff8b5c7bbbd738f70e3da4e101.tar.xz
ding-libs2-e54ce04c11c4a6ff8b5c7bbbd738f70e3da4e101.zip
Enable modular build of common SSSD libraries
Allow configuration and build of individual SSSD utility libraries from their own subdirectories. Building all utilities is still possible recursively from the common root.
Diffstat (limited to 'collection')
-rw-r--r--collection/Makefile.am3
-rw-r--r--collection/collection.pc.in2
-rw-r--r--collection/configure.ac20
-rw-r--r--collection/m4/.dir0
4 files changed, 23 insertions, 2 deletions
diff --git a/collection/Makefile.am b/collection/Makefile.am
index c47327d..1d8f937 100644
--- a/collection/Makefile.am
+++ b/collection/Makefile.am
@@ -3,12 +3,13 @@ TRACE_LEVEL=@TRACE_VAR@
topdir=..
AM_CPPFLAGS = -Wall -I$(topdir) -I$(topdir)/trace $(TRACE_LEVEL)
+ACLOCAL_AMFLAGS = -I m4
# Set up the pkg-config file
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = collection.pc
-# Build libraty
+# Build library
lib_LTLIBRARIES = libcollection.la
libcollection_la_SOURCES = collection.c collection_tools.c collection_tools.h collection_class.h
include_HEADERS = collection.h collection_tools.h
diff --git a/collection/collection.pc.in b/collection/collection.pc.in
index c73a588..31e86fe 100644
--- a/collection/collection.pc.in
+++ b/collection/collection.pc.in
@@ -3,7 +3,7 @@ exec_prefix=@exec_prefix@
libdir=@libdir@
includedir=@includedir@
-Name: collection
+Name: @PACKAGE_NAME@
Description: A data-type to collect data in a heirarchical structure for easy iteration and serialization
Version: @PACKAGE_VERSION@
Libs: -L${libdir} -lcollection
diff --git a/collection/configure.ac b/collection/configure.ac
new file mode 100644
index 0000000..81e65e6
--- /dev/null
+++ b/collection/configure.ac
@@ -0,0 +1,20 @@
+AC_INIT([collection], [0.3.3], [dpal@redhat.com])
+AC_CONFIG_SRCDIR([collection.c])
+AC_CONFIG_AUX_DIR([build])
+AM_INIT_AUTOMAKE([-Wall -Werror foreign])
+AC_PROG_CC
+AC_PROG_LIBTOOL
+AC_CONFIG_MACRO_DIR([m4])
+AC_PROG_INSTALL
+
+AC_CONFIG_HEADERS([config.h])
+
+# Enable trace build
+AC_ARG_ENABLE([trace],
+ [AS_HELP_STRING([--enable-trace[=LEVEL]],[build with low level tracing enabled])],
+ [trace_level="$enableval"],
+ [trace_level="0"])
+AS_IF([test ["$trace_level" -gt "0"] -a ["$trace_level" -lt "8"] ],[AC_SUBST([TRACE_VAR],["-DTRACE_LEVEL=$trace_level"])])
+
+AC_CONFIG_FILES([Makefile collection.pc])
+AC_OUTPUT \ No newline at end of file
diff --git a/collection/m4/.dir b/collection/m4/.dir
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/collection/m4/.dir