Mercurial > hg > octave-max

changeset 3673:e0b46234555e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[project @ 2000-06-05 18:28:54 by jwe]
author jwe
date Mon, 05 Jun 2000 18:28:54 +0000
parents a0952f6b163e
children ef883684e58e
files ChangeLog aclocal.m4 configure.in
diffstat 3 files changed, 24 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2000-06-05  John W. Eaton  <jwe@bevo.che.wisc.edu>
+
+	* aclocal.m4 (OCTAVE_PROG_GPERF): New macro.
+	* configure.in: Use it.  Print warning at end if gperf is missing.
+
 2000-04-20  John W. Eaton  <jwe@bevo.che.wisc.edu>
 
 	* mkoctfile.in: Try moving output file first.  But comment these
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -827,6 +827,18 @@
 fi
 ])
 dnl
+dnl Is gperf installed?
+dnl
+dnl OCTAVE_PROG_GPERF
+AC_DEFUN(OCTAVE_PROG_GPERF,
+[AC_CHECK_PROG(GPERF, gperf, gperf, [])
+if test -z "$GPERF"; then
+  warn_gperf="I didn't find gperf, but it's only a problem if you need to reconstruct oct-gperf.h"
+  AC_MSG_WARN($warn_gperf)
+fi
+AC_SUBST(GPERF)
+])
+dnl
 dnl Find nm.
 dnl
 dnl OCTAVE_PROG_NM
--- a/configure.in
+++ b/configure.in
@@ -21,7 +21,7 @@
 ### Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 ### 02111-1307, USA. 
 
-AC_REVISION($Revision: 1.326 $)
+AC_REVISION($Revision: 1.327 $)
 AC_PREREQ(2.9)
 AC_INIT(src/octave.cc)
 AC_CONFIG_HEADER(config.h)
@@ -1099,6 +1099,7 @@
 
 OCTAVE_PROG_GNUPLOT
 OCTAVE_PROG_PAGER
+OCTAVE_PROG_GPERF
 
 EXE=
 case "$canonical_host_type" in
@@ -1253,6 +1254,11 @@
   warn_msg_printed=true
 fi
 
+if test -n "$warn_gperf"; then
+  AC_MSG_WARN($warn_gperf)
+  warn_msg_printed=true
+fi
+
 if test -n "$warn_flex"; then
   AC_MSG_WARN($warn_flex)
   warn_msg_printed=true