Mercurial > hg > octave-avbm
changeset 1145:185b16c1be3d
[project @ 1995-02-26 06:17:04 by jwe]
author | jwe |
---|---|
date | Sun, 26 Feb 1995 06:20:18 +0000 |
parents | 322aa3f3aab0 |
children | b78e479dbf16 |
files | configure.in src/Makefile.in |
diffstat | 2 files changed, 12 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/configure.in +++ b/configure.in @@ -21,7 +21,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.95 $) +AC_REVISION($Revision: 1.96 $) AC_PREREQ(2.0) AC_INIT(src/octave.cc) AC_CONFIG_HEADER(config.h kpathsea/c-auto.h) @@ -71,6 +71,11 @@ [ --enable-info use GNU info (default is yes)], USE_GNU_INFO=true, USE_GNU_INFO=false) AC_SUBST(USE_GNU_INFO) +LIBINFO= +if $USE_GNU_INFO; then + LIBINFO=../info/libinfo.a +else +AC_SUBST(LIBINFO) ### Allow the user disable support for command line editing using GNU ### readline. @@ -80,6 +85,11 @@ [ --enable-readline use readline library (default is yes)], USE_READLINE=true, USE_READLINE=false) AC_SUBST(USE_READLINE) +LIBREADLINE= +if $USE_READLINE; then + LIBREADLINE=../readline/libreadline.a +else +AC_SUBST(LIBREADLINE) ### some defaults
--- a/src/Makefile.in +++ b/src/Makefile.in @@ -112,8 +112,7 @@ # nothing. OCTAVE_LIBS = @LIBOCTDLD@ ../liboctave/liboctave.a libtinst.a \ - ../libcruft/libcruft.a ../info/libinfo.a \ - ../readline/libreadline.a \ + ../libcruft/libcruft.a @LIBINFO@ @LIBREADLINE@ \ ../kpathsea/libkpathsea.a @LIBDLD@ DISTFILES = Makefile.in mkdefs mkbuiltins \