# HG changeset patch
# User jwe
# Date 1102081228 0
# Node ID 1dbe2c93af518eb37a8117fe8b0cc09741d1d3bb
# Parent  5353ef6ac73cabd3cb6d8e5c812c706a0fac778d
[project @ 2004-12-03 13:40:28 by jwe]

diff -r 5353ef6ac73c -r 1dbe2c93af51 ChangeLog
--- a/ChangeLog	Fri Dec 03 13:29:56 2004 +0000
+++ b/ChangeLog	Fri Dec 03 13:40:28 2004 +0000
@@ -1,3 +1,9 @@
+2004-12-03  John W. Eaton  <jwe@octave.org>
+
+	* aclocal.m4 (OCTAVE_PROG_GPERF): Check with -L C++, not -L ANSI_C.
+	* Makefile.in (header-msg): Change recommended gperf version to
+	3.0.1 or more recent.
+
 2004-11-12  John W. Eaton  <jwe@octave.org>
 
 	* Back off on -ffloat-store until we decide whether it is really
diff -r 5353ef6ac73c -r 1dbe2c93af51 Makefile.in
--- a/Makefile.in	Fri Dec 03 13:29:56 2004 +0000
+++ b/Makefile.in	Fri Dec 03 13:40:28 2004 +0000
@@ -52,7 +52,7 @@
 	@echo "*    bison (1.31 or a more recent version) -- required if"
 	@echo "*    you need to recreate parse.cc from parse.y"
 	@echo "*"
-	@echo "*    gperf (2.7.1 or a more recent version) -- required if"
+	@echo "*    gperf (3.0.1 or a more recent version) -- required if"
 	@echo "*    you need to recreate oct-gperf.h from octave.gperf"
 	@echo "*"
 	@echo "*  Now would be a good time to read INSTALL.OCTAVE if"
diff -r 5353ef6ac73c -r 1dbe2c93af51 aclocal.m4
--- a/aclocal.m4	Fri Dec 03 13:29:56 2004 +0000
+++ b/aclocal.m4	Fri Dec 03 13:40:28 2004 +0000
@@ -564,11 +564,11 @@
 %}
 struct octave_kw { const char *name; int tok; octave_kw_id kw_id; };
 %%
-foo" | $GPERF -t -C -D -E -G -L ANSI-C -H octave_kw_hash -N octave_kw_lookup > /dev/null 2>&1; then
+foo" | $GPERF -t -C -D -E -G -L C++ -H octave_kw_hash -N octave_kw_lookup > /dev/null 2>&1; then
       true
     else
       GPERF=""
-      warn_gperf="I found gperf, but it does not support all of the following options: -t -C -D -E -G -L ANSI-C -H -N; you need gperf 2.7 or a more recent version"
+      warn_gperf="I found gperf, but it does not support all of the following options: -t -C -D -E -G -L C++ -H -N; you need gperf 3.0.1 or a more recent version"
       AC_MSG_WARN($warn_gperf)
     fi
   else
diff -r 5353ef6ac73c -r 1dbe2c93af51 src/ChangeLog
--- a/src/ChangeLog	Fri Dec 03 13:29:56 2004 +0000
+++ b/src/ChangeLog	Fri Dec 03 13:40:28 2004 +0000
@@ -44,7 +44,7 @@
 
 2004-11-17  John W. Eaton  <jwe@octave.org>
 
-	* version.h (OCTAVE_VERSION): Now 2.1.62.
+	* version.h (OCTAVE_VERSION): Now 2.1.63.
 	(OCTAVE_API_VERSION): Now api-v12.
 
 2004-11-17  David Bateman  <dbateman@free.fr>