Changeset: 3ea38c971308 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=3ea38c971308
Modified Files:
configure.ag
Branch: Mar2011
Log Message:
Make configure more verbose.
PKG_CHECK_EXISTS does not print any messages, so if a library wasn't
found using that tests, we wouldn't hear about it. PKG_CHECK_MODULES
by default exits when a package isn't found, but by supplying an
ACTION-IF-FOUND parameter, we control whether or not it exits. And it
*does* print messages about finding or not finding a library.
So we now use PKG_CHECK_MODULES exclusively.
diffs (119 lines):
diff --git a/configure.ag b/configure.ag
--- a/configure.ag
+++ b/configure.ag
@@ -2322,11 +2322,9 @@
dnl OpenSSL library
dnl required for MonetDB5 (and SQL), optional otherwise
-PKG_CHECK_EXISTS([openssl >= 0.9.8f], [have_openssl=yes], [have_openssl=no])
-if test "x$have_openssl" = xyes; then
- PKG_CHECK_MODULES([openssl], [openssl >= 0.9.8f])
- AC_DEFINE(HAVE_OPENSSL, 1, [Define if you have the OpenSSL library])
-fi
+PKG_CHECK_MODULES([openssl], [openssl >= 0.9.8f],
+ [have_openssl=yes; AC_DEFINE(HAVE_OPENSSL, 1, [Define if you have the
OpenSSL library])],
+ [have_openssl=no])
case "$enable_monetdb5-$have_openssl" in
yes-no)
AC_MSG_ERROR([OpenSSL library not found but required for MonetDB5])
@@ -2339,9 +2337,9 @@
dnl PCRE library
dnl required for MonetDB5 (and SQL), optional otherwise
req_pcre_ver='4.5'
-PKG_CHECK_EXISTS([libpcre >= $req_pcre_ver], [have_pcre=yes], [have_pcre=no])
+PKG_CHECK_MODULES([pcre], [libpcre >= $req_pcre_ver],
+ [have_pcre=yes], [have_pcre=no])
if test "x$have_pcre" = xyes; then
- PKG_CHECK_MODULES([pcre], [libpcre >= $req_pcre_ver])
AC_PATH_PROG(PCRETEST,pcretest)
if test "x$PCRETEST" = x; then
AC_MSG_ERROR([could not find pcretest])
@@ -2366,11 +2364,9 @@
esac
-PKG_CHECK_EXISTS([libxml-2.0], [have_libxml2="yes"], [have_libxml2="no"])
-if test x"$have_libxml2" = x"yes" ; then
- PKG_CHECK_MODULES([libxml2], [libxml-2.0])
- AC_DEFINE(HAVE_LIBXML2, 1, [Define if you have the libxml2 library])
-fi
+PKG_CHECK_MODULES([libxml2], [libxml-2.0],
+ [have_libxml2="yes"; AC_DEFINE(HAVE_LIBXML2, 1, [Define if you have the
libxml2 library])],
+ [have_libxml2="no"])
AM_CONDITIONAL(HAVE_LIBXML2, test x"$have_libxml2" != xno)
case "$enable_pathfinder-$have_libxml2" in
yes-no)
@@ -2403,25 +2399,21 @@
have_raptor=no
if test "x$enable_rdf" != xno; then
req_raptor_ver='1.4.16'
- PKG_CHECK_EXISTS([raptor >= $req_raptor_ver], [have_raptor="yes"],
[have_raptor="no"])
# if RDF is explicitly enabled, raptor library is required
- if test x"$have_raptor" = x"yes" -o "x$enable_rdf" = xyes; then
- PKG_CHECK_MODULES([raptor], [raptor >= $req_raptor_ver])
- AC_DEFINE(HAVE_RAPTOR, 1, [Define if you have the raptor
library])
- fi
+ PKG_CHECK_MODULES([raptor], [raptor >= $req_raptor_ver],
+ [have_raptor="yes"],
+ [have_raptor="no"; if test "x$enable_rdf" = xyes; then
AC_MSG_ERROR([raptor library required for RDF support]); fi])
fi
AM_CONDITIONAL(HAVE_RAPTOR, test x"$have_raptor" != xno)
-PKG_CHECK_EXISTS([libcurl], [have_curl="yes"], [have_curl="no"])
+PKG_CHECK_MODULES([curl], [libcurl], [have_curl="yes"], [have_curl="no"])
if test x"$have_curl" = x"yes" ; then
- PKG_CHECK_MODULES([curl], [libcurl])
AC_DEFINE(HAVE_CURL, 1, [Define if you have the cURL library])
AC_SUBST(PKG_CURL, libcurl)
fi
-PKG_CHECK_EXISTS([zlib], [have_zlib="yes"], [have_zlib="no"])
+PKG_CHECK_MODULES([zlib], [zlib], [have_zlib="yes"], [have_zlib="no"])
if test x"$have_zlib" = x"yes" ; then
- PKG_CHECK_MODULES([zlib], [zlib])
AC_DEFINE(HAVE_LIBZ, 1, [Define if you have the z library])
AC_SUBST(PKG_ZLIB, zlib)
fi
@@ -2434,10 +2426,8 @@
have_valgrind=$withval)
if test "x$have_valgrind" != xno; then
PKG_CHECK_MODULES([valgrind], [valgrind],
- [have_valgrind=yes], [if test "x$have_valgrind" = xyes; then
AC_MSG_ERROR([no valgrind support found]); else have_valgrind=no; fi])
- if test "x$have_valgrind" = xyes; then
- AC_DEFINE(HAVE_VALGRIND, 1, [Define if you have valgrind
installed])
- fi
+ [AC_DEFINE(HAVE_VALGRIND, 1, [Define if you have valgrind
installed])],
+ [if test "x$have_valgrind" = xyes; then AC_MSG_ERROR([no
valgrind support found]); fi])
fi
# check for sphinxclient
@@ -2673,11 +2663,9 @@
[search for NetCDF library]),
have_netcdf=$withval)
if test "x$have_netcdf" != xno; then
- PKG_CHECK_EXISTS([netcdf], [have_netcdf=yes], [if test "x$have_netcdf"
= xyes; then AC_MSG_ERROR([no NetCDF library found]); else have_netcdf=no; fi])
- if test "x$have_netcdf" = xyes; then
- PKG_CHECK_MODULES([netcdf], [netcdf])
- AC_DEFINE(HAVE_NETCDF, 1, [Define if you have the netcdf
library])
- fi
+ PKG_CHECK_MODULES([netcdf], [netcdf],
+ [have_netcdf=yes; AC_DEFINE(HAVE_NETCDF, 1, [Define if you have
the netcdf library])],
+ [if test "x$have_netcdf" = xyes; then AC_MSG_ERROR([no NetCDF
library found]); else have_netcdf=no; fi])
fi
AM_CONDITIONAL(HAVE_NETCDF, test x"$have_netcdf" != xno)
@@ -2733,11 +2721,9 @@
AC_SUBST(PCL_CFLAGS)
AC_SUBST(PCL_LIBS)
-PKG_CHECK_EXISTS([cfitsio], [have_cfitsio=yes], [have_cfitsio=no])
-if test "x$have_cfitsio" = xyes; then
- PKG_CHECK_MODULES([cfitsio], [cfitsio])
- AC_DEFINE(HAVE_CFITSIO, 1, [Define if you have the cfitsio library])
-fi
+PKG_CHECK_MODULES([cfitsio], [cfitsio],
+ [have_cfitsio=yes; AC_DEFINE(HAVE_CFITSIO, 1, [Define if you have the
cfitsio library])],
+ [have_cfitsio=no])
AM_CONDITIONAL(HAVE_CFITSIO, test x"$have_cfitsio" != xno)
LIBGC_CFLAGS=
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
