Matthew Farrellee wrote:
For each place that configure could "exit 1" it now AC_MSG_ERROR's
with a useful message.

Signed-off-by: Matthew Farrellee <[email protected]>
---
 configure.ac |   12 ++++++++----
 1 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/configure.ac b/configure.ac
index d3cf560..d2efdd2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -80,8 +80,10 @@ AC_CHECK_LIB(db-4.7, db_create, DB4_LIBS=-ldb-4.7,
        AC_CHECK_LIB(db-4.6, db_create, DB4_LIBS=-ldb-4.6,
        AC_CHECK_LIB(db-4.5, db_create, DB4_LIBS=-ldb-4.5,
        AC_CHECK_LIB(db-4.4, db_create, DB4_LIBS=-ldb-4.4,
-       AC_CHECK_LIB(db-4.3, db_create, DB4_LIBS=-ldb-4.3, exit 1)))))
-AC_CHECK_LIB(event, event_base_new, EVENT_LIBS=-levent, exit 1)
+       AC_CHECK_LIB(db-4.3, db_create, DB4_LIBS=-ldb-4.3,
+  [AC_MSG_ERROR([Missing required libdb 4.x])])))))
+AC_CHECK_LIB(event, event_base_new, EVENT_LIBS=-levent,
+  [AC_MSG_ERROR([Missing required libevent])])
 AC_CHECK_LIB(argp, argp_parse, ARGP_LIBS=-largp)
 PKG_CHECK_MODULES(CHUNKDC, libchunkdc)
 PKG_CHECK_MODULES(CLDC, libcldc)
@@ -99,8 +101,10 @@ dnl autoconf output generation
 dnl --------------------------
AM_PATH_GLIB_2_0(2.0.0)
-AM_PATH_XML2(2.6.0, , exit 1)
-LIBCURL_CHECK_CONFIG(, 7.10.1, , exit 1)
+AM_PATH_XML2(2.6.0, ,
+  [AC_MSG_ERROR([Missing required XML2 >= 2.6.0])]])
+LIBCURL_CHECK_CONFIG(, 7.10.1, ,
+  [AC_MSG_ERROR([Missing required libcurl >= 7.10.1])])

Not applied. This fails to build, at the "./autogen.sh && ./configure" stage on Fedora 10:

[...]
checking pkg-config is at least version 0.9.0... yes
checking for pcre_compile in -lpcre... yes
checking for MD5_Init in -lcrypto... yes
checking for SSL_new in -lssl... yes
checking for db_create in -ldb-4.7... yes
checking for event_base_new in -levent... yes
checking for argp_parse in -largp... no
checking for CHUNKDC... yes
checking for CLDC... yes
checking for pkg-config... (cached) /usr/bin/pkg-config
checking pkg-config is at least version 0.16... yes
checking for GLIB - version >= 2.0.0... yes (version 2.18.4)
checking for xml2-config... /usr/bin/xml2-config
checking for libxml - version >= 2.6.0... ./configure: line 21878: syntax error near unexpected token `fi'
./configure: line 21878: `  fi'

--
To unsubscribe from this list: send the line "unsubscribe hail-devel" in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to