# HG changeset patch
# User jwe
# Date 1068662371 0
# Node ID 59e180c8cb61fda4469514a9a5760de29e5a9f49
# Parent  1ed6cfbc8ea4054f3ba7b87b93292ebc2f3ec359
[project @ 2003-11-12 18:36:24 by jwe]

diff --git a/ChangeLog b/ChangeLog
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2003-11-12  John W. Eaton  <jwe@bevo.che.wisc.edu>
+
+	* configure.in: If we need alloca, then also include it in LIBGLOB.
+
 2003-11-10  John W. Eaton  <jwe@bevo.che.wisc.edu>
 
 	* configure.in: Preserve CFLAGS and CXXFLAGS before doing anything.
diff --git a/configure.in b/configure.in
--- a/configure.in
+++ b/configure.in
@@ -29,7 +29,7 @@
 EXTERN_CXXFLAGS="$CXXFLAGS"
 
 AC_INIT
-AC_REVISION($Revision: 1.436 $)
+AC_REVISION($Revision: 1.438 $)
 AC_PREREQ(2.57)
 AC_CONFIG_SRCDIR([src/octave.cc])
 AC_CONFIG_HEADER(config.h)
@@ -865,7 +865,7 @@
 
 ### Does the C compiler handle alloca() and const correctly?
 
-AC_FUNC_ALLOCA([])
+AC_FUNC_ALLOCA
 AC_C_CONST
 
 ### See if we should define NPOS.
@@ -934,7 +934,11 @@
 ## avoids the problem.
 
 GLOB_DIR=glob
-LIBGLOB='$(TOPDIR)/glob/glob.o $(TOPDIR)/glob/fnmatch.o'
+if test -n "$(ALLOCA)"; then
+  LIBGLOB='$(TOPDIR)/glob/glob.o $(TOPDIR)/glob/fnmatch.o $(TOPDIR)/glob/alloca.o'
+else
+  LIBGLOB='$(TOPDIR)/glob/glob.o $(TOPDIR)/glob/fnmatch.o'
+fi
 GLOB_INCFLAGS='-I$(top_srcdir)/glob -I$(TOPDIR)/glob'
 if test "$have_fnmatch_h" = yes && test "$have_glob_h" = yes; then
   AC_EGREP_CPP(yes, [#include <fnmatch.h>