summary |
shortlog |
log |
commit | commitdiff |
tree
raw |
patch |
inline | side by side (from parent 1:
9aae245)
and HAVE_LIBGNUTLS symbols provided by AC_LIB_HAVE_LINKFLAGS instead of
inventing new ones.
By Stepan Kasal.
+2005-08-26 Stepan Kasal <kasal@ucw.cz>
+
+ * configure.in: Abort configure if --with-ssl given but SSL
+ unavailable. Use HAVE_LIBSSL and HAVE_LIBGNUTLS symbols provided
+ by AC_LIB_HAVE_LINKFLAGS instead of inventing new ones.
+
2005-08-11 Hrvoje Niksic <hniksic@xemacs.org>
* configure.in: Check for strtoll and strtoimax.
2005-08-11 Hrvoje Niksic <hniksic@xemacs.org>
* configure.in: Check for strtoll and strtoimax.
if test x"$LIBGNUTLS" != x
then
AC_MSG_NOTICE([compiling in support for SSL via GnuTLS])
if test x"$LIBGNUTLS" != x
then
AC_MSG_NOTICE([compiling in support for SSL via GnuTLS])
- AC_DEFINE([HAVE_GNUTLS], 1,
- [Define if support for the GnuTLS library is being compiled in.])
+ else
+ AC_MSG_ERROR([--with-ssl=gnutls was given, but GNUTLS is not available.])
+elif test x"$with_ssl" != xno; then
dnl As of this writing (OpenSSL 0.9.6), the libcrypto shared library
dnl doesn't record its dependency on libdl, so we need to make sure
dnl -ldl ends up in LIBS on systems that have it. Most OSes use
dnl As of this writing (OpenSSL 0.9.6), the libcrypto shared library
dnl doesn't record its dependency on libdl, so we need to make sure
dnl -ldl ends up in LIBS on systems that have it. Most OSes use
- dnl dlopen(), but HP-UX uses dnl shl_load().
+ dnl dlopen(), but HP-UX uses shl_load().
AC_CHECK_LIB(dl, dlopen, [], [
AC_CHECK_LIB(dl, shl_load)
])
AC_CHECK_LIB(dl, dlopen, [], [
AC_CHECK_LIB(dl, shl_load)
])
if test x"$LIBSSL" != x
then
AC_MSG_NOTICE([compiling in support for SSL via OpenSSL])
if test x"$LIBSSL" != x
then
AC_MSG_NOTICE([compiling in support for SSL via OpenSSL])
- AC_DEFINE([HAVE_OPENSSL], 1,
- [Define if support for the OpenSSL library is being compiled in.])
+ elif x"$with_ssl" != x
+ then
+ AC_MSG_ERROR([--with-ssl was given, but SSL is not available.])
-#if defined HAVE_OPENSSL || defined HAVE_GNUTLS
+/* Is OpenSSL or GNUTLS available? */
+#if defined HAVE_LIBSSL || defined HAVE_LIBGNUTLS