From 8a3be206493f3b03541925a4f4cb6250fedf1c51 Mon Sep 17 00:00:00 2001 From: Scott Tsai Date: Fri, 21 May 2010 11:05:25 +0800 Subject: [PATCH] Fix m4 macro definitions for autoconf-2.65 bakefile-lang.m4: fix AC_BAKEFILE_PROG_CC definition to avoid: configure.in:1498: warning: AC_REQUIRE: `AC_PROG_CC' was expanded before it was required acinclude.m4: fix WX_CHECK_FUNS definition to avoid: configure.in:2870: warning: AC_DEFINE: not an identifier: --- acinclude.m4 | 3 ++- build/aclocal/bakefile-lang.m4 | 1 + 2 files changed, 3 insertions(+), 1 deletions(-) diff --git a/acinclude.m4 b/acinclude.m4 index f14987d..eb0ab98 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -284,7 +284,8 @@ AC_DEFUN([WX_CHECK_FUNCS], if eval test \$wx_cv_func_$wx_func = yes then - AC_DEFINE_UNQUOTED([AS_TR_CPP([HAVE_$wx_func])]) + wx_check_funcs_have_xxx_macro_definition_temporary_variable=AS_TR_CPP([HAVE_$wx_func]) + AC_DEFINE_UNQUOTED([$wx_check_funcs_have_xxx_macro_definition_temporary_variable]) $2 else : diff --git a/build/aclocal/bakefile-lang.m4 b/build/aclocal/bakefile-lang.m4 index 6be42c1..c2c2059 100644 --- a/build/aclocal/bakefile-lang.m4 +++ b/build/aclocal/bakefile-lang.m4 @@ -240,6 +240,7 @@ dnl check for different proprietary compilers depending on target platform dnl _AC_BAKEFILE_PROG_COMPILER(LANG) AC_DEFUN([_AC_BAKEFILE_PROG_COMPILER], [ + AC_REQUIRE([AC_PROG_$1]) AC_PROG_$1 dnl Intel compiler can be used under several different OS and even -- 1.7.0.1