Mercurial > octave-nkf
changeset 2256:55f2ac8c7eb0
[project @ 1996-05-22 20:05:39 by jwe]
| author | jwe |
|---|---|
| date | Wed, 22 May 1996 20:07:40 +0000 |
| parents | fb9611cfc9d2 |
| children | 22f40c3d0600 |
| files | Makeconf.in configure.in libcruft/Makefile.in |
| diffstat | 3 files changed, 13 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/Makeconf.in Wed May 22 19:32:26 1996 +0000 +++ b/Makeconf.in Wed May 22 20:07:40 1996 +0000 @@ -112,6 +112,7 @@ RLD_FLAG = @RLD_FLAG@ FLIBS = @FLIBS@ +SHARED_FLIBS = @SHARED_FLIBS@ FLIB_LIST = @FLIB_LIST@ FLIB_PATH = @FLIB_PATH@
--- a/configure.in Wed May 22 19:32:26 1996 +0000 +++ b/configure.in Wed May 22 20:07:40 1996 +0000 @@ -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.202 $) +AC_REVISION($Revision: 1.203 $) AC_PREREQ(2.9) AC_INIT(src/octave.cc) AC_CONFIG_HEADER(config.h) @@ -592,6 +592,15 @@ 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:
--- a/libcruft/Makefile.in Wed May 22 19:32:26 1996 +0000 +++ b/libcruft/Makefile.in Wed May 22 20:07:40 1996 +0000 @@ -66,7 +66,8 @@ stamp-shared: $(CRUFT_PICOBJ) if $(SHARED_LIBS); then \ - $(CXX) -shared -o libcruft.$(SHLEXT) $(CRUFT_PICOBJ) $(FLIBS); \ + $(CC) -shared -o libcruft.$(SHLEXT) $(CRUFT_PICOBJ) \ + $(SHARED_FLIBS); \ else true; fi touch stamp-shared