# HG changeset patch
# User Bruno Haible <bruno@clisp.org>
# Date 1274696583 -7200
# Node ID df004f9880d225a49d841ca5533274e332d68684
# Parent  8c0d5f7896a24dc4fbc3a51c0566fd0579efc983
regex: Don't require alloca.

diff --git a/ChangeLog b/ChangeLog
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2010-05-24  Bruno Haible  <bruno@clisp.org>
+
+	regex: Don't require alloca.
+	* modules/regex (Depends-on): Remove alloca. Add alloca-opt.
+	* lib/regex_internal.h (alloca): Ensure it's defined even if we call it
+	only inside if (0).
+
 2010-05-23  Jim Meyering  <meyering@redhat.com>
 
 	test-renameat.c: include <sys/stat.h>
diff --git a/lib/regex_internal.h b/lib/regex_internal.h
--- a/lib/regex_internal.h
+++ b/lib/regex_internal.h
@@ -467,6 +467,8 @@
 # else
 /* alloca is implemented with malloc, so just use malloc.  */
 #  define __libc_use_alloca(n) 0
+#  undef alloca
+#  define alloca(n) malloc (n)
 # endif
 #endif
 
diff --git a/modules/regex b/modules/regex
--- a/modules/regex
+++ b/modules/regex
@@ -12,7 +12,7 @@
 m4/mbstate_t.m4
 
 Depends-on:
-alloca
+alloca-opt
 btowc
 extensions
 gettext-h