diff --git a/libiberty/ChangeLog b/libiberty/ChangeLog
index 7fdce6ab1b5..f986eab983d 100644
--- a/libiberty/ChangeLog
+++ b/libiberty/ChangeLog
@@ -1,3 +1,9 @@
+2001-11-26  DJ Delorie  <dj@redhat.com>
+
+	* configure.in: Check for alloca.h (for regex.c and putenv.c).
+	* configure: Regenerate.
+	* config.h: Add HAVE_ALLOCA_H.
+
 2001-11-16  Kaveh R. Ghazi  <ghazi@caip.rutgers.edu>
 
 	* regex.c: Check defined(__STDC__) || defined(ALMOST_STDC) ||
diff --git a/libiberty/config.in b/libiberty/config.in
index 67042c0f431..c1434f1c1dd 100644
--- a/libiberty/config.in
+++ b/libiberty/config.in
@@ -183,6 +183,9 @@
 /* Define if you have the <fcntl.h> header file.  */
 #undef HAVE_FCNTL_H
 
+/* Define if you have the <alloca.h> header file.  */
+#undef HAVE_ALLOCA_H
+
 /* Define if you have the <limits.h> header file.  */
 #undef HAVE_LIMITS_H
 
diff --git a/libiberty/configure b/libiberty/configure
index d7bd75c4d5e..8800349cd66 100755
--- a/libiberty/configure
+++ b/libiberty/configure
@@ -1275,7 +1275,7 @@ else
 fi
 echo "$ac_t""$CPP" 1>&6
 
-for ac_hdr in sys/file.h sys/param.h limits.h stdlib.h string.h unistd.h strings.h sys/time.h time.h sys/resource.h sys/stat.h sys/mman.h fcntl.h
+for ac_hdr in sys/file.h sys/param.h limits.h stdlib.h string.h unistd.h strings.h sys/time.h time.h sys/resource.h sys/stat.h sys/mman.h fcntl.h alloca.h
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
diff --git a/libiberty/configure.in b/libiberty/configure.in
index 7fc4856e606..d34f8369bf4 100644
--- a/libiberty/configure.in
+++ b/libiberty/configure.in
@@ -120,7 +120,7 @@ AC_SUBST_FILE(host_makefile_frag)
 # It's OK to check for header files.  Although the compiler may not be
 # able to link anything, it had better be able to at least compile
 # something.
-AC_CHECK_HEADERS(sys/file.h sys/param.h limits.h stdlib.h string.h unistd.h strings.h sys/time.h time.h sys/resource.h sys/stat.h sys/mman.h fcntl.h)
+AC_CHECK_HEADERS(sys/file.h sys/param.h limits.h stdlib.h string.h unistd.h strings.h sys/time.h time.h sys/resource.h sys/stat.h sys/mman.h fcntl.h alloca.h)
 AC_HEADER_SYS_WAIT
 AC_HEADER_TIME