kwo pushed a commit to branch master.

http://git.enlightenment.org/e16/e16.git/commit/?id=33a0c3e595e410c12e8730dedf12d11d09cfaab4

commit 33a0c3e595e410c12e8730dedf12d11d09cfaab4
Author: Kim Woelders <[email protected]>
Date:   Tue May 5 20:09:20 2020 +0200

    Fix obscure m4 problem
    
    The line
    
      define(ec_c_compile_cpp, ifelse([$1], [cpp], [yes], [no]))
    
    potentially caused weird problems later in configure.ac.
    Using m4_define instead cured that.
    So let's do define() -> m4_define() elsewhere too.
---
 m4/ec_visibility.m4 | 2 +-
 m4/ec_warnflags.m4  | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/m4/ec_visibility.m4 b/m4/ec_visibility.m4
index ed64b12a..2116bf3c 100644
--- a/m4/ec_visibility.m4
+++ b/m4/ec_visibility.m4
@@ -26,7 +26,7 @@ AC_DEFUN([EC_C_VISIBILITY],
 [
   AC_REQUIRE([AC_PROG_CC])
 
-  define(ec_c_vis_default, ifelse([$1], [no], [no], [yes]))
+  m4_define([ec_c_vis_default], ifelse([$1], [no], [no], [yes]))
   CFLAGS_VISIBILITY=
   HAVE_VISIBILITY=0
 
diff --git a/m4/ec_warnflags.m4 b/m4/ec_warnflags.m4
index 83f3e2eb..d55e80d2 100644
--- a/m4/ec_warnflags.m4
+++ b/m4/ec_warnflags.m4
@@ -9,7 +9,7 @@ dnl Usage: EC_C_WARNINGS([LANG])
 dnl Set LANG to 'cpp' when compiling for C++
 
 AC_DEFUN([EC_C_WARNINGS], [
-  define(ec_c_compile_cpp, ifelse([$1], [cpp], [yes], [no]))
+  m4_define([ec_c_compile_cpp], ifelse([$1], [cpp], [yes], [no]))
 
   AC_ARG_ENABLE(werror,
     [AS_HELP_STRING([--enable-werror],
@@ -20,7 +20,7 @@ AC_DEFUN([EC_C_WARNINGS], [
     CFLAGS_WARNINGS="-W -Wall -Waggregate-return -Wcast-align -Wpointer-arith 
-Wshadow -Wwrite-strings"
     ifelse(ec_c_compile_cpp, no, [
       CFLAGS_WARNINGS="$CFLAGS_WARNINGS -Wmissing-prototypes 
-Wmissing-declarations -Wstrict-prototypes"
-    ],)
+    ])
 
     if test "x$enable_werror" = "xyes"; then
       CFLAGS_WARNINGS="$CFLAGS_WARNINGS -Werror"

-- 


Reply via email to