Changeset: c9fc655b9415 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=c9fc655b9415
Modified Files:
configure.ag
Branch: embedded
Log Message:
Ignoring OpenSSL in embedded branch. Too many cases to be permissive
diffs (94 lines):
diff --git a/configure.ag b/configure.ag
--- a/configure.ag
+++ b/configure.ag
@@ -2087,46 +2087,51 @@ AC_SUBST(UUID_LIBS)
dnl OpenSSL library
dnl required for MonetDB5 (and SQL), optional otherwise
-PKG_CHECK_MODULES([openssl], [openssl],
- [have_openssl=yes],
- [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])
- ;;
-auto-no)
- enable_monetdb5=no
- if test "x$disable_monetdb5" = x; then
- disable_monetdb5="(OpenSSL library not found but required for
MonetDB5)"
+# in embedded mode, we ship the bison-generated files
+if test "x$enable_embedded" = xno; then
+ PKG_CHECK_MODULES([openssl], [openssl],
+ [have_openssl=yes],
+ [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])
+ ;;
+ auto-no)
+ enable_monetdb5=no
+ if test "x$disable_monetdb5" = x; then
+ disable_monetdb5="(OpenSSL library not found but
required for MonetDB5)"
+ fi
+ ;;
+ *-yes)
+ save_LIBS="$LIBS"
+ LIBS="$LIBS $openssl_LIBS"
+ AC_CHECK_FUNCS([MD5 RIPEMD160 SHA1 SHA224 SHA256 SHA384 SHA512])
+ LIBS="$save_LIBS"
+ if eval test \"x\$ac_cv_func_$MONETDB5_PASSWDHASH\" != x"yes";
then
+ case "$enable_monetdb5" in
+ yes)
+ AC_MSG_ERROR([OpenSSL library found but
checksum algorithm required for MonetDB5 not found])
+ ;;
+ auto)
+ enable_monetdb5=no
+ if test "x$disable_monetdb5" = x; then
+ disable_monetdb5="(OpenSSL library
found but checksum algorithm required for MonetDB5 not found)"
+ fi
+ ;;
+ *)
+ AC_MSG_WARN([OpenSSL library found but required
checksum algorithm not found, so disabling])
+ ;;
+ esac
+ have_openssl=no
+ why_have_openssl="(OpenSSL library found but required
checksum algorithm not found)"
+ fi
+ ;;
+ esac
+ if test x"$have_openssl" = x"yes"; then
+ AC_DEFINE(HAVE_OPENSSL, 1, [Define if you have the OpenSSL
library])
fi
- ;;
-*-yes)
- save_LIBS="$LIBS"
- LIBS="$LIBS $openssl_LIBS"
- AC_CHECK_FUNCS([MD5 RIPEMD160 SHA1 SHA224 SHA256 SHA384 SHA512])
- LIBS="$save_LIBS"
- if eval test \"x\$ac_cv_func_$MONETDB5_PASSWDHASH\" != x"yes"; then
- case "$enable_monetdb5" in
- yes)
- AC_MSG_ERROR([OpenSSL library found but checksum
algorithm required for MonetDB5 not found])
- ;;
- auto)
- enable_monetdb5=no
- if test "x$disable_monetdb5" = x; then
- disable_monetdb5="(OpenSSL library found but
checksum algorithm required for MonetDB5 not found)"
- fi
- ;;
- *)
- AC_MSG_WARN([OpenSSL library found but required
checksum algorithm not found, so disabling])
- ;;
- esac
- have_openssl=no
- why_have_openssl="(OpenSSL library found but required checksum
algorithm not found)"
- fi
- ;;
-esac
-if test x"$have_openssl" = x"yes"; then
- AC_DEFINE(HAVE_OPENSSL, 1, [Define if you have the OpenSSL library])
+else
+ AC_MSG_WARN([Not considering OpenSSL in embedded configuration])
fi
dnl PCRE library
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
