Changeset: e528a0ba0c97 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=e528a0ba0c97
Modified Files:
Branch: sciql
Log Message:
Merge with default branch.
diffs (52 lines):
diff --git a/clients/mapilib/monetdb-mapi.pc.in
b/clients/mapilib/monetdb-mapi.pc.in
--- a/clients/mapilib/monetdb-mapi.pc.in
+++ b/clients/mapilib/monetdb-mapi.pc.in
@@ -6,6 +6,7 @@
Name: monetdb-mapi
Description: MonetDB MAPI C-client libary
Version: @PACKAGE_VERSION@
+Requires: monetdb-stream openssl
-Libs: -L${libdir} -lmapi
+Libs: -L${libdir} -lmapi @SOCKET_LIBS@
Cflags: -I${includedir}/monetdb
diff --git a/common/stream/monetdb-stream.pc.in
b/common/stream/monetdb-stream.pc.in
--- a/common/stream/monetdb-stream.pc.in
+++ b/common/stream/monetdb-stream.pc.in
@@ -8,5 +8,5 @@
Version: @PACKAGE_VERSION@
Requires: @PKG_CURL@ @PKG_ZLIB@
-Libs: -L${libdir} -lstream
+Libs: -L${libdir} -lstream @SOCKET_LIBS@
Cflags: -I${includedir}/monetdb
diff --git a/configure.ag b/configure.ag
--- a/configure.ag
+++ b/configure.ag
@@ -2181,7 +2181,7 @@
[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"])
+ have_raptor="no"; enable_rdf=no; disable_rdf="(raptor library
not found)"])
fi
AM_CONDITIONAL(HAVE_RAPTOR, test x"$have_raptor" != xno)
@@ -2422,7 +2422,8 @@
if test "x$enable_fits" != xno; then
PKG_CHECK_MODULES([cfitsio], [cfitsio],
[have_cfitsio=yes; AC_DEFINE(HAVE_CFITSIO, 1, [Define if you
have the cfitsio library])],
- [have_cfitsio=no; if test "x$enable_fits" = xyes; then
AC_MSG_ERROR([cfitsio library required for FITS support]); fi])
+ [have_cfitsio=no; if test "x$enable_fits" = xyes; then
AC_MSG_ERROR([cfitsio library required for FITS support]); fi;
+ enable_fits=no; disable_fits="(cfitsio library not found)"])
fi
AM_CONDITIONAL(HAVE_CFITSIO, test x"$have_cfitsio" != xno)
@@ -3163,7 +3164,6 @@
echo
echo "* Enabled/disabled components:"
for comp in \
- common \
gdk \
monetdb5 \
sql \
_______________________________________________
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list
