diff m4/alloca.m4 @ 40229:6abc91ece034

alloca-opt: Fix conflict mingw's new <alloca.h> file. Reported by Eli Zaretskii <eliz@gnu.org>. * lib/alloca.in.h: On mingw systems that have <alloca.h>, include that. * m4/alloca.m4 (gl_FUNC_ALLOCA): Set HAVE_ALLOCA_H. * modules/alloca-opt (Makefile.am): Substitute HAVE_ALLOCA_H.
author Bruno Haible <bruno@clisp.org>
date Sun, 10 Mar 2019 20:39:34 +0100
parents b06060465f09
children
line wrap: on
line diff
--- a/m4/alloca.m4	Sun Mar 10 10:11:53 2019 -0700
+++ b/m4/alloca.m4	Sun Mar 10 20:39:34 2019 +0100
@@ -1,4 +1,4 @@
-# alloca.m4 serial 14
+# alloca.m4 serial 15
 dnl Copyright (C) 2002-2004, 2006-2007, 2009-2019 Free Software Foundation,
 dnl Inc.
 dnl This file is free software; the Free Software Foundation
@@ -37,6 +37,13 @@
   fi
   AC_SUBST([ALLOCA_H])
   AM_CONDITIONAL([GL_GENERATE_ALLOCA_H], [test -n "$ALLOCA_H"])
+
+  if test $ac_cv_working_alloca_h = yes; then
+    HAVE_ALLOCA_H=1
+  else
+    HAVE_ALLOCA_H=0
+  fi
+  AC_SUBST([HAVE_ALLOCA_H])
 ])
 
 # Prerequisites of lib/alloca.c.