regex: Don't require alloca.

diff --git a/ChangeLog b/ChangeLog
index 39a7215b484ac273e69f6dfd128e1d318a7a1295..1b37e94cdb6e9f1d538fca86e3768e31652a2e1d 100644 (file)
--- 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
index e1b4c61b36e0b0974077fa2bae9387c3e857aad2..dc94e2cbcbc333bda41ba36ec6484fe4148b2db1 100644 (file)
--- a/lib/regex_internal.h
+++ b/lib/regex_internal.h
@@ -467,6 +467,8 @@ static unsigned int re_string_context_at (const re_string_t *input, Idx idx,
 # 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
index f51640621c0c1525ac6ef3316d138eafe50f8372..36ad446390470ed284b2a529c0c469841b333e72 100644 (file)
--- a/modules/regex
+++ b/modules/regex
@@ -12,7 +12,7 @@ m4/regex.m4
 m4/mbstate_t.m4
 
 Depends-on:
-alloca
+alloca-opt
 btowc
 extensions
 gettext-h