Changeset 9d9b093 in mod_gnutls for configure.ac

Timestamp:

Jan 11, 2013, 12:56:51 AM (8 years ago)

Author:

Daniel Kahn Gillmor <dkg@…>

Branches:

debian/master, debian/stretch-backports, jessie-backports, upstream

Children:

2dd044f, 8ce897a

Parents:

8df5b25

Message:

Imported Upstream version 0.5.1

File:

• configure.ac (modified) (4 diffs)

configure.ac

@@ -1 +1 @@
 dnl 
-AC_INIT(mod_gnutls, 0.4.3)
+AC_INIT(mod_gnutls, 0.5.1)
 OOO_CONFIG_NICE(config.nice)
 MOD_GNUTLS_VERSION=AC_PACKAGE_VERSION
@@ -30 +30 @@
 
 MIN_TLS_VERSION=2.2.1
-AM_PATH_LIBGNUTLS($MIN_TLS_VERSION,,
+AM_PATH_LIBGNUTLS_EXTRA($MIN_TLS_VERSION,,
         AC_MSG_ERROR([[
 ***  
-*** libgnutls were not found. You may want to get it from
+*** libgnutls and libgnutls-extra were not found. You may want to get it from
 *** http://www.gnutls.org/
 ***
 ]]))
-
-dnl CHECK_LUA()
-
-have_apr_memcache=0
-CHECK_APR_MEMCACHE([have_apr_memcache=1], [have_apr_memcache=0])
-AC_SUBST(have_apr_memcache)
 
 AC_ARG_ENABLE(srp,
@@ -51 +45 @@
 SRP_CFLAGS=""
 if test "$use_srp" != "no"; then
-        SRP_CFLAGS="-DENABLE_SRP=1"
+        SRP_CFLAGS="-DENABLE_SRP=1"
 fi
 AC_MSG_CHECKING([whether to enable SRP functionality])
 AC_MSG_RESULT($use_srp)
 
-MODULE_CFLAGS="${LIBGNUTLS_CFLAGS} ${SRP_CFLAGS} ${APR_MEMCACHE_CFLAGS} ${APXS_CFLAGS} ${AP_INCLUDES} ${APR_INCLUDES} ${APU_INCLUDES}"
-MODULE_LIBS="${APR_MEMCACHE_LIBS} ${LIBGNUTLS_LIBS}"
+dnl CHECK_LUA()
+
+have_apr_memcache=0
+CHECK_APR_MEMCACHE([have_apr_memcache=1], [have_apr_memcache=0])
+AC_SUBST(have_apr_memcache)
+
+MODULE_CFLAGS="${LIBGNUTLS_EXTRA_CFLAGS} ${SRP_CFLAGS} ${APR_MEMCACHE_CFLAGS} ${APXS_CFLAGS} ${AP_INCLUDES} ${APR_INCLUDES} ${APU_INCLUDES}"
+MODULE_LIBS="${APR_MEMCACHE_LIBS} ${LIBGNUTLS_EXTRA_LIBS}"
 
 AC_SUBST(MODULE_CFLAGS)
@@ -68 +68 @@
 echo "Configuration summary for mod_gnutls:"
 echo ""
-echo "   * mod_gnutls version:          ${MOD_GNUTLS_VERSION}"
-echo "   * Apache Modules directory:    ${AP_LIBEXECDIR}"
-echo "   * GnuTLS Library version:      ${LIBGNUTLS_VERSION}"
-echo "   * SRP authentication:          ${use_srp}"
+echo "   * mod_gnutls version:  ${MOD_GNUTLS_VERSION}"
+echo "   * Apache Modules directory:    ${AP_LIBEXECDIR}"
+echo "   * GnuTLS Library version:      ${LIBGNUTLS_VERSION}"
+echo "   * SRP Authentication:          ${use_srp}"
 echo ""
 echo "---"