Mercurial > octave-nkf

changeset 2253:5e862d11b116

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[project @ 1996-05-22 18:45:16 by jwe]
author jwe
date Wed, 22 May 1996 18:45:46 +0000
parents 65463608112d
children 0158c64f940c
files readline/Makefile.in readline/configure.in
diffstat 2 files changed, 15 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/readline/Makefile.in	Wed May 22 18:40:45 1996 +0000
+++ b/readline/Makefile.in	Wed May 22 18:45:46 1996 +0000
@@ -20,6 +20,9 @@
 
 SHARED_LIBS = @SHARED_LIBS@
 
+TERMLIBS = @TERMLIBS@
+SHARED_TERMLIBS = @SHARED_TERMLIBS@
+
 LIBS_TO_INSTALL = libreadline.a libhistory.a \
 	libreadline.$(SHLEXT) libhistory.$(SHLEXT)
 
@@ -144,7 +147,8 @@
 
 stamp-readline: $(PICOBJ)
 	if $(SHARED_LIBS); then \
-	  $(CC) -shared -o libreadline.$(SHLEXT) $(PICOBJ) -ltermcap; \
+	  $(CC) -shared -o libreadline.$(SHLEXT) $(PICOBJ) \
+	  $(SHARED_TERMLIBS); \
 	fi
 	touch stamp-readline
 
@@ -198,7 +202,7 @@
 	$(CC) $(CPPFLAGS) $(ALL_CFLAGS) -DTEST -o readline \
 	  readline.c bind.o complete.o display.o funmap.o history.o \
 	  isearch.o keymaps.o parens.o rltty.o search.o signals.o \
-	tilde.o vi_mode.o xmalloc.o -ltermcap
+	tilde.o vi_mode.o xmalloc.o $(TERMLIBS)
 
 clean:
 	$(RM) -f $(OBJECTS) libreadline.a libhistory.a pic/*.o
--- a/readline/configure.in	Wed May 22 18:40:45 1996 +0000
+++ b/readline/configure.in	Wed May 22 18:45:46 1996 +0000
@@ -73,6 +73,15 @@
 done
 AC_SUBST(TERMLIBS)
 
+SHARED_TERMLIBS="$TERMLIBS"
+case "$canonical_host_type" in
+  *-*-sunos4*)
+    SHARED_TERMLIBS=
+  ;;
+esac
+AC_MSG_RESULT([defining SHARED_TERMLIBS to be $SHARED_TERMLIBS])
+AC_SUBST(SHARED_TERMLIBS)
+
 AC_HEADER_DIRENT
 AC_HEADER_STDC
 AC_HEADER_TIME