Mercurial > octave
changeset 1462:8aa535221fa1
[project @ 1995-09-22 01:29:00 by jwe]
| author | jwe |
|---|---|
| date | Fri, 22 Sep 1995 01:31:22 +0000 |
| parents | 54656492d2d8 |
| children | 592291d9dfbb |
| files | Makeconf.in configure.in |
| diffstat | 2 files changed, 19 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/Makeconf.in Thu Sep 21 03:47:27 1995 +0000 +++ b/Makeconf.in Fri Sep 22 01:31:22 1995 +0000 @@ -18,6 +18,9 @@ YACC = @YACC@ YFLAGS = -dv +AR = @AR@ +ARFLAGS = @ARFLAGS@ + RANLIB = @RANLIB@ RUNTEST = @RUNTEST@
--- a/configure.in Thu Sep 21 03:47:27 1995 +0000 +++ b/configure.in Fri Sep 22 01:31:22 1995 +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.137 $) +AC_REVISION($Revision: 1.138 $) AC_PREREQ(2.0) AC_INIT(src/octave.cc) AC_CONFIG_HEADER(config.h) @@ -477,13 +477,13 @@ AC_DEFINE(F77_APPEND_UNDERSCORE, 1) AC_MSG_RESULT([defining F77_APPEND_UNDERSCORE to be 1]) AC_CHECK_LIB(f2c, main, FLIBS=-lf2c, []) - if test -z "$FLIBS" ; then + if test -z "$FLIBS"; then AC_CHECK_LIB(F77, main, FLIBS=-lF77, []) - if test -n "$FLIBS" ; then + if test -n "$FLIBS"; then AC_CHECK_LIB(I77, main, FLIBS="$FLIBS -lI77", []) fi fi - if test -z "$FLIBS" ; then + if test -z "$FLIBS"; then AC_MSG_WARN([I found f2c but not libf2c.a, or libF77.a and libI77.a]) fi DOT_C_FROM_DOT_F_CMD=' cat $< | $(F2C) $(F2CFLAGS) > $(@F)' @@ -655,7 +655,7 @@ AC_FUNC_CLOSEDIR_VOID TERMLIBS="" -for termlib in termcap terminfo curses termlib ; do +for termlib in termcap terminfo curses termlib; do AC_CHECK_LIB(${termlib}, main, [TERMLIBS="${TERMLIBS} -l${termlib}"]) case "${TERMLIBS}" in *-l${termlib}*) @@ -731,11 +731,21 @@ ;; esac +if test -z "$AR"; then + AR=ar +fi +AC_SUBST(AR) + +if test -z "$ARFLAGS"; then + ARFLAGS="rc" +fi +AC_SUBST(ARFLAGS) + AC_PROG_RANLIB AC_CHECK_PROG(RUNTEST, runtest, runtest, []) AC_CHECK_PROG(EXPECT, expect, expect, []) -if test -z "$EXPECT" ; then +if test -z "$EXPECT"; then RUNTEST= fi AC_SUBST(RUNTEST)