MonetDB: default - PCRE and OpenSSL are required in MonetDB5, so...

[Sjoerd Mullender]

Changeset: f832603344fb for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=f832603344fb
Modified Files:
        MonetDB5/configure.ag
        MonetDB5/src/tools/monet_version.c.in
Branch: default
Log Message:

PCRE and OpenSSL are required in MonetDB5, so don't use conditionals.
Also, add a config.h conditional for libxml2.
This way, mserver5 --version prints information about the libraries again.


diffs (52 lines):

diff -r 29d9c3068b4a -r f832603344fb MonetDB5/configure.ag
--- a/MonetDB5/configure.ag     Wed Nov 24 12:57:23 2010 +0100
+++ b/MonetDB5/configure.ag     Wed Nov 24 14:36:27 2010 +0100
@@ -123,6 +123,7 @@
 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
 AM_CONDITIONAL(HAVE_LIBXML2, test x"$have_libxml2" != xno)
 
diff -r 29d9c3068b4a -r f832603344fb MonetDB5/src/tools/monet_version.c.in
--- a/MonetDB5/src/tools/monet_version.c.in     Wed Nov 24 12:57:23 2010 +0100
+++ b/MonetDB5/src/tools/monet_version.c.in     Wed Nov 24 14:36:27 2010 +0100
@@ -22,12 +22,8 @@
 #include "mal.h"
 #include <stdio.h>
 #include "monet_version.h"
-#ifdef HAVE_LIBPCRE
 #include <pcre.h>
-#endif
-#ifdef HAVE_OPENSSL
 #include <openssl/opensslv.h>
-#endif
 #ifdef HAVE_LIBXML2
 #include <libxml/xmlversion.h>
 #endif
@@ -67,7 +63,6 @@
 #endif
        printf("Configured for prefix: " MONETDB5_PREFIX "\n");
        printf("Libraries:\n");
-#ifdef HAVE_LIBPCRE
        {
                char pcreversion[] = "@pcreversion@";
                printf("  libpcre: %s", pcre_version());
@@ -75,8 +70,6 @@
                        printf(" (%s)", pcreversion);
                printf("\n");
        }
-#endif
-#ifdef HAVE_OPENSSL
        {
                char opensslversion[] = "@opensslversion@";
                printf("  openssl: %s", OPENSSL_VERSION_TEXT);
@@ -84,7 +77,6 @@
                        printf(" (%s)", opensslversion);
                printf("\n");
        }
-#endif
 #ifdef HAVE_LIBXML2
        {
                char libxml2version[] = "@libxml2version@";
_______________________________________________
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list