From 49d1a10feeaacf61ed1753ed3d3694cb6a818a36 Mon Sep 17 00:00:00 2001 From: Stephen Gallagher Date: Mon, 11 May 2009 09:59:54 -0400 Subject: [PATCH] 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. --- server/external/libldb.m4 | 7 +++++-- 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 e0b7d42..150c7ee 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 c5d1255..e59b261 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])] +) -- 1.6.2.2