Changeset: b4bc3b0965a8 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=b4bc3b0965a8
Modified Files:
NT/monetdb_config.h.in
monetdb5/mal/Makefile.ag
Branch: Jun2016
Log Message:
We only have the OpenSSL digest functions if we actually have OpenSSL.
diffs (56 lines):
diff --git a/NT/monetdb_config.h.in b/NT/monetdb_config.h.in
--- a/NT/monetdb_config.h.in
+++ b/NT/monetdb_config.h.in
@@ -357,9 +357,6 @@
/* Define to 1 if you have the `mallopt' function. */
/* #undef HAVE_MALLOPT */
-/* Define to 1 if you have the `MD5_Update' function. */
-#define HAVE_MD5_UPDATE 1
-
/* Define to 1 if you have the <memory.h> header file. */
#define HAVE_MEMORY_H 1
@@ -456,9 +453,6 @@
/* Define if the compiler supports the restrict keyword */
/* #undef HAVE_RESTRICT */
-/* Define to 1 if you have the `RIPEMD160_Update' function. */
-#define HAVE_RIPEMD160_UPDATE 1
-
/* Define to 1 if you have the <rlimit.h> header file. */
/* #undef HAVE_RLIMIT_H */
@@ -491,6 +485,13 @@
/* Define to 1 if you have the `setsid' function. */
/* #undef HAVE_SETSID */
+#ifdef HAVE_OPENSSL
+/* Define to 1 if you have the `MD5_Update' function. */
+#define HAVE_MD5_UPDATE 1
+
+/* Define to 1 if you have the `RIPEMD160_Update' function. */
+#define HAVE_RIPEMD160_UPDATE 1
+
/* Define to 1 if you have the `SHA1_Update' function. */
#define HAVE_SHA1_UPDATE 1
@@ -505,6 +506,7 @@
/* Define to 1 if you have the `SHA512_Update' function. */
#define HAVE_SHA512_UPDATE 1
+#endif
/* Define to 1 if you have the `shutdown' function. */
#define HAVE_SHUTDOWN 1
diff --git a/monetdb5/mal/Makefile.ag b/monetdb5/mal/Makefile.ag
--- a/monetdb5/mal/Makefile.ag
+++ b/monetdb5/mal/Makefile.ag
@@ -10,6 +10,7 @@ INCLUDES = ../../common/options \
../../clients/mapilib \
../../gdk \
../optimizer \
+ $(openssl_CFLAGS) \
$(READLINE_INCS)
MTSAFE
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
