Use alloca.h instead of liballoca.h.

3 files changed, 91 insertions, 10 deletions

diff --git a/m4/ChangeLog b/m4/ChangeLog
index fb70d33..6092eeb 100644
--- a/m4/ChangeLog
+++ b/m4/ChangeLog
@@ -1,5 +1,11 @@
 2003-01-12  Bruno Haible  <bruno@clisp.org>
 
+	* onceonly.m4: New file, from gnulib.
+	* alloca.m4: New file, from gnulib.
+	* Makefile.am (EXTRA_DIST): Add them.
+
+2003-01-12  Bruno Haible  <bruno@clisp.org>
+
 	* wint_t.m4: New file.
 	* Makefile.am (EXTRA_DIST): Add it.
 
diff --git a/m4/Makefile.am b/m4/Makefile.am
index b22a795..a813999 100644
--- a/m4/Makefile.am
+++ b/m4/Makefile.am
@@ -4,14 +4,53 @@ aclocaldir = @aclocaldir@
 aclocal_DATA = codeset.m4 gettext.m4 glibc21.m4 iconv.m4 intdiv0.m4 inttypes.m4 inttypes_h.m4 inttypes-pri.m4 isc-posix.m4 lib-ld.m4 lib-link.m4 lib-prefix.m4 lcmessage.m4 progtest.m4 stdint_h.m4 uintmax_t.m4 ulonglong.m4
 
 # Generate this list with
-# find . -type f -name '*.m4' -printf '%f\n'|sort |fmt |tr '\012' @ \
-#   |sed 's/@$/%/;s/@/ \\@/g' |tr @% '\012\012'
+# find . -type f -name '*.m4' -printf '%f\n' | sort | tr '\012' @ | sed 's/@$/%/;s/@/ \\@/g' | tr @% '\012\012'
 EXTRA_DIST = README \
-backupfile.m4 codeset.m4 error.m4 fixautomake.m4 flex.m4 fnmatch.m4 gcj.m4 \
-getline.m4 gettext.m4 glibc21.m4 hostname.m4 iconv.m4 intdiv0.m4 intmax.m4 \
-inttypes.m4 inttypes_h.m4 inttypes-pri.m4 isc-posix.m4 javacomp.m4 \
-javaexec.m4 lcmessage.m4 lib-ld.m4 lib-link.m4 lib-prefix.m4 libtool.m4 \
-longdouble.m4 longlong.m4 mbrtowc.m4 mbstate_t.m4 mbswidth.m4 mkdtemp.m4 \
-progtest.m4 setenv.m4 setlocale.m4 siginfo.m4 signalblocking.m4 signed.m4 \
-ssize_t.m4 stdbool.m4 stdint_h.m4 tmpdir.m4 uintmax_t.m4 ulonglong.m4 \
-unionwait.m4 wchar_t.m4 wint_t.m4
+alloca.m4 \
+backupfile.m4 \
+codeset.m4 \
+error.m4 \
+fixautomake.m4 \
+flex.m4 \
+fnmatch.m4 \
+gcj.m4 \
+getline.m4 \
+gettext.m4 \
+glibc21.m4 \
+hostname.m4 \
+iconv.m4 \
+intdiv0.m4 \
+intmax.m4 \
+inttypes.m4 \
+inttypes_h.m4 \
+inttypes-pri.m4 \
+isc-posix.m4 \
+javacomp.m4 \
+javaexec.m4 \
+lcmessage.m4 \
+lib-ld.m4 \
+lib-link.m4 \
+lib-prefix.m4 \
+libtool.m4 \
+longdouble.m4 \
+longlong.m4 \
+mbrtowc.m4 \
+mbstate_t.m4 \
+mbswidth.m4 \
+mkdtemp.m4 \
+onceonly.m4 \
+progtest.m4 \
+setenv.m4 \
+setlocale.m4 \
+siginfo.m4 \
+signalblocking.m4 \
+signed.m4 \
+ssize_t.m4 \
+stdbool.m4 \
+stdint_h.m4 \
+tmpdir.m4 \
+uintmax_t.m4 \
+ulonglong.m4 \
+unionwait.m4 \
+wchar_t.m4 \
+wint_t.m4
diff --git a/m4/alloca.m4 b/m4/alloca.m4
new file mode 100644
index 0000000..3a4ee7e
--- /dev/null
+++ b/m4/alloca.m4
@@ -0,0 +1,36 @@
+# alloca.m4 serial 2
+dnl Copyright (C) 2002-2003 Free Software Foundation, Inc.
+dnl This file is free software, distributed under the terms of the GNU
+dnl General Public License.  As a special exception to the GNU General
+dnl Public License, this file may be distributed as part of a program
+dnl that contains a configuration script generated by Autoconf, under
+dnl the same distribution terms as the rest of that program.
+
+AC_DEFUN([gl_FUNC_ALLOCA],
+[
+  dnl Work around a bug of AC_EGREP_CPP in autoconf-2.57.
+  AC_REQUIRE([AC_PROG_CPP])
+  AC_REQUIRE([AC_PROG_EGREP])
+
+  AC_REQUIRE([AC_FUNC_ALLOCA])
+  if test $ac_cv_func_alloca_works = no; then
+    gl_PREREQ_ALLOCA
+  fi
+
+  # Define an additional variable used in the Makefile substitution.
+
+  AC_EGREP_CPP([Need own alloca], [
+#if defined __GNUC__ || defined _MSC_VER || !HAVE_ALLOCA_H
+  Need own alloca
+#endif
+    ],
+    ALLOCA_H=alloca.h,
+    ALLOCA_H=)
+  AC_SUBST([ALLOCA_H])
+])
+
+# Prerequisites of lib/alloca.c.
+# STACK_DIRECTION is already handled by AC_FUNC_ALLOCA.
+AC_DEFUN([gl_PREREQ_ALLOCA], [
+  AC_CHECK_HEADERS_ONCE(stdlib.h string.h)
+])