From bdeb4ecc9a670eeb73d5da1e53be320f4f20bb9c Mon Sep 17 00:00:00 2001 From: Ruediger Pluem Date: Mon, 1 Dec 2008 20:32:43 +0000 Subject: [PATCH] Merge r721796 from trunk: * Enable the use of autoconf >= 2.62 without causing APR / APR-UTIL options passed to the configure script issue warnings about unknown options. Submitted by: rpluem Reviewed by: rpluem, pquerna, tdonovan git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@722216 13f79535-47bb-0310-9956-ffa450edef68 --- STATUS | 8 -------- configure.in | 9 +++++++++ 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/STATUS b/STATUS index 818a097ef8f..94484ad8f54 100644 --- a/STATUS +++ b/STATUS @@ -86,14 +86,6 @@ RELEASE SHOWSTOPPERS: PATCHES ACCEPTED TO BACKPORT FROM TRUNK: [ start all new proposals below, under PATCHES PROPOSED. ] - * Build: Enable the use of autoconf >= 2.62 without causing APR / APR-UTIL - options passed to the configure script issue warnings about unknown options. - Trunk version of patch: - http://svn.apache.org/viewvc?rev=721796&view=rev - Backport version for 2.2.x of patch: - Trunk version of patch works - +1: rpluem, pquerna, tdonovan - PATCHES PROPOSED TO BACKPORT FROM TRUNK: [ New proposals should be added at the end of the list ] diff --git a/configure.in b/configure.in index 4602c67ac05..0ccf85911ec 100644 --- a/configure.in +++ b/configure.in @@ -18,6 +18,15 @@ sinclude(build/find_apr.m4) sinclude(build/find_apu.m4) sinclude(acinclude.m4) +dnl Later versions of autoconf (>= 2.62) by default cause the produced +dnl configure script to emit at least warnings when it comes across unknown +dnl command line options. These versions also have the macro +dnl AC_DISABLE_OPTION_CHECKING defined which turns this off by default. +dnl We want to have this turned off here since our configure calls can +dnl contain options for APR / APR-UTIL configure that are unknown to us. +dnl So avoid confusing the user by turning this off. See also PR 45221. +ifdef([AC_DISABLE_OPTION_CHECKING], [AC_DISABLE_OPTION_CHECKING]) + dnl XXX we can't just use AC_PREFIX_DEFAULT because that isn't subbed in dnl by configure until it is too late. Is that how it should be or not? dnl Something seems broken here. -- 2.47.2