changeset 2592:0863d2cab514

[project @ 1996-12-14 04:39:00 by jwe]
author jwe
date Sat, 14 Dec 1996 04:39:00 +0000
parents 140fd45c1b84
children 3190d595d0da
files ChangeLog Makeconf.in configure.in
diffstat 3 files changed, 18 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Sat Dec 14 04:33:21 1996 +0000
+++ b/ChangeLog	Sat Dec 14 04:39:00 1996 +0000
@@ -1,5 +1,15 @@
+Fri Dec 13 22:37:49 1996  John W. Eaton  <jwe@bevo.che.wisc.edu>
+
+	* configure.in (TERMLIBS): Look for termcap and terminfo after
+	ncurses and curses.
+
 Thu Dec 12 02:27:08 1996  John W. Eaton  <jwe@bevo.che.wisc.edu>
 
+	* Makeconf.in (ALL_LDFLAGS): Add CPICFLAG here since gcc needs it
+	on some systems.
+
+	* configure.in (FPICFLAGS): Set to -fPIC if using g77 on HP/UX.
+
 	* Makefile.in, octMakefile.in: Delete all doc-dist, local-dist,
 	and split-dist targets.  Likewise for all other Makefiles in the
 	subdirectories.
--- a/Makeconf.in	Sat Dec 14 04:33:21 1996 +0000
+++ b/Makeconf.in	Sat Dec 14 04:39:00 1996 +0000
@@ -113,7 +113,7 @@
 LDFLAGS = @LDFLAGS@
 LD_STATIC_FLAG = @LD_STATIC_FLAG@
 ALL_LDFLAGS = $(LIBFLAGS) $(FORTRAN_MAIN_FLAG) $(GCC_IEEE_FP_FLAG) \
-	$(LD_STATIC_FLAG) $(LDFLAGS)
+	$(LD_STATIC_FLAG) $(CPICFLAG) $(LDFLAGS)
 
 RLD_FLAG = @RLD_FLAG@
 
--- a/configure.in	Sat Dec 14 04:33:21 1996 +0000
+++ b/configure.in	Sat Dec 14 04:39:00 1996 +0000
@@ -21,7 +21,7 @@
 ### Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 ### 02111-1307, USA. 
 
-AC_REVISION($Revision: 1.242 $)
+AC_REVISION($Revision: 1.243 $)
 AC_PREREQ(2.9)
 AC_INIT(src/octave.cc)
 AC_CONFIG_HEADER(config.h)
@@ -400,7 +400,11 @@
     DLFCN_DIR=dlfcn
   ;;
   hppa*-hp-hpux*)
-    FPICFLAG=+Z
+    if $use_g77; then
+      FPICFLAG=-fPIC
+    else
+      FPICFLAG=+Z
+    fi
     SHLEXT=sl
     RLD_FLAG='-Xlinker +b -Xlinker $(libdir)'
   ;;
@@ -876,7 +880,7 @@
 OCTAVE_STRUCT_GR_PASSWD
 
 TERMLIBS=""
-for termlib in termcap terminfo ncurses curses termlib; do
+for termlib in ncurses curses termcap terminfo termlib; do
   AC_CHECK_LIB(${termlib}, tputs, [TERMLIBS="${TERMLIBS} -l${termlib}"])
   case "${TERMLIBS}" in
     *-l${termlib}*)