Skip to content

Commit 7bdbfa9

Browse files
committed
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
1 parent 270e934 commit 7bdbfa9

2 files changed

Lines changed: 9 additions & 8 deletions

File tree

STATUS

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -86,14 +86,6 @@ RELEASE SHOWSTOPPERS:
8686
PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
8787
[ start all new proposals below, under PATCHES PROPOSED. ]
8888

89-
* Build: Enable the use of autoconf >= 2.62 without causing APR / APR-UTIL
90-
options passed to the configure script issue warnings about unknown options.
91-
Trunk version of patch:
92-
http://svn.apache.org/viewvc?rev=721796&view=rev
93-
Backport version for 2.2.x of patch:
94-
Trunk version of patch works
95-
+1: rpluem, pquerna, tdonovan
96-
9789
PATCHES PROPOSED TO BACKPORT FROM TRUNK:
9890
[ New proposals should be added at the end of the list ]
9991

configure.in

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,15 @@ sinclude(build/find_apr.m4)
1818
sinclude(build/find_apu.m4)
1919
sinclude(acinclude.m4)
2020

21+
dnl Later versions of autoconf (>= 2.62) by default cause the produced
22+
dnl configure script to emit at least warnings when it comes across unknown
23+
dnl command line options. These versions also have the macro
24+
dnl AC_DISABLE_OPTION_CHECKING defined which turns this off by default.
25+
dnl We want to have this turned off here since our configure calls can
26+
dnl contain options for APR / APR-UTIL configure that are unknown to us.
27+
dnl So avoid confusing the user by turning this off. See also PR 45221.
28+
ifdef([AC_DISABLE_OPTION_CHECKING], [AC_DISABLE_OPTION_CHECKING])
29+
2130
dnl XXX we can't just use AC_PREFIX_DEFAULT because that isn't subbed in
2231
dnl by configure until it is too late. Is that how it should be or not?
2332
dnl Something seems broken here.

0 commit comments

Comments
 (0)