Changeset 9d9b093 in mod_gnutls for configure


Ignore:
Timestamp:
Jan 11, 2013, 12:56:51 AM (10 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:
1 edited

Legend:

Unmodified
Added
Removed

  • configure

    r8df5b25 r9d9b093  
    11#! /bin/sh
    22# Guess values for system-dependent variables and create Makefiles.
    3 # Generated by GNU Autoconf 2.61 for mod_gnutls 0.4.3.
     3# Generated by GNU Autoconf 2.61 for mod_gnutls 0.5.1.
    44#
    55# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
    … …  
    727727PACKAGE_NAME='mod_gnutls'
    728728PACKAGE_TARNAME='mod_gnutls'
    729 PACKAGE_VERSION='0.4.3'
    730 PACKAGE_STRING='mod_gnutls 0.4.3'
     729PACKAGE_VERSION='0.5.1'
     730PACKAGE_STRING='mod_gnutls 0.5.1'
    731731PACKAGE_BUGREPORT=''
    732732
    … …  
    903903APXS_EXTENSION
    904904APXS_CFLAGS
    905 LIBGNUTLS_CONFIG
     905LIBGNUTLS_EXTRA_CONFIG
     906LIBGNUTLS_EXTRA_CFLAGS
     907LIBGNUTLS_EXTRA_LIBS
    906908LIBGNUTLS_CFLAGS
    907909LIBGNUTLS_LIBS
    … …  
    14341436  # This message is too long to be a string in the A/UX 3.1 sh.
    14351437  cat <<_ACEOF
    1436 \`configure' configures mod_gnutls 0.4.3 to adapt to many kinds of systems.
     1438\`configure' configures mod_gnutls 0.5.1 to adapt to many kinds of systems.
    14371439
    14381440Usage: $0 [OPTION]... [VAR=VALUE]...
    … …  
    15051507if test -n "$ac_init_help"; then
    15061508  case $ac_init_help in
    1507      short | recursive ) echo "Configuration of mod_gnutls 0.4.3:";;
     1509     short | recursive ) echo "Configuration of mod_gnutls 0.5.1:";;
    15081510   esac
    15091511  cat <<\_ACEOF
    … …  
    15341536  --with-tags[=TAGS]      include additional configurations [automatic]
    15351537  --with-apxs=PATH        Path to apxs
    1536   --with-libgnutls-prefix=PFX   Prefix where libgnutls is installed (optional)
     1538  --with-libgnutls-extra-prefix=PFX   Prefix where libgnutls-extra is installed (optional)
    15371539  --with-apr-memcache-prefix=PATH
    15381540                          Install prefix for apr_memcache
    … …  
    16201622if $ac_init_version; then
    16211623  cat <<\_ACEOF
    1622 mod_gnutls configure 0.4.3
     1624mod_gnutls configure 0.5.1
    16231625generated by GNU Autoconf 2.61
    16241626
    … …  
    16341636running configure, to aid debugging if configure makes a mistake.
    16351637
    1636 It was created by mod_gnutls $as_me 0.4.3, which was
     1638It was created by mod_gnutls $as_me 0.5.1, which was
    16371639generated by GNU Autoconf 2.61.  Invocation command line was
    16381640
    … …  
    20052007  chmod +x config.nice
    20062008
    2007 MOD_GNUTLS_VERSION=0.4.3
     2009MOD_GNUTLS_VERSION=0.5.1
    20082010
    20092011
    … …  
    25062508# Define the identity of the package.
    25072509 PACKAGE=mod_gnutls
    2508  VERSION=0.4.3
     2510 VERSION=0.5.1
    25092511
    25102512
    … …  
    45514553*-*-irix6*)
    45524554  # Find out which ABI we are using.
    4553   echo '#line 4553 "configure"' > conftest.$ac_ext
     4555  echo '#line 4555 "configure"' > conftest.$ac_ext
    45544556  if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
    45554557  (eval $ac_compile) 2>&5
    … …  
    72887290   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    72897291   -e 's:$: $lt_compiler_flag:'`
    7290    (eval echo "\"\$as_me:7290: $lt_compile\"" >&5)
     7292   (eval echo "\"\$as_me:7292: $lt_compile\"" >&5)
    72917293   (eval "$lt_compile" 2>conftest.err)
    72927294   ac_status=$?
    72937295   cat conftest.err >&5
    7294    echo "$as_me:7294: \$? = $ac_status" >&5
     7296   echo "$as_me:7296: \$? = $ac_status" >&5
    72957297   if (exit $ac_status) && test -s "$ac_outfile"; then
    72967298     # The compiler can only warn and ignore the option if not recognized
    … …  
    75787580   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    75797581   -e 's:$: $lt_compiler_flag:'`
    7580    (eval echo "\"\$as_me:7580: $lt_compile\"" >&5)
     7582   (eval echo "\"\$as_me:7582: $lt_compile\"" >&5)
    75817583   (eval "$lt_compile" 2>conftest.err)
    75827584   ac_status=$?
    75837585   cat conftest.err >&5
    7584    echo "$as_me:7584: \$? = $ac_status" >&5
     7586   echo "$as_me:7586: \$? = $ac_status" >&5
    75857587   if (exit $ac_status) && test -s "$ac_outfile"; then
    75867588     # The compiler can only warn and ignore the option if not recognized
    … …  
    76827684   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    76837685   -e 's:$: $lt_compiler_flag:'`
    7684    (eval echo "\"\$as_me:7684: $lt_compile\"" >&5)
     7686   (eval echo "\"\$as_me:7686: $lt_compile\"" >&5)
    76857687   (eval "$lt_compile" 2>out/conftest.err)
    76867688   ac_status=$?
    76877689   cat out/conftest.err >&5
    7688    echo "$as_me:7688: \$? = $ac_status" >&5
     7690   echo "$as_me:7690: \$? = $ac_status" >&5
    76897691   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    76907692   then
    … …  
    1004410046  lt_status=$lt_dlunknown
    1004510047  cat > conftest.$ac_ext <<EOF
    10046 #line 10046 "configure"
     10048#line 10048 "configure"
    1004710049#include "confdefs.h"
    1004810050
    … …  
    1014410146  lt_status=$lt_dlunknown
    1014510147  cat > conftest.$ac_ext <<EOF
    10146 #line 10146 "configure"
     10148#line 10148 "configure"
    1014710149#include "confdefs.h"
    1014810150
    … …  
    1256412566   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1256512567   -e 's:$: $lt_compiler_flag:'`
    12566    (eval echo "\"\$as_me:12566: $lt_compile\"" >&5)
     12568   (eval echo "\"\$as_me:12568: $lt_compile\"" >&5)
    1256712569   (eval "$lt_compile" 2>conftest.err)
    1256812570   ac_status=$?
    1256912571   cat conftest.err >&5
    12570    echo "$as_me:12570: \$? = $ac_status" >&5
     12572   echo "$as_me:12572: \$? = $ac_status" >&5
    1257112573   if (exit $ac_status) && test -s "$ac_outfile"; then
    1257212574     # The compiler can only warn and ignore the option if not recognized
    … …  
    1266812670   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1266912671   -e 's:$: $lt_compiler_flag:'`
    12670    (eval echo "\"\$as_me:12670: $lt_compile\"" >&5)
     12672   (eval echo "\"\$as_me:12672: $lt_compile\"" >&5)
    1267112673   (eval "$lt_compile" 2>out/conftest.err)
    1267212674   ac_status=$?
    1267312675   cat out/conftest.err >&5
    12674    echo "$as_me:12674: \$? = $ac_status" >&5
     12676   echo "$as_me:12676: \$? = $ac_status" >&5
    1267512677   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    1267612678   then
    … …  
    1424514247   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1424614248   -e 's:$: $lt_compiler_flag:'`
    14247    (eval echo "\"\$as_me:14247: $lt_compile\"" >&5)
     14249   (eval echo "\"\$as_me:14249: $lt_compile\"" >&5)
    1424814250   (eval "$lt_compile" 2>conftest.err)
    1424914251   ac_status=$?
    1425014252   cat conftest.err >&5
    14251    echo "$as_me:14251: \$? = $ac_status" >&5
     14253   echo "$as_me:14253: \$? = $ac_status" >&5
    1425214254   if (exit $ac_status) && test -s "$ac_outfile"; then
    1425314255     # The compiler can only warn and ignore the option if not recognized
    … …  
    1434914351   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1435014352   -e 's:$: $lt_compiler_flag:'`
    14351    (eval echo "\"\$as_me:14351: $lt_compile\"" >&5)
     14353   (eval echo "\"\$as_me:14353: $lt_compile\"" >&5)
    1435214354   (eval "$lt_compile" 2>out/conftest.err)
    1435314355   ac_status=$?
    1435414356   cat out/conftest.err >&5
    14355    echo "$as_me:14355: \$? = $ac_status" >&5
     14357   echo "$as_me:14357: \$? = $ac_status" >&5
    1435614358   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    1435714359   then
    … …  
    1654916551   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1655016552   -e 's:$: $lt_compiler_flag:'`
    16551    (eval echo "\"\$as_me:16551: $lt_compile\"" >&5)
     16553   (eval echo "\"\$as_me:16553: $lt_compile\"" >&5)
    1655216554   (eval "$lt_compile" 2>conftest.err)
    1655316555   ac_status=$?
    1655416556   cat conftest.err >&5
    16555    echo "$as_me:16555: \$? = $ac_status" >&5
     16557   echo "$as_me:16557: \$? = $ac_status" >&5
    1655616558   if (exit $ac_status) && test -s "$ac_outfile"; then
    1655716559     # The compiler can only warn and ignore the option if not recognized
    … …  
    1683916841   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1684016842   -e 's:$: $lt_compiler_flag:'`
    16841    (eval echo "\"\$as_me:16841: $lt_compile\"" >&5)
     16843   (eval echo "\"\$as_me:16843: $lt_compile\"" >&5)
    1684216844   (eval "$lt_compile" 2>conftest.err)
    1684316845   ac_status=$?
    1684416846   cat conftest.err >&5
    16845    echo "$as_me:16845: \$? = $ac_status" >&5
     16847   echo "$as_me:16847: \$? = $ac_status" >&5
    1684616848   if (exit $ac_status) && test -s "$ac_outfile"; then
    1684716849     # The compiler can only warn and ignore the option if not recognized
    … …  
    1694316945   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1694416946   -e 's:$: $lt_compiler_flag:'`
    16945    (eval echo "\"\$as_me:16945: $lt_compile\"" >&5)
     16947   (eval echo "\"\$as_me:16947: $lt_compile\"" >&5)
    1694616948   (eval "$lt_compile" 2>out/conftest.err)
    1694716949   ac_status=$?
    1694816950   cat out/conftest.err >&5
    16949    echo "$as_me:16949: \$? = $ac_status" >&5
     16951   echo "$as_me:16951: \$? = $ac_status" >&5
    1695016952   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    1695116953   then
    … …  
    2023420236MIN_TLS_VERSION=2.2.1
    2023520237
    20236 # Check whether --with-libgnutls-prefix was given.
    20237 if test "${with_libgnutls_prefix+set}" = set; then
    20238   withval=$with_libgnutls_prefix; libgnutls_config_prefix="$withval"
    20239 else
    20240   libgnutls_config_prefix=""
    20241 fi
    20242 
    20243 
    20244   if test x$libgnutls_config_prefix != x ; then
    20245      if test x${LIBGNUTLS_CONFIG+set} != xset ; then
    20246         LIBGNUTLS_CONFIG=$libgnutls_config_prefix/bin/libgnutls-config
     20238# Check whether --with-libgnutls-extra-prefix was given.
     20239if test "${with_libgnutls_extra_prefix+set}" = set; then
     20240  withval=$with_libgnutls_extra_prefix; libgnutls_extra_config_prefix="$withval"
     20241else
     20242  libgnutls_extra_config_prefix=""
     20243fi
     20244
     20245
     20246  if test x$libgnutls_extra_config_prefix != x ; then
     20247     if test x${LIBGNUTLS_EXTRA_CONFIG+set} != xset ; then
     20248        LIBGNUTLS_EXTRA_CONFIG=$libgnutls_extra_config_prefix/bin/libgnutls-extra-config
    2024720249     fi
    2024820250  fi
    2024920251
    20250   # Extract the first word of "libgnutls-config", so it can be a program name with args.
    20251 set dummy libgnutls-config; ac_word=$2
     20252  # Extract the first word of "libgnutls-extra-config", so it can be a program name with args.
     20253set dummy libgnutls-extra-config; ac_word=$2
    2025220254{ echo "$as_me:$LINENO: checking for $ac_word" >&5
    2025320255echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
    20254 if test "${ac_cv_path_LIBGNUTLS_CONFIG+set}" = set; then
     20256if test "${ac_cv_path_LIBGNUTLS_EXTRA_CONFIG+set}" = set; then
    2025520257  echo $ECHO_N "(cached) $ECHO_C" >&6
    2025620258else
    20257   case $LIBGNUTLS_CONFIG in
     20259  case $LIBGNUTLS_EXTRA_CONFIG in
    2025820260  [\\/]* | ?:[\\/]*)
    20259   ac_cv_path_LIBGNUTLS_CONFIG="$LIBGNUTLS_CONFIG" # Let the user override the test with a path.
     20261  ac_cv_path_LIBGNUTLS_EXTRA_CONFIG="$LIBGNUTLS_EXTRA_CONFIG" # Let the user override the test with a path.
    2026020262  ;;
    2026120263  *)
    … …  
    2026720269  for ac_exec_ext in '' $ac_executable_extensions; do
    2026820270  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
    20269     ac_cv_path_LIBGNUTLS_CONFIG="$as_dir/$ac_word$ac_exec_ext"
     20271    ac_cv_path_LIBGNUTLS_EXTRA_CONFIG="$as_dir/$ac_word$ac_exec_ext"
    2027020272    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
    2027120273    break 2
    … …  
    2027520277IFS=$as_save_IFS
    2027620278
    20277   test -z "$ac_cv_path_LIBGNUTLS_CONFIG" && ac_cv_path_LIBGNUTLS_CONFIG="no"
     20279  test -z "$ac_cv_path_LIBGNUTLS_EXTRA_CONFIG" && ac_cv_path_LIBGNUTLS_EXTRA_CONFIG="no"
    2027820280  ;;
    2027920281esac
    2028020282fi
    20281 LIBGNUTLS_CONFIG=$ac_cv_path_LIBGNUTLS_CONFIG
    20282 if test -n "$LIBGNUTLS_CONFIG"; then
    20283   { echo "$as_me:$LINENO: result: $LIBGNUTLS_CONFIG" >&5
    20284 echo "${ECHO_T}$LIBGNUTLS_CONFIG" >&6; }
     20283LIBGNUTLS_EXTRA_CONFIG=$ac_cv_path_LIBGNUTLS_EXTRA_CONFIG
     20284if test -n "$LIBGNUTLS_EXTRA_CONFIG"; then
     20285  { echo "$as_me:$LINENO: result: $LIBGNUTLS_EXTRA_CONFIG" >&5
     20286echo "${ECHO_T}$LIBGNUTLS_EXTRA_CONFIG" >&6; }
    2028520287else
    2028620288  { echo "$as_me:$LINENO: result: no" >&5
    … …  
    2029320295echo $ECHO_N "checking for libgnutls - version >= $min_libgnutls_version... $ECHO_C" >&6; }
    2029420296  no_libgnutls=""
    20295   if test "$LIBGNUTLS_CONFIG" = "no" ; then
     20297  if test "$LIBGNUTLS_EXTRA_CONFIG" = "no" ; then
    2029620298    no_libgnutls=yes
    2029720299  else
    20298     LIBGNUTLS_CFLAGS=`$LIBGNUTLS_CONFIG $libgnutls_config_args --cflags`
    20299     LIBGNUTLS_LIBS=`$LIBGNUTLS_CONFIG $libgnutls_config_args --libs`
    20300     libgnutls_config_version=`$LIBGNUTLS_CONFIG $libgnutls_config_args --version`
     20300    LIBGNUTLS_EXTRA_CFLAGS=`$LIBGNUTLS_EXTRA_CONFIG $libgnutls_extra_config_args --cflags`
     20301    LIBGNUTLS_EXTRA_LIBS=`$LIBGNUTLS_EXTRA_CONFIG $libgnutls_extra_config_args --libs`
     20302    libgnutls_extra_config_version=`$LIBGNUTLS_EXTRA_CONFIG $libgnutls_extra_config_args --version`
    2030120303
    2030220304
    2030320305      ac_save_CFLAGS="$CFLAGS"
    2030420306      ac_save_LIBS="$LIBS"
    20305       CFLAGS="$CFLAGS $LIBGNUTLS_CFLAGS"
    20306       LIBS="$LIBS $LIBGNUTLS_LIBS"
     20307      CFLAGS="$CFLAGS $LIBGNUTLS_EXTRA_CFLAGS"
     20308      LIBS="$LIBS $LIBGNUTLS_EXTRA_LIBS"
    2030720309      rm -f conf.libgnutlstest
    2030820310      if test "$cross_compiling" = yes; then
    … …  
    2031920321#include <stdlib.h>
    2032020322#include <string.h>
    20321 #include <gnutls/gnutls.h>
     20323#include <gnutls/extra.h>
    2032220324
    2032320325int
    … …  
    2032620328    system ("touch conf.libgnutlstest");
    2032720329
    20328     if( strcmp( gnutls_check_version(NULL), "$libgnutls_config_version" ) )
     20330    if( strcmp( gnutls_extra_check_version(NULL), "$libgnutls_extra_config_version" ) )
    2032920331    {
    20330       printf("\n*** 'libgnutls-config --version' returned %s, but LIBGNUTLS (%s)\n",
    20331              "$libgnutls_config_version", gnutls_check_version(NULL) );
    20332       printf("*** was found! If libgnutls-config was correct, then it is best\n");
    20333       printf("*** to remove the old version of LIBGNUTLS. You may also be able to fix the error\n");
     20332      printf("\n*** 'libgnutls-extra-config --version' returned %s, but LIBGNUTLS_EXTRA (%s)\n",
     20333             "$libgnutls_extra_config_version", gnutls_extra_check_version(NULL) );
     20334      printf("*** was found! If libgnutls-extra-config was correct, then it is best\n");
     20335      printf("*** to remove the old version of LIBGNUTLS_EXTRA. You may also be able to fix the error\n");
    2033420336      printf("*** by modifying your LD_LIBRARY_PATH enviroment variable, or by editing\n");
    2033520337      printf("*** /etc/ld.so.conf. Make sure you have run ldconfig if that is\n");
    2033620338      printf("*** required on your system.\n");
    20337       printf("*** If libgnutls-config was wrong, set the environment variable LIBGNUTLS_CONFIG\n");
    20338       printf("*** to point to the correct copy of libgnutls-config, and remove the file config.cache\n");
     20339      printf("*** If libgnutls-extra-config was wrong, set the environment variable LIBGNUTLS_EXTRA_CONFIG\n");
     20340      printf("*** to point to the correct copy of libgnutls-extra-config, and remove the file config.cache\n");
    2033920341      printf("*** before re-running configure\n");
    2034020342    }
    20341     else if ( strcmp(gnutls_check_version(NULL), LIBGNUTLS_VERSION ) )
     20343    else if ( strcmp(gnutls_extra_check_version(NULL), LIBGNUTLS_EXTRA_VERSION ) )
    2034220344    {
    20343       printf("\n*** LIBGNUTLS header file (version %s) does not match\n", LIBGNUTLS_VERSION);
    20344       printf("*** library (version %s)\n", gnutls_check_version(NULL) );
     20345      printf("\n*** LIBGNUTLS_EXTRA header file (version %s) does not match\n", LIBGNUTLS_EXTRA_VERSION);
     20346      printf("*** library (version %s). This is may be due to a different version of gnutls\n", gnutls_extra_check_version(NULL) );
     20347      printf("*** and gnutls-extra.\n");
    2034520348    }
    2034620349    else
    2034720350    {
    20348       if ( gnutls_check_version( "$min_libgnutls_version" ) )
     20351      if ( gnutls_extra_check_version( "$min_libgnutls_version" ) )
    2034920352      {
    2035020353        return 0;
    … …  
    2035220355     else
    2035320356      {
    20354         printf("no\n*** An old version of LIBGNUTLS (%s) was found.\n",
    20355                 gnutls_check_version(NULL) );
    20356         printf("*** You need a version of LIBGNUTLS newer than %s. The latest version of\n",
     20357        printf("no\n*** An old version of LIBGNUTLS_EXTRA (%s) was found.\n",
     20358                gnutls_extra_check_version(NULL) );
     20359        printf("*** You need a version of LIBGNUTLS_EXTRA newer than %s. The latest version of\n",
    2035720360               "$min_libgnutls_version" );
    20358         printf("*** LIBGNUTLS is always available from ftp://gnutls.hellug.gr/pub/gnutls.\n");
     20361        printf("*** LIBGNUTLS_EXTRA is always available from ftp://gnutls.hellug.gr/pub/gnutls.\n");
    2035920362        printf("*** \n");
    2036020363        printf("*** If you have already installed a sufficiently new version, this error\n");
    20361         printf("*** probably means that the wrong copy of the libgnutls-config shell script is\n");
     20364        printf("*** probably means that the wrong copy of the libgnutls-extra-config shell script is\n");
    2036220365        printf("*** being found. The easiest way to fix this is to remove the old version\n");
    20363         printf("*** of LIBGNUTLS, but you can also set the LIBGNUTLS_CONFIG environment to point to the\n");
    20364         printf("*** correct copy of libgnutls-config. (In this case, you will have to\n");
     20366        printf("*** of LIBGNUTLS_EXTRA, but you can also set the LIBGNUTLS_EXTRA_CONFIG environment to point to the\n");
     20367        printf("*** correct copy of libgnutls-extra-config. (In this case, you will have to\n");
    2036520368        printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n");
    2036620369        printf("*** so that the correct libraries are found at run-time))\n");
    … …  
    2041920422echo "${ECHO_T}no" >&6; }
    2042020423     fi
    20421      if test "$LIBGNUTLS_CONFIG" = "no" ; then
    20422        echo "*** The libgnutls-config script installed by LIBGNUTLS could not be found"
    20423        echo "*** If LIBGNUTLS was installed in PREFIX, make sure PREFIX/bin is in"
    20424        echo "*** your path, or set the LIBGNUTLS_CONFIG environment variable to the"
    20425        echo "*** full path to libgnutls-config."
     20424     if test "$LIBGNUTLS_EXTRA_CONFIG" = "no" ; then
     20425       echo "*** The libgnutls-extra-config script installed by LIBGNUTLS_EXTRA could not be found"
     20426       echo "*** If LIBGNUTLS_EXTRA was installed in PREFIX, make sure PREFIX/bin is in"
     20427       echo "*** your path, or set the LIBGNUTLS_EXTRA_CONFIG environment variable to the"
     20428       echo "*** full path to libgnutls-extra-config."
    2042620429     else
    2042720430       if test -f conf.libgnutlstest ; then
    … …  
    2042920432       else
    2043020433          echo "*** Could not run libgnutls test program, checking why..."
    20431           CFLAGS="$CFLAGS $LIBGNUTLS_CFLAGS"
    20432           LIBS="$LIBS $LIBGNUTLS_LIBS"
     20434          CFLAGS="$CFLAGS $LIBGNUTLS_EXTRA_CFLAGS"
     20435          LIBS="$LIBS $LIBGNUTLS_EXTRA_LIBS"
    2043320436          cat >conftest.$ac_ext <<_ACEOF
    2043420437/* confdefs.h.  */
    … …  
    2044120444#include <stdlib.h>
    2044220445#include <string.h>
    20443 #include <gnutls/gnutls.h>
     20446#include <gnutls/extra.h>
    2044420447
    2044520448int
    2044620449main ()
    2044720450{
    20448  return !!gnutls_check_version(NULL);
     20451 return !!gnutls_extra_check_version(NULL);
    2044920452  ;
    2045020453  return 0;
    … …  
    2047020473       $as_test_x conftest$ac_exeext; then
    2047120474   echo "*** The test program compiled, but did not run. This usually means"
    20472           echo "*** that the run-time linker is not finding LIBGNUTLS or finding the wrong"
    20473           echo "*** version of LIBGNUTLS. If it is not finding LIBGNUTLS, you'll need to set your"
     20475          echo "*** that the run-time linker is not finding LIBGNUTLS_EXTRA or finding the wrong"
     20476          echo "*** version of LIBGNUTLS_EXTRA. If it is not finding LIBGNUTLS_EXTRA, you'll need to set your"
    2047420477          echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point"
    2047520478          echo "*** to the installed location  Also, make sure you have run ldconfig if that"
    … …  
    2048420487
    2048520488         echo "*** The test program failed to compile or link. See the file config.log for the"
    20486           echo "*** exact error that occured. This usually means LIBGNUTLS was incorrectly installed"
    20487           echo "*** or that you have moved LIBGNUTLS since it was installed. In the latter case, you"
    20488           echo "*** may want to edit the libgnutls-config script: $LIBGNUTLS_CONFIG"
     20489          echo "*** exact error that occured. This usually means LIBGNUTLS_EXTRA was incorrectly installed"
     20490          echo "*** or that you have moved LIBGNUTLS_EXTRA since it was installed. In the latter case, you"
     20491          echo "*** may want to edit the libgnutls-extra-config script: $LIBGNUTLS_EXTRA_CONFIG"
    2048920492fi
    2049020493
    … …  
    2049520498       fi
    2049620499     fi
    20497      LIBGNUTLS_CFLAGS=""
    20498      LIBGNUTLS_LIBS=""
     20500     LIBGNUTLS_EXTRA_CFLAGS=""
     20501     LIBGNUTLS_EXTRA_LIBS=""
    2049920502     { { echo "$as_me:$LINENO: error:
    2050020503***
    20501 *** libgnutls were not found. You may want to get it from
     20504*** libgnutls and libgnutls-extra were not found. You may want to get it from
    2050220505*** http://www.gnutls.org/
    2050320506***
    … …  
    2050520508echo "$as_me: error:
    2050620509***
    20507 *** libgnutls were not found. You may want to get it from
     20510*** libgnutls and libgnutls-extra were not found. You may want to get it from
    2050820511*** http://www.gnutls.org/
    2050920512***
    … …  
    2051520518
    2051620519
    20517   LIBGNUTLS_VERSION=`$LIBGNUTLS_CONFIG $libgnutls_config_args --version`
    20518   LIBGNUTLS_PREFIX="`$LIBGNUTLS_CONFIG $libgnutls_config_args --prefix`"
     20520  LIBGNUTLS_LIBS=$LIBGNUTLS_EXTRA_LIBS
     20521  LIBGNUTLS_CFLAGS=$LIBGNUTLS_EXTRA_CFLAGS
     20522  LIBGNUTLS_VERSION=`$LIBGNUTLS_EXTRA_CONFIG $libgnutls_extra_config_args --version`
     20523  LIBGNUTLS_PREFIX="`$LIBGNUTLS_EXTRA_CONFIG $libgnutls_extra_config_args --prefix`"
    2051920524  GNUTLS_CERTTOOL="${LIBGNUTLS_PREFIX}/bin/certtool"
    2052020525
    … …  
    2052620531
    2052720532
     20533
     20534# Check whether --enable-srp was given.
     20535if test "${enable_srp+set}" = set; then
     20536  enableval=$enable_srp; use_srp=$enableval
     20537else
     20538  use_srp=yes
     20539fi
     20540
     20541
     20542SRP_CFLAGS=""
     20543if test "$use_srp" != "no"; then
     20544        SRP_CFLAGS="-DENABLE_SRP=1"
     20545fi
     20546{ echo "$as_me:$LINENO: checking whether to enable SRP functionality" >&5
     20547echo $ECHO_N "checking whether to enable SRP functionality... $ECHO_C" >&6; }
     20548{ echo "$as_me:$LINENO: result: $use_srp" >&5
     20549echo "${ECHO_T}$use_srp" >&6; }
    2052820550
    2052920551
    … …  
    2127321295
    2127421296
    21275 # Check whether --enable-srp was given.
    21276 if test "${enable_srp+set}" = set; then
    21277   enableval=$enable_srp; use_srp=$enableval
    21278 else
    21279   use_srp=yes
    21280 fi
    21281 
    21282 
    21283 SRP_CFLAGS=""
    21284 if test "$use_srp" != "no"; then
    21285         SRP_CFLAGS="-DENABLE_SRP=1"
    21286 fi
    21287 { echo "$as_me:$LINENO: checking whether to enable SRP functionality" >&5
    21288 echo $ECHO_N "checking whether to enable SRP functionality... $ECHO_C" >&6; }
    21289 { echo "$as_me:$LINENO: result: $use_srp" >&5
    21290 echo "${ECHO_T}$use_srp" >&6; }
    21291 
    21292 MODULE_CFLAGS="${LIBGNUTLS_CFLAGS} ${SRP_CFLAGS} ${APR_MEMCACHE_CFLAGS} ${APXS_CFLAGS} ${AP_INCLUDES} ${APR_INCLUDES} ${APU_INCLUDES}"
    21293 MODULE_LIBS="${APR_MEMCACHE_LIBS} ${LIBGNUTLS_LIBS}"
     21297MODULE_CFLAGS="${LIBGNUTLS_EXTRA_CFLAGS} ${SRP_CFLAGS} ${APR_MEMCACHE_CFLAGS} ${APXS_CFLAGS} ${AP_INCLUDES} ${APR_INCLUDES} ${APU_INCLUDES}"
     21298MODULE_LIBS="${APR_MEMCACHE_LIBS} ${LIBGNUTLS_EXTRA_LIBS}"
    2129421299
    2129521300
    … …  
    2172221727# values after options handling.
    2172321728ac_log="
    21724 This file was extended by mod_gnutls $as_me 0.4.3, which was
     21729This file was extended by mod_gnutls $as_me 0.5.1, which was
    2172521730generated by GNU Autoconf 2.61.  Invocation command line was
    2172621731
    … …  
    2177521780cat >>$CONFIG_STATUS <<_ACEOF
    2177621781ac_cs_version="\\
    21777 mod_gnutls config.status 0.4.3
     21782mod_gnutls config.status 0.5.1
    2177821783configured by $0, generated by GNU Autoconf 2.61,
    2177921784  with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
    … …  
    2213222137APXS_EXTENSION!$APXS_EXTENSION$ac_delim
    2213322138APXS_CFLAGS!$APXS_CFLAGS$ac_delim
    22134 LIBGNUTLS_CONFIG!$LIBGNUTLS_CONFIG$ac_delim
     22139LIBGNUTLS_EXTRA_CONFIG!$LIBGNUTLS_EXTRA_CONFIG$ac_delim
     22140LIBGNUTLS_EXTRA_CFLAGS!$LIBGNUTLS_EXTRA_CFLAGS$ac_delim
     22141LIBGNUTLS_EXTRA_LIBS!$LIBGNUTLS_EXTRA_LIBS$ac_delim
    2213522142LIBGNUTLS_CFLAGS!$LIBGNUTLS_CFLAGS$ac_delim
    2213622143LIBGNUTLS_LIBS!$LIBGNUTLS_LIBS$ac_delim
    … …  
    2214722154_ACEOF
    2214822155
    22149   if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 51; then
     22156  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 53; then
    2215022157    break
    2215122158  elif $ac_last_try; then
    … …  
    2275222759echo "   * Apache Modules directory:    ${AP_LIBEXECDIR}"
    2275322760echo "   * GnuTLS Library version:      ${LIBGNUTLS_VERSION}"
    22754 echo "   * SRP authentication:          ${use_srp}"
     22761echo "   * SRP Authentication:          ${use_srp}"
    2275522762echo ""
    2275622763echo "---"
Note: See TracChangeset for help on using the changeset viewer.