Changeset 02c8e54 in mod_gnutls for configure

Timestamp:

Nov 22, 2015, 1:43:48 PM (7 years ago)

Author:

Daniel Kahn Gillmor <dkg@…>

Branches:

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

Children:

63468af, 8a264b0, bcbcf5d

Parents:

89f863f (diff), 07cc51f (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Imported Upstream version 0.7.2

File:

• configure (modified) (21 diffs)

configure

@@ -1 +1 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for mod_gnutls 0.7.1.
+# Generated by GNU Autoconf 2.69 for mod_gnutls 0.7.2.
 #
 #
@@ -588 +588 @@
 PACKAGE_NAME='mod_gnutls'
 PACKAGE_TARNAME='mod_gnutls'
-PACKAGE_VERSION='0.7.1'
-PACKAGE_STRING='mod_gnutls 0.7.1'
+PACKAGE_VERSION='0.7.2'
+PACKAGE_STRING='mod_gnutls 0.7.2'
 PACKAGE_BUGREPORT=''
 PACKAGE_URL=''
@@ -648 +648 @@
 APR_MEMCACHE_CFLAGS
 APR_MEMCACHE_LIBS
+APR_UTIL_CONF
 USE_MSVA_FALSE
 USE_MSVA_TRUE
@@ -819 +820 @@
 enable_strict
 enable_msva
-with_apr_memcache_prefix
-with_apr_memcache_libs
-with_apr_memcache_includes
+with_apu_config
 '
       ac_precious_vars='build_alias
@@ -1379 +1378 @@
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures mod_gnutls 0.7.1 to adapt to many kinds of systems.
+\`configure' configures mod_gnutls 0.7.2 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1450 +1449 @@
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of mod_gnutls 0.7.1:";;
+     short | recursive ) echo "Configuration of mod_gnutls 0.7.2:";;
    esac
   cat <<\_ACEOF
@@ -1488 +1487 @@
                         (or the compiler's sysroot if not specified).
   --with-apxs=PATH        Path to apxs
-  --with-apr-memcache-prefix=PATH
-                          Install prefix for apr_memcache
-  --with-apr-memcache-libs=PATH
-                          Path to apr_memcache libs
-  --with-apr-memcache-includes=PATH
-                          Path to apr_memcache includes
+  --with-apu-config=PATH  Path to APR Utility Library config tool
+                          (apu-1-config)
 
 Some influential environment variables:
@@ -1584 +1579 @@
 if $ac_init_version; then
   cat <<\_ACEOF
-mod_gnutls configure 0.7.1
+mod_gnutls configure 0.7.2
 generated by GNU Autoconf 2.69
 
@@ -1995 +1990 @@
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by mod_gnutls $as_me 0.7.1, which was
+It was created by mod_gnutls $as_me 0.7.2, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
@@ -2361 +2356 @@
   chmod +x config.nice
 
-MOD_GNUTLS_VERSION=0.7.1
+MOD_GNUTLS_VERSION=0.7.2
 
 
@@ -2540 +2535 @@
   program_prefix=${target_alias}-
 # mod_gnutls test suite requires GNU make
-am__api_version='1.14'
+am__api_version='1.15'
 
 # Find a good install program.  We prefer a C program (faster),
@@ -2712 +2707 @@
 program_transform_name=`$as_echo "$program_transform_name" | sed "$ac_script"`
 
-# expand $ac_aux_dir to an absolute path
-am_aux_dir=`cd $ac_aux_dir && pwd`
+# Expand $ac_aux_dir to an absolute path.
+am_aux_dir=`cd "$ac_aux_dir" && pwd`
 
 if test x"${MISSING+set}" != xset; then
@@ -2732 +2727 @@
 fi
 
-if test x"${install_sh}" != xset; then
+if test x"${install_sh+set}" != xset; then
   case $am_aux_dir in
   *\ * | *\     *)
@@ -3026 +3021 @@
 # Define the identity of the package.
  PACKAGE='mod_gnutls'
- VERSION='0.7.1'
+ VERSION='0.7.2'
 
 
@@ -3060 +3055 @@
 mkdir_p='$(MKDIR_P)'
 
-# We need awk for the "check" target.  The system "awk" is bad on
-# some platforms.
+# We need awk for the "check" target (and possibly the TAP driver).  The
+# system "awk" is bad on some platforms.
 # Always define AMTAR for backward compatibility.  Yes, it's still used
 # in the wild :-(  We should find a proper way to deprecate it ...
@@ -12727 +12722 @@
 
 
-# Check whether --with-apr-memcache-prefix was given.
-if test "${with_apr_memcache_prefix+set}" = set; then :
-  withval=$with_apr_memcache_prefix; apr_memcache_prefix="$withval"
-else
-  :
-fi
-
-
-# Check whether --with-apr-memcache-libs was given.
-if test "${with_apr_memcache_libs+set}" = set; then :
-  withval=$with_apr_memcache_libs; apr_memcache_libs="$withval"
-else
-  :
-fi
-
-
-# Check whether --with-apr-memcache-includes was given.
-if test "${with_apr_memcache_includes+set}" = set; then :
-  withval=$with_apr_memcache_includes; apr_memcache_includes="$withval"
-else
-  :
-fi
-
+# Check whether --with-apu-config was given.
+if test "${with_apu_config+set}" = set; then :
+  withval=$with_apu_config; apr_util_config="$withval"
+fi
 
 
@@ -12757 +12733 @@
 save_LDFLAGS=$LDFLAGS
 
-if test -n "$apr_memcache_libs"; then
-    apr_memcache_libdir=$apr_memcache_libs
-elif test -n "$apr_memcache_prefix"; then
-    apr_memcache_libdir=$apr_memcache_prefix/lib
-fi
-if test -n "$apr_memcache_libdir"; then
-    LDFLAGS="-L$apr_memcache_libdir $LDFLAGS"
-fi
-
-if test -n "$apr_memcache_includes"; then
-    apr_memcache_includedir=$apr_memcache_includes
-elif test -n "$apr_memcache_prefix"; then
-    apr_memcache_includedir=$apr_memcache_prefix/include/apr_memcache-0
-else
-    apr_memcache_includedir=$includedir/apr_memcache-0
-fi
-
-CFLAGS="-I$apr_memcache_includedir $CFLAGS"
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for apr_memcache_create in -lapr_memcache" >&5
-$as_echo_n "checking for apr_memcache_create in -lapr_memcache... " >&6; }
-if ${ac_cv_lib_apr_memcache_apr_memcache_create+:} false; then :
+if test -z "$apr_util_config"; then
+        for ac_prog in apu-1-config
+do
+  # Extract the first word of "$ac_prog", so it can be a program name with args.
+set dummy $ac_prog; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_path_APR_UTIL_CONF+:} false; then :
   $as_echo_n "(cached) " >&6
 else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lapr_memcache  $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char apr_memcache_create ();
-int
-main ()
-{
-return apr_memcache_create ();
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_lib_apr_memcache_apr_memcache_create=yes
-else
-  ac_cv_lib_apr_memcache_apr_memcache_create=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_apr_memcache_apr_memcache_create" >&5
-$as_echo "$ac_cv_lib_apr_memcache_apr_memcache_create" >&6; }
-if test "x$ac_cv_lib_apr_memcache_apr_memcache_create" = xyes; then :
-
-        APR_MEMCACHE_LIBS="-lapr_memcache"
-        if test -n "$apr_memcache_libdir"; then
-            APR_MEMCACHE_LIBS="-R$apr_memcache_libdir -L$apr_memcache_libdir $APR_MEMCACHE_LIBS"
-        fi
-        APR_MEMCACHE_CFLAGS="-I$apr_memcache_includedir"
-
-
-fi
-
-
-
-if test -z "${APR_MEMCACHE_LIBS}"; then
-    if test -n "$apr_memcache_includes"; then
-        apr_memcache_includedir=$apr_memcache_includes
-    elif test -n "$apr_memcache_prefix"; then
-        apr_memcache_includedir=$apr_memcache_prefix/include/aprutil-1
-    else
-        apr_memcache_includedir=$includedir/aprutil-1
-    fi
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for apr_memcache_create in -laprutil-1" >&5
+  case $APR_UTIL_CONF in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_APR_UTIL_CONF="$APR_UTIL_CONF" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+as_dummy="$PATH:/usr/sbin"
+for as_dir in $as_dummy
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_path_APR_UTIL_CONF="$as_dir/$ac_word$ac_exec_ext"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+  ;;
+esac
+fi
+APR_UTIL_CONF=$ac_cv_path_APR_UTIL_CONF
+if test -n "$APR_UTIL_CONF"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $APR_UTIL_CONF" >&5
+$as_echo "$APR_UTIL_CONF" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+  test -n "$APR_UTIL_CONF" && break
+done
+test -n "$APR_UTIL_CONF" || APR_UTIL_CONF="no"
+
+else
+        { $as_echo "$as_me:${as_lineno-$LINENO}: using apu-1-config path set by user: $apr_util_config" >&5
+$as_echo "$as_me: using apu-1-config path set by user: $apr_util_config" >&6;}
+        APR_UTIL_CONF="$apr_util_config"
+fi
+
+CFLAGS="`$APR_UTIL_CONF --includes` $CFLAGS"
+LDFLAGS="`$APR_UTIL_CONF --link-ld` $LDFLAGS"
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for apr_memcache_create in -laprutil-1" >&5
 $as_echo_n "checking for apr_memcache_create in -laprutil-1... " >&6; }
 if ${ac_cv_lib_aprutil_1_apr_memcache_create+:} false; then :
@@ -12872 +12828 @@
 if test "x$ac_cv_lib_aprutil_1_apr_memcache_create" = xyes; then :
 
-            APR_MEMCACHE_LIBS="`apu-1-config --link-ld`"
-            APR_MEMCACHE_CFLAGS="`apu-1-config --includes`"
-
-
-fi
+                APR_MEMCACHE_LIBS="`$APR_UTIL_CONF --link-ld`"
+                APR_MEMCACHE_CFLAGS="`$APR_UTIL_CONF --includes`"
+
 
 fi
@@ -13025 +12979 @@
   *)
   as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
+as_dummy="$PATH:/usr/sbin"
+for as_dir in $as_dummy
 do
   IFS=$as_save_IFS
@@ -13622 +13577 @@
 # values after options handling.
 ac_log="
-This file was extended by mod_gnutls $as_me 0.7.1, which was
+This file was extended by mod_gnutls $as_me 0.7.2, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
@@ -13688 +13643 @@
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-mod_gnutls config.status 0.7.1
+mod_gnutls config.status 0.7.2
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"