From 071853034d2ea01f2ed64d41259f0159e4d6a39c Mon Sep 17 00:00:00 2001 From: Gunnar Beutner Date: Tue, 29 May 2012 16:14:49 +0200 Subject: [PATCH] Pretty-print library detection data. --- configure.ac | 27 +++++++++++++++++++++++++-- 1 file changed, 25 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index 1b3268366..3b748a027 100644 --- a/configure.ac +++ b/configure.ac @@ -78,7 +78,7 @@ AC_COMPILE_IFELSE( ) AC_LANG_POP(C) -AC_CHECK_LIB(sqlite, sqlite3_open) +AC_CHECK_LIB(sqlite3, sqlite3_open) AC_MSG_CHECKING([for SQLite3]) AC_LANG_PUSH(C) @@ -95,6 +95,10 @@ AC_COMPILE_IFELSE( ) AC_LANG_POP(C) +AC_ARG_ENABLE(bundled-sqlite3, + [ --disable-bundled-sqlite3 + disables building the bundled sqlite3 library], + [bundled_sqlite3=$enableval]) AM_CONDITIONAL([USE_BUNDLED_SQLITE3], [test "$bundled_sqlite3" = yes]) if test "$bundled_sqlite3" = yes; then @@ -107,7 +111,7 @@ fi AC_SUBST([SQLITE3_LDFLAGS]) AC_SUBST([SQLITE3_CPPFLAGS]) -AC_OUTPUT([ +AC_CONFIG_FILES([ Makefile compat/Makefile base/Makefile @@ -125,3 +129,22 @@ third-party/cJSON/Makefile third-party/mmatch/Makefile Doxyfile ]) +AC_OUTPUT + +if test "$bundled_sqlite3" = yes; then + sqlite3_msg="bundled" +else + sqlite3_msg="system-provided" +fi + +if ! test -z "$LTDLDEPS"; then + ltdl_msg="bundled" +else + ltdl_msg="system-provided" +fi + +echo " +Libraries: + sqlite3: $sqlite3_msg + ltdl: $ltdl_msg +"