PR-18640257-SDK.diff [plain text]
--- configure.orig 2015-01-13 15:45:59.000000000 -0800
+++ configure 2015-01-14 13:33:26.000000000 -0800
@@ -7052,164 +7052,59 @@
# Ensure that satisfactory versions of apr and apr-util are
# found if external copies are configured.
if test "${apr_found}" = "yes"; then
- # Require at least APR 1.3.x otherwise fail
-
-
-
-
-
-
-ap_ckver_CPPFLAGS="$CPPFLAGS"
-CPPFLAGS="$CPPFLAGS `$apr_config --includes`"
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for APR version 1.3.0 or later" >&5
-$as_echo_n "checking for APR version 1.3.0 or later... " >&6; }
-if ${ap_cv_aprver13+:} false; then :
- $as_echo_n "(cached) " >&6
-else
-
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
+ # Require at least APR 1.4.x otherwise fail
+ ap_ckver_CPPFLAGS="$CPPFLAGS"
+ CPPFLAGS="$CPPFLAGS `$apr_config --includes`"
-#include <apr_version.h>
-#if APR_MAJOR_VERSION > 1 || (APR_MAJOR_VERSION == 1 && APR_MINOR_VERSION >= 3)
-good
-#endif
+ version=`$apr_config --version`
+ $as_echo "$as_me:${as_lineno-$LINENO}: found APR version $version" >&5
+ case x${version} in
+ x1.[0-3].*)
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: APR version 1.4.0 or later is required, found $version" >&5
+ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: APR version 1.4.0 or later is required, found $version" >&2;}
+ ap_cv_aprver=no
+ ;;
+ *)
+ ap_cv_aprver=yes
+ esac
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
- $EGREP "good" >/dev/null 2>&1; then :
- ap_cv_aprver13=yes
-else
- ap_cv_aprver13=no
-fi
-rm -f conftest*
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ap_cv_aprver13" >&5
-$as_echo "$ap_cv_aprver13" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ap_cv_aprver" >&5
+ $as_echo "$ap_cv_aprver" >&6; }
-if test "$ap_cv_aprver13" = "yes"; then
+ if test "$ap_cv_aprver" = "yes"; then
:
-else
- as_fn_error $? "APR version 1.3.0 or later is required" "$LINENO" 5
-fi
-
-CPPFLAGS="$ap_ckver_CPPFLAGS"
-
-
-
-
-
+ else
+ as_fn_error $? "APR version 1.4.0 or later is required" "$LINENO" 5
+ fi
+ CPPFLAGS="$ap_ckver_CPPFLAGS"
fi
if test "${apu_found}" = "yes"; then
# Require at least APR-util 1.3.x otherwise fail
if test "${apr_found}" = "yes"; then
# we need to add the APR includes to CPPFLAGS
- apu_ckver_CPPFLAGS="$CPPFLAGS"
- CPPFLAGS="$CPPFLAGS `$apr_config --includes`"
-
-
-
-
-
+ ap_ckver_CPPFLAGS="$CPPFLAGS"
+ CPPFLAGS="$CPPFLAGS `$apu_config --includes`"
-ap_ckver_CPPFLAGS="$CPPFLAGS"
-CPPFLAGS="$CPPFLAGS `$apu_config --includes`"
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for APR-util version 1.3.0 or later" >&5
-$as_echo_n "checking for APR-util version 1.3.0 or later... " >&6; }
-if ${ap_cv_apuver13+:} false; then :
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for APR-util version 1.4.0 or later" >&5
+ $as_echo_n "checking for APR-util version 1.4.0 or later... " >&2; }
+ if ${ap_cv_apuver+:} false; then :
$as_echo_n "(cached) " >&6
-else
-
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
-#include <apu_version.h>
-#if APU_MAJOR_VERSION > 1 || (APU_MAJOR_VERSION == 1 && APU_MINOR_VERSION >= 3)
-good
-#endif
-
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
- $EGREP "good" >/dev/null 2>&1; then :
- ap_cv_apuver13=yes
-else
- ap_cv_apuver13=no
-fi
-rm -f conftest*
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ap_cv_apuver13" >&5
-$as_echo "$ap_cv_apuver13" >&6; }
-
-if test "$ap_cv_apuver13" = "yes"; then
- :
-else
- as_fn_error $? "APR-util version 1.3.0 or later is required" "$LINENO" 5
-fi
-
-CPPFLAGS="$ap_ckver_CPPFLAGS"
-
-
-
-
-
-
- CPPFLAGS="$apu_ckver_CPPFLAGS"
else
-
-
-
-
-
-
-ap_ckver_CPPFLAGS="$CPPFLAGS"
-CPPFLAGS="$CPPFLAGS `$apu_config --includes`"
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for APR-util version 1.3.0 or later" >&5
-$as_echo_n "checking for APR-util version 1.3.0 or later... " >&6; }
-if ${ap_cv_apuver13+:} false; then :
- $as_echo_n "(cached) " >&6
-else
-
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
-#include <apu_version.h>
-#if APU_MAJOR_VERSION > 1 || (APU_MAJOR_VERSION == 1 && APU_MINOR_VERSION >= 3)
-good
-#endif
-
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
- $EGREP "good" >/dev/null 2>&1; then :
- ap_cv_apuver13=yes
-else
- ap_cv_apuver13=no
-fi
-rm -f conftest*
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ap_cv_apuver13" >&5
-$as_echo "$ap_cv_apuver13" >&6; }
-
-if test "$ap_cv_apuver13" = "yes"; then
- :
-else
- as_fn_error $? "APR-util version 1.3.0 or later is required" "$LINENO" 5
-fi
-
-CPPFLAGS="$ap_ckver_CPPFLAGS"
-
-
-
-
-
-
+ version=`$apr_config --version`
+ $as_echo "$as_me:${as_lineno-$LINENO}: found APR version $version" >&5
+ case x${version} in
+ x1.[0-3].*)
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: APR-util version 1.4.0 or later is required, found $version" >&5 }
+ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: APR-uti version 1.4.0 or later is required, found $version" >&2;}
+ ap_cv_apuver=no
+ ;;
+ *)
+ ap_cv_apuver=yes
+ esac
+ fi
fi
fi