# HG changeset patch
# User jwe
# Date 1046732290 0
# Node ID 4dfce8f9ee98edb8002c6350f173e98d491dd01e
# Parent  f6f0c143c6729cb652f4d99765ac6d59d9144506
[project @ 2003-03-03 22:58:10 by jwe]

diff -r f6f0c143c672 -r 4dfce8f9ee98 ChangeLog
--- a/ChangeLog	Mon Mar 03 21:57:37 2003 +0000
+++ b/ChangeLog	Mon Mar 03 22:58:10 2003 +0000
@@ -1,10 +1,14 @@
+2003-03-03  John W. Eaton  <jwe@bevo.che.wisc.edu>
+
+	* configure.in: Undo previous change.
+	* Makeconf.in: Likewise.
+
 2003-03-01  John W. Eaton  <jwe@bevo.che.wisc.edu>
 
 	* configure.in (KPATHSEA_INCFLAGS): New variable.
 	* Makeconf.in (KPATHSEA_INCFLAGS): Substitute it.
 	(do-subst-config-vals): Add it to the list.
 	(INCFLAGS): Add $(KPATHSEA_INCFLAGS).
-	
 
 2003-02-23  Paul Kienzle <pkienzle@users.sf.net>
 
diff -r f6f0c143c672 -r 4dfce8f9ee98 Makeconf.in
--- a/Makeconf.in	Mon Mar 03 21:57:37 2003 +0000
+++ b/Makeconf.in	Mon Mar 03 22:58:10 2003 +0000
@@ -85,7 +85,6 @@
 
 DLFCN_INCFLAGS = @DLFCN_INCFLAGS@
 GLOB_INCFLAGS = @GLOB_INCFLAGS@
-KPATHSEA_INCFLAGS = @KPATHSEA_INCFLAGS@
 
 # Clean up INCFLAGS a bit if we are not compiling in a separate
 # directory.
@@ -103,8 +102,7 @@
 	-I$(top_srcdir)/liboctave -I$(top_srcdir)/src \
 	-I$(top_srcdir)/libcruft/misc
 endif
-INCFLAGS = $(TMP_IF_1) $(TMP_IF_2) $(DLFCN_INCFLAGS) \
-  $(GLOB_INCFLAGS) $(KPATHSEA_INCFLAGS)
+INCFLAGS = $(TMP_IF_1) $(TMP_IF_2) $(DLFCN_INCFLAGS) $(GLOB_INCFLAGS)
 
 LIBFLAGS = -L$(TOPDIR)
 
@@ -404,7 +402,6 @@
   -e "s;%OCTAVE_CONF_GLOB_INCFLAGS%;\"${GLOB_INCFLAGS}\";" \
   -e "s;%OCTAVE_CONF_INCFLAGS%;\"${INCFLAGS}\";" \
   -e "s;%OCTAVE_CONF_INCLUDE_LINK_DEPS%;\"${INCLUDE_LINK_DEPS}\";"\
-  -e "s;%OCTAVE_CONF_KPATHSEA_INCFLAGS%;\"${KPATHSEA_INCFLAGS}\";" \
   -e "s;%OCTAVE_CONF_LD_CXX%;\"${LD_CXX}\";" \
   -e "s;%OCTAVE_CONF_LDFLAGS%;\"${LDFLAGS}\";" \
   -e "s;%OCTAVE_CONF_LD_STATIC_FLAG%;\"${LD_STATIC_FLAG}\";" \
diff -r f6f0c143c672 -r 4dfce8f9ee98 configure.in
--- a/configure.in	Mon Mar 03 21:57:37 2003 +0000
+++ b/configure.in	Mon Mar 03 22:58:10 2003 +0000
@@ -22,7 +22,7 @@
 ### 02111-1307, USA. 
 
 AC_INIT
-AC_REVISION($Revision: 1.419 $)
+AC_REVISION($Revision: 1.420 $)
 AC_PREREQ(2.52)
 AC_CONFIG_SRCDIR([src/octave.cc])
 AC_CONFIG_HEADER(config.h)
@@ -139,9 +139,6 @@
 ### Don't change the definition of LIBKPATHSEA without understanding
 ### the way it is used in liboctave/Makefile.
 
-KPATHSEA_INCFLAGS='-I$(top_srcdir)/kpathsea -I$(TOPDIR)/kpathsea'
-AC_SUBST(KPATHSEA_INCFLAGS)
-
 LIBKPATHSEA='$(TOPDIR)/kpathsea/libkpathsea.$(LIBEXT)'
 AC_SUBST(LIBKPATHSEA)
 
diff -r f6f0c143c672 -r 4dfce8f9ee98 liboctave/ChangeLog
--- a/liboctave/ChangeLog	Mon Mar 03 21:57:37 2003 +0000
+++ b/liboctave/ChangeLog	Mon Mar 03 22:58:10 2003 +0000
@@ -1,3 +1,7 @@
+2003-03-03  John W. Eaton  <jwe@bevo.che.wisc.edu>
+
+	* oct-getopt.c: Include <kpathsea/getopt.h>, not "getopt.h".
+
 2003-02-21  John W. Eaton  <jwe@bevo.che.wisc.edu>
 
 	* oct-alloc.h (DECLARE_OCTAVE_ALLOCATOR): Handle systems with or
diff -r f6f0c143c672 -r 4dfce8f9ee98 liboctave/oct-getopt.c
--- a/liboctave/oct-getopt.c	Mon Mar 03 21:57:37 2003 +0000
+++ b/liboctave/oct-getopt.c	Mon Mar 03 22:58:10 2003 +0000
@@ -24,7 +24,7 @@
 #include <config.h>
 #endif
 
-#include "getopt.h"
+#include <kpathsea/getopt.h>
 
 int
 octave_getopt (int argc, char *const *argv, const char *optstring)