mirror of https://github.com/python/cpython
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.
This commit is contained in:
parent
5622ef3cbb
commit
4e8af445ec
|
@ -51,7 +51,7 @@ SHELL= /bin/sh
|
||||||
WITH=
|
WITH=
|
||||||
|
|
||||||
# Compiler options passed to subordinate makes
|
# Compiler options passed to subordinate makes
|
||||||
OPT= -O
|
OPT= @OPT@
|
||||||
|
|
||||||
# Subdirectories where to run make recursively
|
# Subdirectories where to run make recursively
|
||||||
SUBDIRS= Parser Objects Python Modules
|
SUBDIRS= Parser Objects Python Modules
|
||||||
|
|
|
@ -225,6 +225,9 @@
|
||||||
/* Define if you have the <fcntl.h> header file. */
|
/* Define if you have the <fcntl.h> header file. */
|
||||||
#undef HAVE_FCNTL_H
|
#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. */
|
/* Define if you have the <signal.h> header file. */
|
||||||
#undef HAVE_SIGNAL_H
|
#undef HAVE_SIGNAL_H
|
||||||
|
|
||||||
|
|
18
configure.in
18
configure.in
|
@ -17,10 +17,19 @@ AC_WITH(gcc, [
|
||||||
esac
|
esac
|
||||||
CC=$withval])
|
CC=$withval])
|
||||||
AC_PROG_CC
|
AC_PROG_CC
|
||||||
AC_PROG_INSTALL
|
|
||||||
AC_PROG_RANLIB
|
AC_PROG_RANLIB
|
||||||
AC_SUBST(AR)
|
AC_SUBST(AR)
|
||||||
AC_PROGRAMS_CHECK(AR, ar aal, 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
|
# checks for UNIX variants that set C preprocessor variables
|
||||||
AC_AIX
|
AC_AIX
|
||||||
|
@ -62,14 +71,13 @@ AC_HAVE_LIBRARY(nsl)
|
||||||
|
|
||||||
AC_CHECKING(for --with-readline)
|
AC_CHECKING(for --with-readline)
|
||||||
AC_WITH(readline, [AC_DEFINE(WITH_READLINE)
|
AC_WITH(readline, [AC_DEFINE(WITH_READLINE)
|
||||||
if test -d "$withval"
|
if test ! -d "$withval"
|
||||||
then LIBS="$LIBS -L$withval"
|
then AC_ERROR(proper usage is --with-readline=DIRECTORY)
|
||||||
else AC_ERROR(proper usage is --with-readline=DIRECTORY)
|
|
||||||
fi
|
fi
|
||||||
termcap=
|
termcap=
|
||||||
AC_HAVE_LIBRARY(termcap, [termcap=termcap], [AC_HAVE_LIBRARY(termlib, [termcap=termlib])])
|
AC_HAVE_LIBRARY(termcap, [termcap=termcap], [AC_HAVE_LIBRARY(termlib, [termcap=termlib])])
|
||||||
if test ! -z "$termcap"
|
if test ! -z "$termcap"
|
||||||
then LIBS="$LIBS -lreadline"
|
then LIBS="$LIBS $withval/libreadline.a"
|
||||||
# Avoid possible conflict between shared libraries termcap and gl
|
# Avoid possible conflict between shared libraries termcap and gl
|
||||||
# on IRIX 5: both contain a routine called clear.
|
# on IRIX 5: both contain a routine called clear.
|
||||||
if test -f /usr/lib/lib$termcap.a
|
if test -f /usr/lib/lib$termcap.a
|
||||||
|
|
Loading…
Reference in New Issue