summaryrefslogtreecommitdiffabout
path: root/configure.ac
Side-by-side diff
Diffstat (limited to 'configure.ac') (more/less context) (ignore whitespace changes)
-rw-r--r--configure.ac66
1 files changed, 50 insertions, 16 deletions
diff --git a/configure.ac b/configure.ac
index 40e76cf..f6091d9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,7 +1,7 @@
dnl configure.ac -*- autoconf-*-
dnl
dnl This file is part of GNU Anubis.
-dnl Copyright (C) 2001-2014 The Anubis Team.
+dnl Copyright (C) 2001-2020 The Anubis Team.
dnl
dnl GNU Anubis is free software; you can redistribute it and/or modify it
dnl under the terms of the GNU General Public License as published by the
@@ -18,7 +18,7 @@ dnl with GNU Anubis. If not, see <http://www.gnu.org/licenses/>.
dnl
dnl Process this file with autoconf to produce a configure script.
-AC_INIT([GNU Anubis], [4.1.92], [bug-anubis@gnu.org])
+AC_INIT([GNU Anubis], [4.2.90], [bug-anubis@gnu.org])
AC_PREREQ([2.63])
AC_CONFIG_HEADERS([config.h])
AC_CONFIG_AUX_DIR([build])
@@ -39,6 +39,42 @@ $PATH:/sbin:/usr/sbin:/usr/local/sbin)
AC_DEFINE_UNQUOTED(IDECRYPT_PATH,"${idecrypt_path}",
[Define if IDECRYPT_PATH is present.])
+# *********************************************************************
+# GPG v2 (for the testsuite)
+# The testsuite needs to create GPG keys, which would be prohibitively
+# slow without the %transient-key statement, which appeared in GPG 2.1
+# *********************************************************************
+AC_ARG_VAR([GPG],[Name of the gpg version 2 binary])
+AC_MSG_CHECKING([for the GPG v2 binary])
+uGPG=$GPG
+unset GPG
+gpgver() {
+ GPG_VERSION_STRING=$($1 --version|head -n 1|sed -e 's/.* //')
+ oIFS=$IFS
+ IFS="."
+ set -- $GPG_VERSION_STRING
+ GPG_VERSION_MAJOR=$1
+ GPG_VERSION_MINOR=$2
+ IFS=$oIFS
+}
+for prog in $uGPG gpg2 gpg
+do
+ gpgver $prog
+ if test -n "$GPG_VERSION_MAJOR" -a -n "$GPG_VERSION_MINOR"; then
+ if test $GPG_VERSION_MAJOR -eq 2; then
+ if test $GPG_VERSION_MINOR -ge 1; then
+ GPG=$prog
+ break
+ fi
+ elif test $GPG_VERSION_MAJOR -gt 2; then
+ GPG=$prog
+ break
+ fi
+ fi
+done
+AC_MSG_RESULT([${GPG:-none}${GPG:+, $GPG_VERSION_STRING}])
+AM_CONDITIONAL([COND_GPG2],[test -n "$GPG"])
+
dnl Checks for header files.
AC_HEADER_STDC
AC_TYPE_SIZE_T
@@ -90,21 +126,19 @@ dnl Internationalization macros.
AM_GNU_GETTEXT([external], [need-formatstring-macros])
AM_GNU_GETTEXT_VERSION([0.16])
-AC_SUBST([M4_DEFS])
AC_SUBST([GUILE_SCRIPTS])
-GINT_INIT([gint],[1.8 with-guile nodoc std-site-dir],
+GINT_INIT([gint],[2.2.0 with-guile nodoc std-site-dir],
[useguile=yes
AC_DEFINE(WITH_GUILE,1,[Enable Guile support])
- GUILE_SCRIPTS='$(GUILE_SCM)'
- M4_DEFS="$M4_DEFS -DWITH_GUILE"],
+ GUILE_SCRIPTS='$(GUILE_SCM)'],
[useguile=no])
if test "$useguile" = "no"; then
AC_MSG_RESULT([Disabling GUILE support...])
fi
+AM_CONDITIONAL([GUILE_COND], [test "$useguile" = "yes"])
dnl Use option --without-gpgme to NOT compile GnuPG (GPGME library) support.
-AC_SUBST(ANUBIS_GPGFILES)
AC_ARG_WITH(gpgme,
AC_HELP_STRING([--without-gpgme],
[without GnuPG (GPGME library) support]),
@@ -120,7 +154,6 @@ fi
if test "$with_gpgme" = "no"; then
AC_MSG_RESULT([Disabling GPGME support...])
else
- AC_PATH_PROG(GPG, gpg)
findgpgmedir() { :
if test -f "$1/include/gpgme.h"; then
gpgmedir=1
@@ -139,9 +172,8 @@ else
else
AC_CHECK_HEADERS(gpgme.h)
fi
- ANUBIS_GPGFILES='$(GPGFILES)'
- M4_DEFS="$M4_DEFS -DWITH_GPG"
fi
+AM_CONDITIONAL([GPG_COND],[test "$with_gpgme" = "yes"])
AC_SUBST(GSASL_LIBS)
AC_CHECK_LIB(resolv, res_query)
@@ -177,7 +209,6 @@ MU_CHECK_GSASL(0.2.3, [
AC_MSG_RESULT([Enabling GSASL support...])
ANUBIS_SBIN_ADM='$(adm_sbin_programs)'
ANUBIS_BIN_ADM='$(adm_bin_programs)'
- M4_DEFS="$M4_DEFS -DWITH_GSASL"
AC_CHECK_LIB(gdbm, gdbm_open,
[WITH_GDBM=yes
@@ -246,11 +277,13 @@ MU_CHECK_GSASL(0.2.3, [
fi
AC_LIBOBJ(lbuf)])
+AM_CONDITIONAL([GSASL_COND],[test "$WITH_GSASL" = yes])
+AM_CONDITIONAL([GDBM_COND],[test "$WITH_GDBM" = yes])
ANUBIS_CHECK_TLS([
- M4_DEFS="$M4_DEFS -DWITH_SSL -DWITH_GNUTLS"
AC_DEFINE(USE_GNUTLS, 1, [Define to 1 if USE_GNUTLS is requested.])])
AM_CONDITIONAL([TLS_COND], [test $anubis_cv_gnutls = yes])
+AC_PATH_PROG([CERTTOOL],[certtool])
dnl Use option --with-socks-proxy to compile SOCKS v4/5 proxy support.
AC_ARG_WITH(socks-proxy,
@@ -366,7 +399,6 @@ with_unprivileged_user=$with_unprivileged_user])
AC_CONFIG_FILES([Makefile
build/Makefile
- build/guile-1.6/Makefile
contrib/Makefile
gint/Makefile
doc/Makefile
@@ -378,9 +410,11 @@ AC_CONFIG_FILES([Makefile
po/Makefile.in
scripts/Makefile
src/Makefile
- testsuite/Makefile
- testsuite/data/Makefile
- testsuite/etc/Makefile
])
+# Initialize the test suite.
+AC_CONFIG_TESTDIR(tests)
+AC_CONFIG_FILES([tests/Makefile tests/atlocal])
+AM_MISSING_PROG([AUTOM4TE], [autom4te])
+
AC_OUTPUT

Return to:

Send suggestions and report system problems to the System administrator.