diff --git a/ChangeLog b/ChangeLog
index afbd7ed43..47038a484 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2000-10-12  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>
+
+	* configure.in: define GLIB_HAVE_ALLOCA_H instead of including
+	alloca.h in glibconfig.h, GLIB_HAVE_ALLOCA_H is used in glib.h.
+
 2000-10-09  Raja R Harinath  <harinath@cs.umn.edu>
 
 	Work with beta autoconf 2.50.
diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index afbd7ed43..47038a484 100644
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,8 @@
+2000-10-12  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>
+
+	* configure.in: define GLIB_HAVE_ALLOCA_H instead of including
+	alloca.h in glibconfig.h, GLIB_HAVE_ALLOCA_H is used in glib.h.
+
 2000-10-09  Raja R Harinath  <harinath@cs.umn.edu>
 
 	Work with beta autoconf 2.50.
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index afbd7ed43..47038a484 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+2000-10-12  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>
+
+	* configure.in: define GLIB_HAVE_ALLOCA_H instead of including
+	alloca.h in glibconfig.h, GLIB_HAVE_ALLOCA_H is used in glib.h.
+
 2000-10-09  Raja R Harinath  <harinath@cs.umn.edu>
 
 	Work with beta autoconf 2.50.
diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12
index afbd7ed43..47038a484 100644
--- a/ChangeLog.pre-2-12
+++ b/ChangeLog.pre-2-12
@@ -1,3 +1,8 @@
+2000-10-12  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>
+
+	* configure.in: define GLIB_HAVE_ALLOCA_H instead of including
+	alloca.h in glibconfig.h, GLIB_HAVE_ALLOCA_H is used in glib.h.
+
 2000-10-09  Raja R Harinath  <harinath@cs.umn.edu>
 
 	Work with beta autoconf 2.50.
diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index afbd7ed43..47038a484 100644
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,8 @@
+2000-10-12  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>
+
+	* configure.in: define GLIB_HAVE_ALLOCA_H instead of including
+	alloca.h in glibconfig.h, GLIB_HAVE_ALLOCA_H is used in glib.h.
+
 2000-10-09  Raja R Harinath  <harinath@cs.umn.edu>
 
 	Work with beta autoconf 2.50.
diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index afbd7ed43..47038a484 100644
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,8 @@
+2000-10-12  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>
+
+	* configure.in: define GLIB_HAVE_ALLOCA_H instead of including
+	alloca.h in glibconfig.h, GLIB_HAVE_ALLOCA_H is used in glib.h.
+
 2000-10-09  Raja R Harinath  <harinath@cs.umn.edu>
 
 	Work with beta autoconf 2.50.
diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index afbd7ed43..47038a484 100644
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,8 @@
+2000-10-12  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>
+
+	* configure.in: define GLIB_HAVE_ALLOCA_H instead of including
+	alloca.h in glibconfig.h, GLIB_HAVE_ALLOCA_H is used in glib.h.
+
 2000-10-09  Raja R Harinath  <harinath@cs.umn.edu>
 
 	Work with beta autoconf 2.50.
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index afbd7ed43..47038a484 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,8 @@
+2000-10-12  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>
+
+	* configure.in: define GLIB_HAVE_ALLOCA_H instead of including
+	alloca.h in glibconfig.h, GLIB_HAVE_ALLOCA_H is used in glib.h.
+
 2000-10-09  Raja R Harinath  <harinath@cs.umn.edu>
 
 	Work with beta autoconf 2.50.
diff --git a/configure.in b/configure.in
index 887cc82a2..9fd4c12a5 100644
--- a/configure.in
+++ b/configure.in
@@ -1193,7 +1193,7 @@ _______EOF
 	  echo '#include <'"$g_mutex_header_file"'>' >> $outfile
 	fi
 	if test "$glib_header_alloca_h" = "yes"; then
-	  echo  '#include <alloca.h>' >> $outfile
+	  echo '#define GLIB_HAVE_ALLOCA_H' >> $outfile
 	fi
 	if test x$glib_sys_poll_h = xyes; then
 	  echo '#define GLIB_HAVE_SYS_POLL_H' >> $outfile