Changeset: 509cc0110c60 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=509cc0110c60
Modified Files:
configure.ag
Branch: Feb2013
Log Message:
configure.ag: produce extended summary at end:
next to enabled/disabled components,
also show enabled/disabled build options
and available (optional) features & extensions ("have_*")
diffs (truncated from 590 to 300 lines):
diff --git a/configure.ag b/configure.ag
--- a/configure.ag
+++ b/configure.ag
@@ -1071,7 +1071,8 @@ AC_PROG_LN_S
AC_CHECK_PROGS(RPMBUILD,rpmbuild rpm)
-have_perl=auto
+org_have_perl=auto
+have_perl=$org_have_perl
PERL=perl
AC_ARG_WITH(perl,
AS_HELP_STRING([--with-perl=FILE], [perl is installed as FILE]),
@@ -1093,6 +1094,7 @@ if test "x$have_perl" != xno; then
AC_MSG_ERROR([No Perl executable found])
fi
have_perl=no
+ why_have_perl="(no Perl executable found)"
fi
fi
fi
@@ -1130,9 +1132,11 @@ AC_SUBST(PERL_LIBDIR)
# check if python2 and python3 exist
# if python2 or python3 doesn't exist, use python if major matches
-have_python2=auto
+org_have_python2=auto
+have_python2=$org_have_python2
PYTHON2=python2
-have_python3=auto
+org_have_python3=auto
+have_python3=$org_have_python3
PYTHON3=python3
AC_ARG_WITH(python2,
@@ -1187,6 +1191,7 @@ if test "x$have_python2" != xno; then
AC_MSG_ERROR([Python 2 executable not found])
else
have_python2=no
+ why_have_python2="(Python 2 executable not
found)"
fi
fi
fi
@@ -1249,6 +1254,7 @@ if test "x$have_python3" != xno; then
AC_MSG_ERROR([Python3 executable not found])
else
have_python3=no
+ why_have_python2="(Python 3 executable not
found)"
fi
fi
fi
@@ -1351,7 +1357,8 @@ esac
AC_SUBST(RUBY_DIR)
RUBYGEM=gem
-have_rubygem=auto
+org_have_rubygem=auto
+have_rubygem=$org_have_rubygem
AC_ARG_WITH(rubygem,
AS_HELP_STRING([--with-rubygem=FILE], [ruby gem is installed as FILE]),
have_rubygem="$withval")
@@ -1372,6 +1379,7 @@ if test "x$have_rubygem" != xno; then
AC_MSG_ERROR([No rubygem executable found])
fi
have_rubygem=no
+ why_have_rubygem="(no rubygem executable found)"
fi
fi
AC_SUBST(RUBYGEM)
@@ -1539,11 +1547,12 @@ JAVA="java"
JAVAC="javac"
JAR="jar"
JAVADOC="javadoc"
+org_have_java=auto
AC_ARG_WITH(java,
AS_HELP_STRING([--with-java=DIR],
[java, javac, jar and javadoc are installed in DIR/bin]),
have_java="$withval",
- have_java=auto)
+ have_java=$org_have_java)
JPATH=$PATH
case $have_java in
yes|no|auto)
@@ -1569,11 +1578,13 @@ if test "x$have_java" != xno; then
AC_MSG_ERROR([No javac found])
fi
have_java=no
+ why_have_java="(no javac found)"
elif test "x$JAR" = "x"; then
- if test "x$have_java" = xyes; then
+ if test "x$have_java" = xyes; then
AC_MSG_ERROR([No jar found])
- fi
- have_java=no
+ fi
+ have_java=no
+ why_have_java="(no jar found)"
else
have_java=yes
fi
@@ -1589,6 +1600,7 @@ if test "x$have_java" != xno; then
fi
if test x"$ANT" = xno; then
have_java="no"
+ why_have_java="(no ant found)"
fi
fi
AC_SUBST(JAVA_VERSION)
@@ -1599,7 +1611,8 @@ AC_SUBST(JAVADOC)
AC_SUBST(CLASSPATH)
AC_SUBST(JAVA_HOME)
-have_java_jdbc=no
+org_have_java_jdbc=no
+have_java_jdbc=$org_have_java_jdbc
case $have_java-$enable_jdbc in
*-no)
;;
@@ -1629,7 +1642,8 @@ no-*)
esac
AM_CONDITIONAL(HAVE_JAVAJDBC,test x$have_java_jdbc != xno)
-have_java_control=no
+org_have_java_control=no
+have_java_control=$org_have_java_control
case $have_java-$enable_control in
*-no)
;;
@@ -1663,12 +1677,16 @@ AM_CONDITIONAL(HAVE_JAVAMEROCONTROL,test
if test x$have_java_jdbc = xno -a x$have_java_control = xno; then
# no point doing anything with Java if all Java packages are disabled
have_java=no
+ if test x$why_have_java = x ; then
+ why_have_java="(have_java_jdbc = no && have_java_control = no)"
+ fi
fi
AM_CONDITIONAL(HAVE_JAVA,test x$have_java != xno)
dnl checks for libraries
dnl check for bz2 (de)compression library
-have_bz2=auto
+org_have_bz2=auto
+have_bz2=$org_have_bz2
BZ_CFLAGS=""
BZ_LIBS=""
AC_ARG_WITH(bz2,
@@ -1693,7 +1711,11 @@ if test "x$have_bz2" != xno; then
AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <stdio.h>
#include <bzlib.h>]], [[(void)BZ2_bzopen("","");]])],
BZ_LIBS="$BZ_LIBS -lbz2",
- [ if test "x$have_bz2" != xauto; then AC_MSG_ERROR([bz2 library
not found]); fi; have_bz2=no ])
+ [ if test "x$have_bz2" != xauto; then
+ AC_MSG_ERROR([bz2 library not found])
+ fi
+ have_bz2=no
+ why_have_bz2="(bz2 library not found)" ])
LIBS="$save_LIBS"
CPPFLAGS="$save_CPPFLAGS"
fi
@@ -1737,7 +1759,8 @@ AC_CHECK_FUNC(mallinfo, AC_TRY_COMPILE([
LIBS="$save_LIBS"
dnl libpthread
-have_pthread=auto
+org_have_pthread=auto
+have_pthread=$org_have_pthread
PTHREAD_LIBS=""
PTHREAD_INCS=""
PTHREAD_EXTRA=""
@@ -1814,6 +1837,7 @@ if test "x$have_pthread" != xno; then
AC_MSG_ERROR([pthread library not
found])
fi
have_pthread=no
+ why_have_pthread="(pthread library not found)"
fi
PTHREAD_LIBS="$LIBS"
;;
@@ -1856,7 +1880,8 @@ AC_SUBST(PTHREAD_LIBS)
AC_SUBST(PTHREAD_INCS)
dnl libreadline
-have_readline=auto
+org_have_readline=auto
+have_readline=$org_have_readline
READLINE_LIBS=""
READLINE_INCS=""
AC_ARG_WITH(readline,
@@ -1888,13 +1913,17 @@ if test "x$have_readline" != xno; then
READLINE_LIBS="$READLINE_LIBS
-lreadline -lncurses",
[ if test "x$have_readline" = xyes; then
AC_MSG_ERROR([readline library
not found])
- fi; have_readline=no ],
+ fi
+ have_readline=no
+ why_have_readline="(readline library
not found)" ],
-lncurses)],
-ltermcap)],
),
[ if test "x$have_readline" = xyes; then
AC_MSG_ERROR([readline header file not found])
- fi; have_readline=no ])
+ fi
+ have_readline=no
+ why_have_readline="(readline header file not found)" ])
fi
if test "x$have_readline" != xno; then
@@ -1906,8 +1935,18 @@ if test "x$have_readline" != xno; then
#include <readline/readline.h>],[
rl_completion_func_t *func = NULL;],
[AC_MSG_RESULT([yes])],
- [ if test "x$have_readline" != xauto; then
AC_MSG_ERROR([readline/readline.h does not contain rl_completion_func_t, is it
GNU readline?]); else AC_MSG_RESULT([no]); fi; have_readline=no ])],
- [ if test "x$have_readline" != xauto; then
AC_MSG_ERROR([readline library does not contain rl_completion_matches]); fi;
have_readline=no ],
+ [ if test "x$have_readline" != xauto; then
+ AC_MSG_ERROR([readline/readline.h does not
contain rl_completion_func_t, is it GNU readline?])
+ else
+ AC_MSG_RESULT([no])
+ fi
+ have_readline=no
+ why_have_readline="(readline/readline.h does not
contain rl_completion_func_t, is it GNU readline?)" ])],
+ [ if test "x$have_readline" != xauto; then
+ AC_MSG_ERROR([readline library does not contain
rl_completion_matches])
+ fi
+ have_readline=no
+ why_have_readline="(readline library does not contain
rl_completion_matches)" ],
$READLINE_LIBS)
fi
CPPFLAGS="$save_CPPFLAGS"
@@ -1947,7 +1986,7 @@ dnl OpenSSL library
dnl required for MonetDB5 (and SQL), optional otherwise
PKG_CHECK_MODULES([openssl], [openssl],
[have_openssl=yes],
- [have_openssl=no])
+ [have_openssl=no; why_have_openssl="(OpenSSL library not found)"])
case "$enable_monetdb5-$have_openssl" in
yes-no)
AC_MSG_ERROR([OpenSSL library not found but required for MonetDB5])
@@ -1979,6 +2018,7 @@ auto-no)
;;
esac
have_openssl=no
+ why_have_openssl="(OpenSSL library found but required checksum
algorithm not found)"
fi
;;
esac
@@ -1990,7 +2030,7 @@ dnl PCRE library
dnl required for MonetDB5 (and SQL), optional otherwise
req_pcre_ver='4.5'
PKG_CHECK_MODULES([pcre], [libpcre >= $req_pcre_ver],
- [have_pcre=yes], [have_pcre=no])
+ [have_pcre=yes], [have_pcre=no; why_have_pcre="(libpcre >=
$req_pcre_ver not found)"])
if test "x$have_pcre" = xyes; then
AC_MSG_CHECKING(whether pcre comes with UTF-8 support)
save_LIBS="$LIBS"
@@ -2001,7 +2041,7 @@ if test "x$have_pcre" = xyes; then
[[#include <pcre.h>]],
[[int rc; pcre_config(PCRE_CONFIG_UTF8, &rc); exit(!rc);]])],
AC_MSG_RESULT([yes]),
- have_pcre=no; AC_MSG_RESULT([no]),
+ have_pcre=no; why_have_pcre="(libpcre found but no UTF-8
support)"; AC_MSG_RESULT([no]),
AC_MSG_RESULT([assuming yes]))
LIBS="$save_LIBS"
CFLAGS="$save_CFLAGS"
@@ -2023,7 +2063,7 @@ auto-no)
esac
-PKG_CHECK_MODULES([libxml2], [libxml-2.0], [have_libxml2="yes"],
[have_libxml2="no"])
+PKG_CHECK_MODULES([libxml2], [libxml-2.0], [have_libxml2="yes"],
[have_libxml2="no"; why_have_libxml2="(libxml2 not found)"])
case "$enable_monetdb5-$have_libxml2" in
yes-no)
AC_MSG_ERROR([libxml2 library not found but required for MonetDB5])
@@ -2037,33 +2077,36 @@ auto-no)
esac
-have_raptor=no
+org_have_raptor=no
+have_raptor=$org_have_raptor
if test "x$enable_rdf" != xno; then
req_raptor_ver='1.4.16'
PKG_CHECK_MODULES([raptor], [raptor],
[AC_DEFINE(HAVE_RAPTOR, 1, [Define if you have raptor
installed])
have_raptor="yes"],
[if test "x$enable_rdf" = xyes; then AC_MSG_ERROR([raptor
library required for RDF support]); fi
- have_raptor="no"; enable_rdf=no; disable_rdf="(raptor library
not found)"])
+ have_raptor="no"; why_have_raptor="(raptor library not found)"
+ enable_rdf=no; disable_rdf="(raptor library not found)"])
fi
AM_CONDITIONAL(HAVE_RAPTOR, test x"$have_raptor" != xno)
AM_CONDITIONAL(ENABLE_DATACELL, test x"$enable_datacell" != xno)
-PKG_CHECK_MODULES([curl], [libcurl], [have_curl="yes"], [have_curl="no"])
+PKG_CHECK_MODULES([curl], [libcurl], [have_curl="yes"], [have_curl="no";
why_have_curl="(libcurl not found)"])
if test x"$have_curl" = x"yes" ; then
AC_DEFINE(HAVE_CURL, 1, [Define if you have the cURL library])
AC_SUBST(PKG_CURL, libcurl)
fi
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list
