|
Line
Link Here
|
| 0 |
-- macros/neon.m4 |
0 |
++ macros/neon.m4 |
|
Lines 937-963
Link Here
|
| 937 |
NEON_EXTRAOBJS="$NEON_EXTRAOBJS ne_openssl" |
937 |
NEON_EXTRAOBJS="$NEON_EXTRAOBJS ne_openssl" |
| 938 |
;; |
938 |
;; |
| 939 |
gnutls) |
939 |
gnutls) |
| 940 |
AC_PATH_PROG(GNUTLS_CONFIG, libgnutls-config, no) |
940 |
NE_PKG_CONFIG(NE_SSL, gnutls, |
|
|
941 |
[AC_MSG_NOTICE(using GnuTLS configuration from pkg-config) |
| 942 |
CPPFLAGS="$CPPFLAGS ${NE_SSL_CFLAGS}" |
| 943 |
NEON_LIBS="$NEON_LIBS ${NE_SSL_LIBS}" |
| 941 |
|
944 |
|
| 942 |
if test "$GNUTLS_CONFIG" = "no"; then |
945 |
ne_gnutls_ver=`$PKG_CONFIG --modversion gnutls` |
| 943 |
AC_MSG_ERROR([could not find libgnutls-config in \$PATH]) |
946 |
], [ |
| 944 |
fi |
947 |
# Fall back on libgnutls-config script |
|
|
948 |
AC_PATH_PROG(GNUTLS_CONFIG, libgnutls-config, no) |
| 945 |
|
949 |
|
| 946 |
ne_gnutls_ver=`$GNUTLS_CONFIG --version` |
950 |
if test "$GNUTLS_CONFIG" = "no"; then |
|
|
951 |
AC_MSG_ERROR([could not find libgnutls-config in \$PATH]) |
| 952 |
fi |
| 953 |
|
| 954 |
CPPFLAGS="$CPPFLAGS `$GNUTLS_CONFIG --cflags`" |
| 955 |
NEON_LIBS="$NEON_LIBS `$GNUTLS_CONFIG --libs`" |
| 956 |
|
| 957 |
ne_gnutls_ver=`$GNUTLS_CONFIG --version` |
| 958 |
]) |
| 959 |
|
| 947 |
case $ne_gnutls_ver in |
960 |
case $ne_gnutls_ver in |
| 948 |
1.0.?|1.0.1?|1.0.20|1.0.21) |
961 |
1.0.?|1.0.1?|1.0.20|1.0.21) |
| 949 |
AC_MSG_ERROR([GNU TLS version $ne_gnutls_ver is too old -- 1.0.22 or later required]) |
962 |
AC_MSG_ERROR([GNU TLS version $ne_gnutls_ver is too old -- 1.0.22 or later required]) |
| 950 |
;; |
963 |
;; |
| 951 |
esac |
964 |
esac |
| 952 |
|
965 |
|
| 953 |
CPPFLAGS="$CPPFLAGS `$GNUTLS_CONFIG --cflags`" |
|
|
| 954 |
|
| 955 |
AC_CHECK_HEADER([gnutls/gnutls.h],, |
966 |
AC_CHECK_HEADER([gnutls/gnutls.h],, |
| 956 |
[AC_MSG_ERROR([could not find gnutls/gnutls.h in include path])]) |
967 |
[AC_MSG_ERROR([could not find gnutls/gnutls.h in include path])]) |
| 957 |
|
968 |
|
| 958 |
NE_ENABLE_SUPPORT(SSL, [SSL support enabled, using GnuTLS $ne_gnutls_ver]) |
969 |
NE_ENABLE_SUPPORT(SSL, [SSL support enabled, using GnuTLS $ne_gnutls_ver]) |
| 959 |
NEON_EXTRAOBJS="$NEON_EXTRAOBJS ne_gnutls" |
970 |
NEON_EXTRAOBJS="$NEON_EXTRAOBJS ne_gnutls" |
| 960 |
NEON_LIBS="$NEON_LIBS `$GNUTLS_CONFIG --libs`" |
|
|
| 961 |
AC_DEFINE([HAVE_GNUTLS], 1, [Define if GnuTLS support is enabled]) |
971 |
AC_DEFINE([HAVE_GNUTLS], 1, [Define if GnuTLS support is enabled]) |
| 962 |
|
972 |
|
| 963 |
# Check for functions in later releases |
973 |
# Check for functions in later releases |
