Mercurial > octave-nkf
changeset 2488:d4eb39779b88
[project @ 1996-11-08 22:35:59 by jwe]
| author | jwe |
|---|---|
| date | Fri, 08 Nov 1996 22:37:42 +0000 |
| parents | 8c6e9535cbda |
| children | 269ecd74cebe |
| files | ChangeLog Makeconf.in configure.in doc/interpreter/install.texi src/ChangeLog src/defaults.h.in |
| diffstat | 6 files changed, 38 insertions(+), 84 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Fri Nov 08 15:58:53 1996 +0000 +++ b/ChangeLog Fri Nov 08 22:37:42 1996 +0000 @@ -1,3 +1,16 @@ +Fri Nov 8 11:15:07 1996 John W. Eaton <jwe@bevo.che.wisc.edu> + + * Makeconf.in (version): Look in $(TOPDIR)/src then + $(srcdir)/$(TOPDIR)/src for version.h. + + * configure.in (TERMLIBS): Print warning message if no term + library is found. + (CXXLIB_LIST, CXXLIB_PATH, FLIB_LIST, FLIB_PATH): Delete. + * Makeconf.in (CXXLIB_LIST, CXXLIB_PATH, FLIB_LIST, FLIB_PATH): + Delete. + (do-subst-default-vals): Delete CXXLIB_LIST, CXXLIB_PATH, + FLIB_LIST, and FLIB_PATH from the list. + Thu Nov 7 12:43:36 1996 John W. Eaton <jwe@bevo.che.wisc.edu> * octMakefile.in (bin-dist-tar): Delete references to octtopnm.
--- a/Makeconf.in Fri Nov 08 15:58:53 1996 +0000 +++ b/Makeconf.in Fri Nov 08 22:37:42 1996 +0000 @@ -88,7 +88,6 @@ ALL_CFLAGS = $(INCFLAGS) $(DEFS) $(GCC_IEEE_FP_FLAG) $(CFLAGS) BUG_CFLAGS = $(DEFS) $(GCC_IEEE_FP_FLAG) $(CFLAGS) - CXX = @CXX@ CXX_VERSION = @CXX_VERSION@ CXXCPP = @CXXCPP@ @@ -112,12 +111,8 @@ RLD_FLAG = @RLD_FLAG@ FLIBS = @FLIBS@ -FLIB_LIST = @FLIB_LIST@ -FLIB_PATH = @FLIB_PATH@ CXXLIBS = @CXXLIBS@ -CXXLIB_LIST = @CXXLIB_LIST@ -CXXLIB_PATH = @CXXLIB_PATH@ TERMLIBS = @TERMLIBS@ LIBPLPLOT = @LIBPLPLOT@ @@ -133,9 +128,10 @@ # A shell command to extract the version number from version.h. getversion = sed -e '/VERSION/!d' -e 's/.*"\(.*\)".*$$/\1/' -e q -# The version number. TOPDIR is something like `.' or `..' or `../..' -# and gets us back up to the top level of the source tree. -version := $(shell $(getversion) $(srcdir)/$(TOPDIR)/src/version.h) +# Look for version.h to get version information. +xfiles := $(TOPDIR)/src/version.h $(srcdir)/$(TOPDIR)/src/version.h +version_file := $(firstword $(foreach file, $(xfiles), $(wildcard $(file)))) +version := $(shell $(getversion) $(version_file)) # ==================== Where To Install Things ==================== @@ -360,10 +356,6 @@ -e "s;%OCTAVE_LOCALOCTFILEPATH%;\"${localoctfilepath}\";" \ -e "s;%OCTAVE_FCNFILEPATH%;\"${fcnfilepath}\";" \ -e "s;%OCTAVE_IMAGEPATH%;\"${imagepath}\";" \ - -e "s;%TARGET_HOST_TYPE%;\"${target_host_type}\";" \ - -e "s;%FLIB_LIST%;\"${FLIB_LIST}\";" \ - -e "s;%FLIB_PATH%;\"${FLIB_PATH}\";" \ - -e "s;%CXXLIB_LIST%;\"${CXXLIB_LIST}\";" \ - -e "s;%CXXLIB_PATH%;\"${CXXLIB_PATH}\";" + -e "s;%TARGET_HOST_TYPE%;\"${target_host_type}\";" $(top_srcdir)/move-if-change $@.tmp $@ endef
--- a/configure.in Fri Nov 08 15:58:53 1996 +0000 +++ b/configure.in Fri Nov 08 22:37:42 1996 +0000 @@ -18,9 +18,10 @@ ### ### You should have received a copy of the GNU General Public License ### along with Octave; see the file COPYING. If not, write to the Free -### Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +### Software Foundation, 59 Temple Place - Suite 330, Boston, MA +### 02111-1307, USA. -AC_REVISION($Revision: 1.229 $) +AC_REVISION($Revision: 1.230 $) AC_PREREQ(2.9) AC_INIT(src/octave.cc) AC_CONFIG_HEADER(config.h) @@ -603,52 +604,6 @@ AC_SUBST(F2CFLAGS) AC_SUBST_FILE(f77_rules_frag) -### Extract libraries and directories from FLIBS and CXXLIBS. -### -### Leave only libraries, with -lfoo converted to libfoo.a: - -changequote(,)dnl -FLIB_LIST=`echo " $FLIBS " | sed -e 's/ -Xlinker *[^ ]*/ /g' \ - -e 's/ -[LR] *[^ ]*/ /g' \ - -e 's/ -l *\([^ ]*\)/ lib\1.a/g' -e 's/ -u *[^ ]*/ /g' \ - -e 's/ [^ ]*\.o//g' \ - -e 's/^ *//' -e 's/ *$//' -e 's/ */:/g'` - -CXXLIB_LIST=`echo " $CXXLIBS " | sed -e 's/ -Xlinker *[^ ]*/ /g' \ - -e 's/ -[LR] *[^ ]*/ /g' \ - -e 's/ -l *\([^ ]*\)/ lib\1.a/g' -e 's/ -u *[^ ]*/ /g' \ - -e 's/ [^ ]*\.o//g' \ - -e 's/^ *//' -e 's/ *$//' -e 's/ */:/g'` - -### Leave only directories where libraries might be found: - -FLIB_PATH=`echo " $FLIBS " | sed \ - -e 's/ / /g' -e 's/ -Xlinker *[^ ]*/ /g' \ - -e 's/ -[LR] *\([^ ]*\)/ \1/g' -e 's, /[^ ]*\.a , ,g' \ - -e 's/ -l *[^ ]*/ /g' -e 's/ -u *[^ ]*/ /g' \ - -e 's/ [^ ]*\.o//g' \ - -e 's/^ *//' -e 's/ *$//' -e 's/ */:/g'` - -CXXLIB_PATH=`echo " $CXXLIBS " | sed -e 's/ -Xlinker *[^ ]*/ /g' \ - -e 's/ -[LR] *\([^ ]*\)/ \1/g' -e 's, /[^ ]*\.a , ,g' \ - -e 's/ / /g' -e 's/ -Xlinker *[^ ]*/ /g' \ - -e 's/ -l *[^ ]*/ /g' -e 's/ -u *[^ ]*/ /g' \ - -e 's/ [^ ]*\.o//g' \ - -e 's/^ *//' -e 's/ *$//' -e 's/ */:/g'` -changequote([,])dnl - -AC_MSG_RESULT([defining FLIB_LIST to be $FLIB_LIST]) -AC_MSG_RESULT([defining FLIB_PATH to be $FLIB_PATH]) - -AC_MSG_RESULT([defining CXXLIB_LIST to be $CXXLIB_LIST]) -AC_MSG_RESULT([defining CXXLIB_PATH to be $CXXLIB_PATH]) - -AC_SUBST(FLIB_LIST) -AC_SUBST(FLIB_PATH) - -AC_SUBST(CXXLIB_LIST) -AC_SUBST(CXXLIB_PATH) - ### Checks for header files. AC_HEADER_STDC @@ -657,10 +612,10 @@ AC_HEADER_SYS_WAIT AC_CHECK_HEADERS(assert.h curses.h fcntl.h float.h floatingpoint.h \ - grp.h limits.h memory.h pwd.h sgtty.h stdlib.h string.h sys/param.h \ - sys/resource.h sys/select.h sys/stat.h sys/time.h sys/times.h \ - sys/types.h sys/utsname.h termcap.h termio.h termios.h unistd.h \ - varargs.h) + grp.h limits.h memory.h ncurses.h pwd.h sgtty.h stdlib.h string.h \ + sys/param.h sys/resource.h sys/select.h sys/stat.h sys/time.h \ + sys/times.h sys/types.h sys/utsname.h termcap.h termio.h termios.h \ + unistd.h varargs.h) if test "$ac_cv_header_termios_h" = yes \ || test "$ac_cv_header_termio_h" = yes \ @@ -856,6 +811,16 @@ done AC_SUBST(TERMLIBS) +if test "$ac_cv_lib_termcap" = yes \ + || test "$ac_cv_lib_terminfo" = yes \ + || test "$ac_cv_lib_ncurses" = yes \ + || test "$ac_cv_lib_curses" = yes \ + || test "$ac_cv_lib_termlib" = yes; then + true +else + AC_MSG_WARN([I couldn't find -ltermcap, -lterminfo, -lncurses, -lcurses, or -ltermlib!]) +fi + AC_MSG_CHECKING([for struct exception in math.h]) AC_TRY_LINK([#include <math.h>], [struct exception *x; x->type; x->name;],
--- a/doc/interpreter/install.texi Fri Nov 08 15:58:53 1996 +0000 +++ b/doc/interpreter/install.texi Fri Nov 08 22:37:42 1996 +0000 @@ -167,9 +167,6 @@ that don't really mean anything is wrong) that may show up during installation of Octave. -@c XXX FIXME XXX --- this might be a good place to explain the terms for -@c FSQP and NPSOL. - @itemize @bullet @item If @code{configure} fails when trying to create its output files, you
--- a/src/ChangeLog Fri Nov 08 15:58:53 1996 +0000 +++ b/src/ChangeLog Fri Nov 08 22:37:42 1996 +0000 @@ -1,5 +1,8 @@ Fri Nov 8 09:54:59 1996 John W. Eaton <jwe@bevo.che.wisc.edu> + * defaults.h.in (CXXLIB_LIST, CXXLIB_PATH, FLIB_LIST, FLIB_PATH): + Delete. + * Makefile.in (install-oct): Use $(INSTALL_PROGRAM) for .oct files. Thu Nov 7 07:59:07 1996 John W. Eaton <jwe@bevo.che.wisc.edu>
--- a/src/defaults.h.in Fri Nov 08 15:58:53 1996 +0000 +++ b/src/defaults.h.in Fri Nov 08 22:37:42 1996 +0000 @@ -102,22 +102,6 @@ #define TARGET_HOST_TYPE %TARGET_HOST_TYPE% #endif -#ifndef FLIB_LIST -#define FLIB_LIST %FLIB_LIST% -#endif - -#ifndef FLIB_PATH -#define FLIB_PATH %FLIB_PATH% -#endif - -#ifndef CXXLIB_LIST -#define CXXLIB_LIST %CXXLIB_LIST% -#endif - -#ifndef CXXLIB_PATH -#define CXXLIB_PATH %CXXLIB_PATH% -#endif - extern string Voctave_home; extern string Vbin_dir;