From d2439b92fc87095f0288d9bc1aa5cf2621f0eac3 Mon Sep 17 00:00:00 2001 From: Nikos Mavrogiannopoulos Date: Sat, 15 Dec 2007 13:25:21 +0000 Subject: adopted the official libgnutlsextra m4 --- Makefile.am | 2 +- libgnutls.m4 | 174 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 175 insertions(+), 1 deletion(-) create mode 100644 libgnutls.m4 diff --git a/Makefile.am b/Makefile.am index 205da9d..a19e755 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,7 +1,7 @@ AUTOMAKE_OPTIONS = foreign dist-bzip2 EXTRA_DIST = m4/outoforder.m4 m4/apache.m4 \ - m4/libgnutls.m4 m4/apr_memcache.m4 \ + libgnutls.m4 m4/apr_memcache.m4 \ m4/apache_test.m4 m4/lua.m4 \ include/mod_gnutls.h.in \ README README.ENV NEWS \ diff --git a/libgnutls.m4 b/libgnutls.m4 new file mode 100644 index 0000000..dd86431 --- /dev/null +++ b/libgnutls.m4 @@ -0,0 +1,174 @@ +dnl Autoconf macros for libgnutls-extra +dnl $id$ + +# Modified for LIBGNUTLS_EXTRA -- nmav +# Configure paths for LIBGCRYPT +# Shamelessly stolen from the one of XDELTA by Owen Taylor +# Werner Koch 99-12-09 + +dnl AM_PATH_LIBGNUTLS_EXTRA([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND ]]]) +dnl Test for libgnutls-extra, and define LIBGNUTLS_EXTRA_CFLAGS and LIBGNUTLS_EXTRA_LIBS +dnl +AC_DEFUN([AM_PATH_LIBGNUTLS_EXTRA], +[dnl +dnl Get the cflags and libraries from the libgnutls-extra-config script +dnl +AC_ARG_WITH(libgnutls-extra-prefix, + [ --with-libgnutls-extra-prefix=PFX Prefix where libgnutls-extra is installed (optional)], + libgnutls_extra_config_prefix="$withval", libgnutls_extra_config_prefix="") + + if test x$libgnutls_extra_config_prefix != x ; then + if test x${LIBGNUTLS_EXTRA_CONFIG+set} != xset ; then + LIBGNUTLS_EXTRA_CONFIG=$libgnutls_extra_config_prefix/bin/libgnutls-extra-config + fi + fi + + AC_PATH_PROG(LIBGNUTLS_EXTRA_CONFIG, libgnutls-extra-config, no) + min_libgnutls_version=ifelse([$1], ,0.1.0,$1) + AC_MSG_CHECKING(for libgnutls - version >= $min_libgnutls_version) + no_libgnutls="" + if test "$LIBGNUTLS_EXTRA_CONFIG" = "no" ; then + no_libgnutls=yes + else + LIBGNUTLS_EXTRA_CFLAGS=`$LIBGNUTLS_EXTRA_CONFIG $libgnutls_extra_config_args --cflags` + LIBGNUTLS_EXTRA_LIBS=`$LIBGNUTLS_EXTRA_CONFIG $libgnutls_extra_config_args --libs` + libgnutls_extra_config_version=`$LIBGNUTLS_EXTRA_CONFIG $libgnutls_extra_config_args --version` + + + ac_save_CFLAGS="$CFLAGS" + ac_save_LIBS="$LIBS" + CFLAGS="$CFLAGS $LIBGNUTLS_EXTRA_CFLAGS" + LIBS="$LIBS $LIBGNUTLS_EXTRA_LIBS" +dnl +dnl Now check if the installed libgnutls is sufficiently new. Also sanity +dnl checks the results of libgnutls-extra-config to some extent +dnl + rm -f conf.libgnutlstest + AC_TRY_RUN([ +#include +#include +#include +#include + +int +main () +{ + system ("touch conf.libgnutlstest"); + + if( strcmp( gnutls_extra_check_version(NULL), "$libgnutls_extra_config_version" ) ) + { + printf("\n*** 'libgnutls-extra-config --version' returned %s, but LIBGNUTLS_EXTRA (%s)\n", + "$libgnutls_extra_config_version", gnutls_extra_check_version(NULL) ); + printf("*** was found! If libgnutls-extra-config was correct, then it is best\n"); + printf("*** to remove the old version of LIBGNUTLS_EXTRA. You may also be able to fix the error\n"); + printf("*** by modifying your LD_LIBRARY_PATH enviroment variable, or by editing\n"); + printf("*** /etc/ld.so.conf. Make sure you have run ldconfig if that is\n"); + printf("*** required on your system.\n"); + printf("*** If libgnutls-extra-config was wrong, set the environment variable LIBGNUTLS_EXTRA_CONFIG\n"); + printf("*** to point to the correct copy of libgnutls-extra-config, and remove the file config.cache\n"); + printf("*** before re-running configure\n"); + } + else if ( strcmp(gnutls_extra_check_version(NULL), LIBGNUTLS_EXTRA_VERSION ) ) + { + printf("\n*** LIBGNUTLS_EXTRA header file (version %s) does not match\n", LIBGNUTLS_EXTRA_VERSION); + printf("*** library (version %s). This is may be due to a different version of gnutls\n", gnutls_extra_check_version(NULL) ); + printf("*** and gnutls-extra.\n"); + } + else + { + if ( gnutls_extra_check_version( "$min_libgnutls_version" ) ) + { + return 0; + } + else + { + printf("no\n*** An old version of LIBGNUTLS_EXTRA (%s) was found.\n", + gnutls_extra_check_version(NULL) ); + printf("*** You need a version of LIBGNUTLS_EXTRA newer than %s. The latest version of\n", + "$min_libgnutls_version" ); + printf("*** LIBGNUTLS_EXTRA is always available from ftp://gnutls.hellug.gr/pub/gnutls.\n"); + printf("*** \n"); + printf("*** If you have already installed a sufficiently new version, this error\n"); + printf("*** probably means that the wrong copy of the libgnutls-extra-config shell script is\n"); + printf("*** being found. The easiest way to fix this is to remove the old version\n"); + printf("*** of LIBGNUTLS_EXTRA, but you can also set the LIBGNUTLS_EXTRA_CONFIG environment to point to the\n"); + printf("*** correct copy of libgnutls-extra-config. (In this case, you will have to\n"); + printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n"); + printf("*** so that the correct libraries are found at run-time))\n"); + } + } + return 1; +} +],, no_libgnutls=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"]) + CFLAGS="$ac_save_CFLAGS" + LIBS="$ac_save_LIBS" + fi + + if test "x$no_libgnutls" = x ; then + AC_MSG_RESULT(yes) + ifelse([$2], , :, [$2]) + else + if test -f conf.libgnutlstest ; then + : + else + AC_MSG_RESULT(no) + fi + if test "$LIBGNUTLS_EXTRA_CONFIG" = "no" ; then + echo "*** The libgnutls-extra-config script installed by LIBGNUTLS_EXTRA could not be found" + echo "*** If LIBGNUTLS_EXTRA was installed in PREFIX, make sure PREFIX/bin is in" + echo "*** your path, or set the LIBGNUTLS_EXTRA_CONFIG environment variable to the" + echo "*** full path to libgnutls-extra-config." + else + if test -f conf.libgnutlstest ; then + : + else + echo "*** Could not run libgnutls test program, checking why..." + CFLAGS="$CFLAGS $LIBGNUTLS_EXTRA_CFLAGS" + LIBS="$LIBS $LIBGNUTLS_EXTRA_LIBS" + AC_TRY_LINK([ +#include +#include +#include +#include +], [ return !!gnutls_extra_check_version(NULL); ], + [ echo "*** The test program compiled, but did not run. This usually means" + echo "*** that the run-time linker is not finding LIBGNUTLS_EXTRA or finding the wrong" + echo "*** version of LIBGNUTLS_EXTRA. If it is not finding LIBGNUTLS_EXTRA, you'll need to set your" + echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point" + echo "*** to the installed location Also, make sure you have run ldconfig if that" + echo "*** is required on your system" + echo "***" + echo "*** If you have an old version installed, it is best to remove it, although" + echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH" + echo "***" ], + [ echo "*** The test program failed to compile or link. See the file config.log for the" + echo "*** exact error that occured. This usually means LIBGNUTLS_EXTRA was incorrectly installed" + echo "*** or that you have moved LIBGNUTLS_EXTRA since it was installed. In the latter case, you" + echo "*** may want to edit the libgnutls-extra-config script: $LIBGNUTLS_EXTRA_CONFIG" ]) + CFLAGS="$ac_save_CFLAGS" + LIBS="$ac_save_LIBS" + fi + fi + LIBGNUTLS_EXTRA_CFLAGS="" + LIBGNUTLS_EXTRA_LIBS="" + ifelse([$3], , :, [$3]) + fi + rm -f conf.libgnutlstest + AC_SUBST(LIBGNUTLS_EXTRA_CFLAGS) + AC_SUBST(LIBGNUTLS_EXTRA_LIBS) + + LIBGNUTLS_LIBS=$LIBGNUTLS_EXTRA_LIBS + LIBGNUTLS_CFLAGS=$LIBGNUTLS_EXTRA_CFLAGS + LIBGNUTLS_VERSION=`$LIBGNUTLS_EXTRA_CONFIG $libgnutls_extra_config_args --version` + LIBGNUTLS_PREFIX="`$LIBGNUTLS_EXTRA_CONFIG $libgnutls_extra_config_args --prefix`" + GNUTLS_CERTTOOL="${LIBGNUTLS_PREFIX}/bin/certtool" + + AC_SUBST(LIBGNUTLS_CFLAGS) + AC_SUBST(LIBGNUTLS_LIBS) + AC_SUBST(LIBGNUTLS_VERSION) + AC_SUBST(LIBGNUTLS_PREFIX) + AC_SUBST(LIBGNUTLS_CERTTOOL) + +]) + +dnl *-*wedit:notab*-* Please keep this as the last line. -- cgit