Mercurial > hg > octave-lyh

changeset 1261:d5a341c3d981

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[project @ 1995-04-12 01:57:25 by jwe]
author jwe
date Wed, 12 Apr 1995 01:58:39 +0000
parents 1ef158ab5d98
children 3847255e2838
files configure.in octMakefile.in
diffstat 2 files changed, 19 insertions(+), 10 deletions(-) [+]
line wrap: on
line diff
--- a/configure.in
+++ b/configure.in
@@ -20,7 +20,7 @@
 ### along with Octave; see the file COPYING.  If not, write to the Free
 ### Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
 
-AC_REVISION($Revision: 1.117 $)
+AC_REVISION($Revision: 1.118 $)
 AC_PREREQ(2.0)
 AC_INIT(src/octave.cc)
 AC_CONFIG_HEADER(config.h)
@@ -80,24 +80,37 @@
 
 ### Allow the user disable support for GNU info.
 
+INFO_DIR=info
 USE_GNU_INFO=true
 LIBINFO=../info/libinfo.a
 AC_ARG_ENABLE(info,
   [  --enable-info           use GNU info (default is yes)],
-  [if test $enableval = no; then USE_GNU_INFO=false; LIBINFO=""; fi], [])
+  [if test $enableval = no; then
+     USE_GNU_INFO=false;
+     LIBINFO="";
+     INFO_DIR="";
+   fi], [])
 AC_SUBST(USE_GNU_INFO)
 AC_SUBST(LIBINFO)
+AC_SUBST(INFO_DIR)
+
 
 ### Allow the user disable support for command line editing using GNU
 ### readline.
 
+READLINE_DIR=readline
 USE_READLINE=true
 LIBREADLINE=../readline/libreadline.a
 AC_ARG_ENABLE(readline,
   [  --enable-readline       use readline library (default is yes)],
-  [if test "$enableval" = no; then USE_READLINE=false; LIBREADLINE=""; fi], [])
+  [if test "$enableval" = no; then
+     USE_READLINE=false;
+     LIBREADLINE="";
+     READLINE_DIR="";
+   fi], [])
 AC_SUBST(USE_READLINE)
 AC_SUBST(LIBREADLINE)
+AC_SUBST(READLINE_DIR)
 
 ### some defaults
 
@@ -760,11 +773,7 @@
 
 ### Run configure in subdirectories.
 
-info_subdir=
-if $USE_GNU_INFO; then
-  info_subdir=info
-fi
-AC_CONFIG_SUBDIRS(kpathsea libcruft scripts $info_subdir)
+AC_CONFIG_SUBDIRS(kpathsea libcruft scripts $INFO_DIR)
 
 ### Do the substitutions in all the Makefiles.
 
--- a/octMakefile.in
+++ b/octMakefile.in
@@ -30,8 +30,8 @@
 DISTDIRS = kpathsea make
 
 # Subdirectories in which to run `make all'.
-SUBDIRS = libcruft liboctave @DLD_DIR@ info readline kpathsea src \
-	scripts doc 
+SUBDIRS = libcruft liboctave @DLD_DIR@ @INFO_DIR@ @READLINE_DIR@ \
+	kpathsea src scripts doc 
 
 # Subdirectories in which to run `make dist'.
 DISTSUBDIRS = libcruft liboctave info readline src scripts dld test doc