From dc60870eb02edb6b0163a77cc9ca523d692bc385 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn-Egil=20Dahlberg?= <egil@erlang.org>
Date: Tue, 15 Jan 2013 17:32:19 +0100
Subject: Fix LM_TRY_ENABLE_CFLAG to use correct environment

LM_TRY_ENABLE_CFLAG takes which environment variable should be updated
but only CFLAGS was updated. Though CFLAGS is the normally the intended
variable, others may be used. For instance CXXFLAGS.
---
 lib/wx/aclocal.m4 | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

(limited to 'lib/wx')

diff --git a/lib/wx/aclocal.m4 b/lib/wx/aclocal.m4
index 5d555a5123..918e30a886 100644
--- a/lib/wx/aclocal.m4
+++ b/lib/wx/aclocal.m4
@@ -1861,17 +1861,16 @@ dnl Usage example LM_TRY_ENABLE_CFLAG([-Werror=return-type], [CFLAGS])
 dnl
 dnl
 AC_DEFUN([LM_TRY_ENABLE_CFLAG], [
-    AC_MSG_CHECKING([if we can add $1 to CFLAGS])
+    AC_MSG_CHECKING([if we can add $1 to $2 (via CFLAGS)])
     saved_CFLAGS=$CFLAGS;
-    CFLAGS="$1 $CFLAGS";
+    CFLAGS="$1 $$2";
     AC_TRY_COMPILE([],[return 0;],can_enable_flag=true,can_enable_flag=false)
     CFLAGS=$saved_CFLAGS;
     if test "X$can_enable_flag" = "Xtrue"; then
         AC_MSG_RESULT([yes])
-        AS_VAR_SET($2, "$1 $CFLAGS")
+        AS_VAR_SET($2, "$1 $$2")
     else
         AC_MSG_RESULT([no])
-        AS_VAR_SET($2, "$CFLAGS")
     fi
 ])
 
-- 
cgit v1.2.1