diff options
| author | Stephen Gallagher <sgallagh@redhat.com> | 2010-08-17 12:39:45 -0400 |
|---|---|---|
| committer | Stephen Gallagher <sgallagh@redhat.com> | 2010-08-19 11:15:09 -0400 |
| commit | 551aa6c36797ed720487f5974dcadabf19e6ff9f (patch) | |
| tree | 6f27967514430f4d3975de13ddadd9ab8b536dbd /src/external | |
| parent | ad42d90b7e23978b62e36d6885d5fea0a105d6d0 (diff) | |
| download | sssd-551aa6c36797ed720487f5974dcadabf19e6ff9f.tar.gz sssd-551aa6c36797ed720487f5974dcadabf19e6ff9f.tar.bz2 sssd-551aa6c36797ed720487f5974dcadabf19e6ff9f.zip | |
Rewrite toplevel Makefile
There is no longer a need to have nested Makefiles and configure
scripts. This patch combines the src/ Makefile and configure.ac
into the root.
Diffstat (limited to 'src/external')
| -rw-r--r-- | src/external/libcollection.m4 | 18 | ||||
| -rw-r--r-- | src/external/libdhash.m4 | 18 | ||||
| -rw-r--r-- | src/external/libini_config.m4 | 18 |
3 files changed, 24 insertions, 30 deletions
diff --git a/src/external/libcollection.m4 b/src/external/libcollection.m4 index 8fc37e8c..ae49edf8 100644 --- a/src/external/libcollection.m4 +++ b/src/external/libcollection.m4 @@ -1,12 +1,10 @@ -AC_SUBST(SYSTEM_COLLECTION_OBJ) -AC_SUBST(SYSTEM_COLLECTION_CFLAGS) -AC_SUBST(SYSTEM_COLLECTION_LIBS) +AC_SUBST(COLLECTION_OBJ) +AC_SUBST(COLLECTION_CFLAGS) +AC_SUBST(COLLECTION_LIBS) -PKG_CHECK_MODULES(SYSTEM_COLLECTION, collection >= 0.4.0, - have_system_collection=true, - have_system_collection=false +PKG_CHECK_MODULES(COLLECTION, + collection >= 0.5.1, + , + AC_MSG_ERROR("Please install libcollection-devel") ) -# 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) + diff --git a/src/external/libdhash.m4 b/src/external/libdhash.m4 index e3afdac3..4d5c5d1a 100644 --- a/src/external/libdhash.m4 +++ b/src/external/libdhash.m4 @@ -1,12 +1,10 @@ -AC_SUBST(SYSTEM_DHASH_OBJ) -AC_SUBST(SYSTEM_DHASH_CFLAGS) -AC_SUBST(SYSTEM_DHASH_LIBS) +AC_SUBST(DHASH_OBJ) +AC_SUBST(DHASH_CFLAGS) +AC_SUBST(DHASH_LIBS) -PKG_CHECK_MODULES(SYSTEM_DHASH, dhash >= 0.4.0, - have_system_dhash=true, - have_system_dhash=false +PKG_CHECK_MODULES(DHASH, + dhash >= 0.4.0, + , + AC_MSG_ERROR("Please install libdhash-devel") ) -# This is future-compatible. Right now, we'll force the use of our -# in-tree copy. When dhash is split off as its own source package, we'll -# fix this test -AM_CONDITIONAL(HAVE_SYSTEM_DHASH, test x$have_system_dhash = xtrue_FORCE_IN_TREE) + diff --git a/src/external/libini_config.m4 b/src/external/libini_config.m4 index 20291efa..f41f3191 100644 --- a/src/external/libini_config.m4 +++ b/src/external/libini_config.m4 @@ -1,12 +1,10 @@ -AC_SUBST(SYSTEM_INI_CONFIG_OBJ) -AC_SUBST(SYSTEM_INI_CONFIG_CFLAGS) -AC_SUBST(SYSTEM_INI_CONFIG_LIBS) +AC_SUBST(INI_CONFIG_OBJ) +AC_SUBST(INI_CONFIG_CFLAGS) +AC_SUBST(INI_CONFIG_LIBS) -PKG_CHECK_MODULES(SYSTEM_INI_CONFIG, ini_config >= 0.4.0, - have_system_ini_config=true, - have_system_ini_config=false +PKG_CHECK_MODULES(INI_CONFIG, + ini_config >= 0.6.1, + , + AC_MSG_ERROR("Please install libini_config-devel") ) -# This is future-compatible. Right now, we'll force the use of our -# in-tree copy. When ini_config is split off as its own source package, we'll -# fix this test -AM_CONDITIONAL(HAVE_SYSTEM_INI_CONFIG, test x$have_system_ini_config = xtrue_FORCE_IN_TREE) + |