Skip to content

Commit ebdba03

Browse files
Merge #891: build: Add workaround for automake 1.13 and older
f329bba build: Add workaround for automake 1.13 and older (Tim Ruffing) Pull request description: Fixes #890. ACKs for top commit: michaelfolkson: ACK f329bba Tree-SHA512: 1ae3d1587abb402c2d3bb28d3a48aeff056f061e755d65d482204bb502b8427aad376c7319b4a694a5bf79c193acd3c88cb65928f0bc0e5c7587222e1315b6d0
2 parents 3a8b47b + f329bba commit ebdba03

File tree

1 file changed

+8
-0
lines changed

1 file changed

+8
-0
lines changed

configure.ac

+8
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,15 @@ AC_PATH_TOOL(AR, ar)
2323
AC_PATH_TOOL(RANLIB, ranlib)
2424
AC_PATH_TOOL(STRIP, strip)
2525

26+
# Save definition of AC_PROG_CC because AM_PROG_CC_C_O in automake<=1.13 will
27+
# redefine AC_PROG_CC to exit with an error, which avoids the user calling it
28+
# accidently and screwing up the effect of AM_PROG_CC_C_O. However, we'll need
29+
# AC_PROG_CC later on in AX_PROG_CC_FOR_BUILD, where its usage is fine, and
30+
# we'll carefully make sure not to call AC_PROG_CC anywhere else.
31+
m4_copy([AC_PROG_CC], [saved_AC_PROG_CC])
2632
AM_PROG_CC_C_O
33+
# Restore AC_PROG_CC
34+
m4_rename_force([saved_AC_PROG_CC], [AC_PROG_CC])
2735

2836
AC_PROG_CC_C89
2937
if test x"$ac_cv_prog_cc_c89" = x"no"; then

0 commit comments

Comments
 (0)