-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 On 08/13/2010 04:19 PM, Stephen Gallagher wrote: > The attached patches are applied atop the repository resulting after the > following command is run: > > git filter-branch --subdirectory-filter common > > This causes the common directory to become the base directory in this > branch, and rewrites the branch history so that only the changes to the > files in this branch are retained. > > Then these eleven patches are applied to have the new "ding-libs" build > individual tarballs and RPMs. Each patch is very small and > self-contained, so I'm not explaining them individually. >
Updated version of patch 0006 includes missing dependency checks - -- Stephen Gallagher RHCE 804006346421761 Delivering value year after year. Red Hat ranks #1 in value among software vendors. http://www.redhat.com/promo/vendor/ -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.14 (GNU/Linux) Comment: Using GnuPG with Fedora - http://enigmail.mozdev.org/ iEYEARECAAYFAkxsCnYACgkQeiVVYja6o6PvkgCfe86BMAl6dSJstbh31SgUhSXc LR0AoIklNeMf5m+KIbnTymKOKRnXfFlN =g8DN -----END PGP SIGNATURE-----
From e30512271d235f5812d4ca9ab26a9d5c8bbbca79 Mon Sep 17 00:00:00 2001
From: Stephen Gallagher <sgall...@redhat.com>
Date: Tue, 10 Aug 2010 12:08:55 -0400
Subject: [PATCH 06/11] Update ini for new buildsystem
---
ini/Makefile.am | 32 ++++++++++++++++++++++----------
ini/configure.ac | 6 +++++-
ini/m4/libbasicobjects.m4 | 5 +++++
ini/m4/libcollection.m4 | 5 +++++
ini/m4/libpath_utils.m4 | 5 +++++
ini/m4/libref_array.m4 | 5 +++++
ini/trace.h | 1 +
7 files changed, 48 insertions(+), 11 deletions(-)
create mode 100644 ini/m4/libbasicobjects.m4
create mode 100644 ini/m4/libcollection.m4
create mode 100644 ini/m4/libpath_utils.m4
create mode 100644 ini/m4/libref_array.m4
create mode 120000 ini/trace.h
diff --git a/ini/Makefile.am b/ini/Makefile.am
index ee6c6dee07104e8960f36b502ff0b74394375421..6771ade43869ae0464a0b6f33a46769e26e98f58 100644
--- a/ini/Makefile.am
+++ b/ini/Makefile.am
@@ -1,6 +1,15 @@
#debug_fla...@debug_var@
trace_lev...@trace_var@
+collection_cfla...@collection_cflags@
+collection_li...@collection_libs@
+
+path_utils_cfla...@path_utils_cflags@
+path_utils_li...@path_utils_libs@
+
+refarray_cfla...@refarray_cflags@
+refarray_li...@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 eb3e6f2b2ee88352e09f5a51e3ebd121d09b374a..29814a2d3318ef15a72bff78105c40eb7cf6cee4 100644
--- a/ini/configure.ac
+++ b/ini/configure.ac
@@ -1,4 +1,4 @@
-AC_INIT([ini_config],[0.6.0],[sssd-de...@lists.fedorahosted.org])
+AC_INIT([libini_config],[0.6.1],[sssd-de...@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 0000000000000000000000000000000000000000..53208b9b214a97f4d94ec172f8dcd303c0469380
--- /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 0000000000000000000000000000000000000000..b84dce243099f9e712d232dc5ed88800f0d458c5
--- /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 0000000000000000000000000000000000000000..83343abb1799e56bd71a6675f33c84832eac9f46
--- /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 0000000000000000000000000000000000000000..e18102094ca93147c87bbc1935e122308b9087e4
--- /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 0000000000000000000000000000000000000000..6ac9e42155e7a5ff97bd064a5e2bb04385e599bd
--- /dev/null
+++ b/ini/trace.h
@@ -0,0 +1 @@
+../collection/trace.h
\ No newline at end of file
--
1.7.2.1
0006-Update-ini-for-new-buildsystem.patch.sig
Description: PGP signature
_______________________________________________ sssd-devel mailing list sssd-devel@lists.fedorahosted.org https://fedorahosted.org/mailman/listinfo/sssd-devel
