diff options
| author | Guido van Rossum <guido@python.org> | 1994-08-19 15:33:54 +0000 |
|---|---|---|
| committer | Guido van Rossum <guido@python.org> | 1994-08-19 15:33:54 +0000 |
| commit | 4e8af445ec93124f9a8f4c75206ef505cdfa311a (patch) | |
| tree | 38d55427291c89199401606d3641d6c5e7e12f55 | |
| parent | 5622ef3cbbb3066e5e42330572840bc78a349131 (diff) | |
| download | cpython-git-4e8af445ec93124f9a8f4c75206ef505cdfa311a.tar.gz | |
Simplify value of INSTALL (always 'cp').
Pass value of OPT from configure environment to Makefile.
Add check for limits.h.
Use <directory>/libreadline.a instead of -lreadline.
| -rw-r--r-- | Makefile.in | 2 | ||||
| -rw-r--r-- | config.h.in | 3 | ||||
| -rw-r--r-- | configure.in | 18 |
3 files changed, 17 insertions, 6 deletions
diff --git a/Makefile.in b/Makefile.in index 66d05ec801..04f7a47fdb 100644 --- a/Makefile.in +++ b/Makefile.in @@ -51,7 +51,7 @@ SHELL= /bin/sh WITH= # Compiler options passed to subordinate makes -OPT= -O +OPT= @OPT@ # Subdirectories where to run make recursively SUBDIRS= Parser Objects Python Modules diff --git a/config.h.in b/config.h.in index ff6490e2ce..a3fc5062cd 100644 --- a/config.h.in +++ b/config.h.in @@ -225,6 +225,9 @@ /* Define if you have the <fcntl.h> header file. */ #undef HAVE_FCNTL_H +/* Define if you have the <limits.h> header file. */ +#undef HAVE_LIMITS_H + /* Define if you have the <signal.h> header file. */ #undef HAVE_SIGNAL_H diff --git a/configure.in b/configure.in index 6eb0ec8090..67ae07a084 100644 --- a/configure.in +++ b/configure.in @@ -17,10 +17,19 @@ AC_WITH(gcc, [ esac CC=$withval]) AC_PROG_CC -AC_PROG_INSTALL AC_PROG_RANLIB AC_SUBST(AR) AC_PROGRAMS_CHECK(AR, ar aal, ar) +AC_SUBST(INSTALL) +# Install just never works :-( +if test -z "$INSTALL" +then INSTALL=cp +fi +AC_SUBST(OPT) +# Optimizer/debugger flags passed between Makefiles +if test -z "$OPT" +then OPT=-O +fi # checks for UNIX variants that set C preprocessor variables AC_AIX @@ -62,14 +71,13 @@ AC_HAVE_LIBRARY(nsl) AC_CHECKING(for --with-readline) AC_WITH(readline, [AC_DEFINE(WITH_READLINE) -if test -d "$withval" -then LIBS="$LIBS -L$withval" -else AC_ERROR(proper usage is --with-readline=DIRECTORY) +if test ! -d "$withval" +then AC_ERROR(proper usage is --with-readline=DIRECTORY) fi termcap= AC_HAVE_LIBRARY(termcap, [termcap=termcap], [AC_HAVE_LIBRARY(termlib, [termcap=termlib])]) if test ! -z "$termcap" -then LIBS="$LIBS -lreadline" +then LIBS="$LIBS $withval/libreadline.a" # Avoid possible conflict between shared libraries termcap and gl # on IRIX 5: both contain a routine called clear. if test -f /usr/lib/lib$termcap.a |