Mercurial > hg > octave-lyh
changeset 2257:22f40c3d0600
[project @ 1996-05-22 20:55:43 by jwe]
author | jwe |
---|---|
date | Wed, 22 May 1996 20:58:09 +0000 |
parents | 55f2ac8c7eb0 |
children | 9dc512bdc19b |
files | Makeconf.in configure.in libcruft/Makefile.in readline/Makefile.in readline/configure.in src/Makefile.in |
diffstat | 6 files changed, 33 insertions(+), 20 deletions(-) [+] |
line wrap: on
line diff
--- a/Makeconf.in +++ b/Makeconf.in @@ -112,7 +112,6 @@ RLD_FLAG = @RLD_FLAG@ FLIBS = @FLIBS@ -SHARED_FLIBS = @SHARED_FLIBS@ FLIB_LIST = @FLIB_LIST@ FLIB_PATH = @FLIB_PATH@ @@ -124,6 +123,10 @@ LIBPLPLOT = @LIBPLPLOT@ LIBDLFCN = @LIBDLFCN@ +SH_FLIBS = @SH_FLIBS@ +SH_TERMLIBS = @SH_TERMLIBS@ +SH_LIBS = @SH_LIBS@ + # The arguments passed to configure. config_opts = @config_opts@
--- 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, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -AC_REVISION($Revision: 1.203 $) +AC_REVISION($Revision: 1.205 $) AC_PREREQ(2.9) AC_INIT(src/octave.cc) AC_CONFIG_HEADER(config.h) @@ -592,15 +592,6 @@ AC_SUBST(F2CFLAGS) AC_SUBST_FILE(f77_rules_frag) -SHARED_FLIBS="$SHARED_FLIBS" -case "$canonical_host_type" in - *-*-sunos4*) - SHARED_FLIBS= - ;; -esac -AC_MSG_RESULT([defining SHARED_FLIBS to be $SHARED_FLIBS]) -AC_SUBST(SHARED_FLIBS) - ### Extract libraries and directories from FLIBS and CXXLIBS. ### ### Leave only libraries, with -lfoo converted to libfoo.a: @@ -958,6 +949,25 @@ AC_PROG_LN_S +### Kluge for SunOS 4.x vs. shared libraries. + +SH_LIBS="$LIBS" +SH_FLIBS="$FLIBS" +SH_TERMLIBS="$TERMLIBS" +case "$canonical_host_type" in + *-*-sunos4*) + SH_LIBS= + SH_FLIBS= + SH_TERMLIBS= + ;; +esac +AC_MSG_RESULT([defining SH_LIBS to be $SH_LIBS]) +AC_MSG_RESULT([defining SH_FLIBS to be $SH_FLIBS]) +AC_MSG_RESULT([defining SH_TERMLIBS to be $SH_TERMLIBS]) +AC_SUBST(SH_LIBS) +AC_SUBST(SH_FLIBS) +AC_SUBST(SH_TERMLIBS) + AC_CHECK_PROG(RUNTEST, runtest, runtest, []) AC_CHECK_PROG(EXPECT, expect, expect, []) if test -z "$EXPECT"; then
--- a/libcruft/Makefile.in +++ b/libcruft/Makefile.in @@ -67,7 +67,7 @@ stamp-shared: $(CRUFT_PICOBJ) if $(SHARED_LIBS); then \ $(CC) -shared -o libcruft.$(SHLEXT) $(CRUFT_PICOBJ) \ - $(SHARED_FLIBS); \ + $(SH_FLIBS); \ else true; fi touch stamp-shared
--- a/readline/Makefile.in +++ b/readline/Makefile.in @@ -21,7 +21,7 @@ SHARED_LIBS = @SHARED_LIBS@ TERMLIBS = @TERMLIBS@ -SHARED_TERMLIBS = @SHARED_TERMLIBS@ +SH_TERMLIBS = @SH_TERMLIBS@ LIBS_TO_INSTALL = libreadline.a libhistory.a \ libreadline.$(SHLEXT) libhistory.$(SHLEXT) @@ -148,7 +148,7 @@ stamp-readline: $(PICOBJ) if $(SHARED_LIBS); then \ $(CC) -shared -o libreadline.$(SHLEXT) $(PICOBJ) \ - $(SHARED_TERMLIBS); \ + $(SH_TERMLIBS); \ fi touch stamp-readline
--- a/readline/configure.in +++ b/readline/configure.in @@ -73,14 +73,14 @@ done AC_SUBST(TERMLIBS) -SHARED_TERMLIBS="$TERMLIBS" +SH_TERMLIBS="$TERMLIBS" case "$canonical_host_type" in *-*-sunos4*) - SHARED_TERMLIBS= + SH_TERMLIBS= ;; esac -AC_MSG_RESULT([defining SHARED_TERMLIBS to be $SHARED_TERMLIBS]) -AC_SUBST(SHARED_TERMLIBS) +AC_MSG_RESULT([defining SH_TERMLIBS to be $SH_TERMLIBS]) +AC_SUBST(SH_TERMLIBS) AC_HEADER_DIRENT AC_HEADER_STDC
--- a/src/Makefile.in +++ b/src/Makefile.in @@ -204,7 +204,7 @@ $(CXX) -shared -o liboctinterp.$(SHLEXT) $(PICOBJ) \ $(OCTAVE_LFLAGS) \ -loctave -lcruft -ltinst -lreadline -lkpathsea \ - $(TERMLIBS) $(LIBS) -lg++; \ + $(SH_TERMLIBS) $(SH_LIBS) -lg++; \ else true; fi touch stamp-interp @@ -213,7 +213,7 @@ $(CXX) -shared -o libtinst.$(SHLEXT) $(TI_PICOBJ) \ $(OCTAVE_LFLAGS) \ -loctinterp -loctave -lcruft -lreadline -lkpathsea \ - $(TERMLIBS) $(LIBS) -lg++; \ + $(SH_TERMLIBS) $(SH_LIBS) -lg++; \ else true; fi touch stamp-tinst