diff options
author | Stephen Gallagher <sgallagh@redhat.com> | 2010-08-10 12:08:55 -0400 |
---|---|---|
committer | Stephen Gallagher <sgallagh@redhat.com> | 2010-08-18 12:28:18 -0400 |
commit | e30512271d235f5812d4ca9ab26a9d5c8bbbca79 (patch) | |
tree | da4464553e841f820aceb697e25dcc1b2811fd8a /ini | |
parent | bf98ddf34edf25064e96594d782e8418fcd80f77 (diff) | |
download | ding-libs2-e30512271d235f5812d4ca9ab26a9d5c8bbbca79.tar.gz ding-libs2-e30512271d235f5812d4ca9ab26a9d5c8bbbca79.tar.xz ding-libs2-e30512271d235f5812d4ca9ab26a9d5c8bbbca79.zip |
Update ini for new buildsystem
Diffstat (limited to 'ini')
-rw-r--r-- | ini/Makefile.am | 32 | ||||
-rw-r--r-- | ini/configure.ac | 6 | ||||
-rw-r--r-- | ini/m4/libbasicobjects.m4 | 5 | ||||
-rw-r--r-- | ini/m4/libcollection.m4 | 5 | ||||
-rw-r--r-- | ini/m4/libpath_utils.m4 | 5 | ||||
-rw-r--r-- | ini/m4/libref_array.m4 | 5 | ||||
l--------- | ini/trace.h | 1 |
7 files changed, 48 insertions, 11 deletions
diff --git a/ini/Makefile.am b/ini/Makefile.am index ee6c6de..6771ade 100644 --- a/ini/Makefile.am +++ b/ini/Makefile.am @@ -1,6 +1,15 @@ #DEBUG_FLAGS=@DEBUG_VAR@ TRACE_LEVEL=@TRACE_VAR@ +COLLECTION_CFLAGS=@COLLECTION_CFLAGS@ +COLLECTION_LIBS=@COLLECTION_LIBS@ + +PATH_UTILS_CFLAGS=@PATH_UTILS_CFLAGS@ +PATH_UTILS_LIBS=@PATH_UTILS_LIBS@ + +REFARRAY_CFLAGS=@REFARRAY_CFLAGS@ +REFARRAY_LIBS=@REFARRAY_LIBS@ + builddir ?= . topdir=$(srcdir)/.. @@ -13,8 +22,11 @@ if HAVE_GCC -Wcast-align -Wwrite-strings endif -AM_CPPFLAGS = -I$(topdir) -I$(topdir)/trace -I$(topdir)/collection \ - -I$(topdir)/path_utils -I$(topdir)/refarray $(TRACE_LEVEL) +AM_CPPFLAGS = \ + $(COLLECTION_CFLAGS) \ + $(PATH_UTILS_CFLAGS) \ + $(REFARRAY_CFLAGS) \ + $(TRACE_LEVEL) ACLOCAL_AMFLAGS = -I m4 @@ -46,23 +58,23 @@ libini_config_la_SOURCES = \ ini_metadata.h \ ini_defines.h \ ini_comment.c \ - ini_comment.h + ini_comment.h \ + trace.h libini_config_la_LIBADD = \ - -L$(topbuilddir)/collection \ - -L$(topbuilddir)/path_utils \ - -L$(topbuilddir)/refarray \ - -lcollection \ - -lref_array \ - -lpath_utils + $(COLLECTION_LIBS) \ + $(PATH_UTILS_LIBS) \ + $(REFARRAY_LIBS) libini_config_la_LDFLAGS = \ -version-info 2:0:0 # Build unit test check_PROGRAMS = ini_config_ut ini_comment_ut ini_config_ut_SOURCES = ini_config_ut.c -ini_config_ut_LDADD = libini_config.la -L$(topbuilddir)/collection -lcollection +ini_config_ut_LDADD = \ + libini_config.la \ + $(LIBCOLLECTION_LIBS) ini_comment_ut_SOURCES = ini_comment_ut.c ini_comment_ut_LDADD = libini_config.la diff --git a/ini/configure.ac b/ini/configure.ac index eb3e6f2..29814a2 100644 --- a/ini/configure.ac +++ b/ini/configure.ac @@ -1,4 +1,4 @@ -AC_INIT([ini_config],[0.6.0],[sssd-devel@lists.fedorahosted.org]) +AC_INIT([libini_config],[0.6.1],[sssd-devel@lists.fedorahosted.org]) AC_CONFIG_SRCDIR([ini_config.c]) AC_CONFIG_AUX_DIR([build]) AM_INIT_AUTOMAKE([-Wall -Werror foreign]) @@ -14,6 +14,10 @@ AM_SILENT_RULES AC_CONFIG_HEADERS([config.h]) +m4_include([m4/libcollection.m4]) +m4_include([m4/libpath_utils.m4]) +m4_include([m4/libref_array.m4]) + # Enable trace build AC_ARG_ENABLE([trace], [AS_HELP_STRING([--enable-trace[=LEVEL]],[build with low level tracing enabled])], diff --git a/ini/m4/libbasicobjects.m4 b/ini/m4/libbasicobjects.m4 new file mode 100644 index 0000000..53208b9 --- /dev/null +++ b/ini/m4/libbasicobjects.m4 @@ -0,0 +1,5 @@ +AC_SUBST(BASICOBJS_OBJ) +AC_SUBST(BASICOBJS_CFLAGS) +AC_SUBST(BASICOBJS_LIBS) + +PKG_CHECK_MODULES(BASICOBJS, basicobjects >= 0.1.0) diff --git a/ini/m4/libcollection.m4 b/ini/m4/libcollection.m4 new file mode 100644 index 0000000..b84dce2 --- /dev/null +++ b/ini/m4/libcollection.m4 @@ -0,0 +1,5 @@ +AC_SUBST(COLLECTION_OBJ) +AC_SUBST(COLLECTION_CFLAGS) +AC_SUBST(COLLECTION_LIBS) + +PKG_CHECK_MODULES(COLLECTION, collection >= 0.5.0,,AC_MSG_ERROR([libcollection development package not installed])) diff --git a/ini/m4/libpath_utils.m4 b/ini/m4/libpath_utils.m4 new file mode 100644 index 0000000..83343ab --- /dev/null +++ b/ini/m4/libpath_utils.m4 @@ -0,0 +1,5 @@ +AC_SUBST(PATH_UTILS_OBJ) +AC_SUBST(PATH_UTILS_CFLAGS) +AC_SUBST(PATH_UTILS_LIBS) + +PKG_CHECK_MODULES(PATH_UTILS, path_utils >= 0.2.0) diff --git a/ini/m4/libref_array.m4 b/ini/m4/libref_array.m4 new file mode 100644 index 0000000..e181020 --- /dev/null +++ b/ini/m4/libref_array.m4 @@ -0,0 +1,5 @@ +AC_SUBST(REFARRAY_OBJ) +AC_SUBST(REFARRAY_CFLAGS) +AC_SUBST(REFARRAY_LIBS) + +PKG_CHECK_MODULES(REFARRAY, ref_array >= 0.1.0,,AC_MSG_ERROR([librefarray development package not installed])) diff --git a/ini/trace.h b/ini/trace.h new file mode 120000 index 0000000..6ac9e42 --- /dev/null +++ b/ini/trace.h @@ -0,0 +1 @@ +../collection/trace.h
\ No newline at end of file |