diff options
| author | Stephen Gallagher <sgallagh@redhat.com> | 2009-05-11 09:59:54 -0400 |
|---|---|---|
| committer | Simo Sorce <ssorce@redhat.com> | 2009-05-14 11:33:51 -0400 |
| commit | 24ad71529edd3ef6cfe7785d6c6e4f51d5cc42db (patch) | |
| tree | b10b473d91a2b942c446eb1fcfdefad1ccc2a59d | |
| parent | e50fd095630c6bc8d575c575e74027d8c9c102ab (diff) | |
| download | sssd-24ad71529edd3ef6cfe7785d6c6e4f51d5cc42db.tar.gz sssd-24ad71529edd3ef6cfe7785d6c6e4f51d5cc42db.tar.bz2 sssd-24ad71529edd3ef6cfe7785d6c6e4f51d5cc42db.zip | |
Update configure rules for LDB and POPT
We need to ensure that configure fails with an error if the popt
development libraries are not present or if ldb module support is
not available.
| -rw-r--r-- | server/external/libldb.m4 | 7 | ||||
| -rw-r--r-- | server/external/libpopt.m4 | 6 |
2 files changed, 9 insertions, 4 deletions
diff --git a/server/external/libldb.m4 b/server/external/libldb.m4 index e0b7d42f..150c7ee0 100644 --- a/server/external/libldb.m4 +++ b/server/external/libldb.m4 @@ -2,6 +2,9 @@ AC_SUBST(LDB_OBJ) AC_SUBST(LDB_CFLAGS) AC_SUBST(LDB_LIBS) -AC_CHECK_HEADER(ldb.h, +PKG_CHECK_MODULES(LDB, ldb >= 0.9.2) + +AC_CHECK_HEADERS(ldb.h ldb_module.h, [AC_CHECK_LIB(ldb, ldb_init, [LDB_LIBS="-lldb"], , -ltevent) ], - [PKG_CHECK_MODULES(LDB, ldb >= 0.9.2)]) + [AC_MSG_ERROR([LDB header files are not installed])] +) diff --git a/server/external/libpopt.m4 b/server/external/libpopt.m4 index c5d12550..e59b2610 100644 --- a/server/external/libpopt.m4 +++ b/server/external/libpopt.m4 @@ -3,5 +3,7 @@ AC_SUBST(POPT_OBJ) AC_SUBST(POPT_LIBS) AC_SUBST(POPT_CFLAGS) -AC_CHECK_HEADERS(popt.h) -AC_CHECK_LIB(popt, poptGetContext, [ POPT_LIBS="-lpopt" ]) +AC_CHECK_HEADERS([popt.h], + [AC_CHECK_LIB(popt, poptGetContext, [ POPT_LIBS="-lpopt" ], [AC_MSG_ERROR([POPT must support poptGetContext])])], + [AC_MSG_ERROR([POPT development libraries not installed])] +) |