* configure.in, Makefile.in: remove the AC_PREFIX() call -- it's
more trouble than it's worth at CWI and most other people seem to install Python in the default (/usr/local) anway. Changed comment describing --prefix in Makefile.in
This commit is contained in:
parent
3f9a6ec9e6
commit
a0e9a77183
|
@ -31,8 +31,7 @@ INSTALL= @INSTALL@
|
||||||
|
|
||||||
# Install prefixes are treated specially by the configure script:
|
# Install prefixes are treated specially by the configure script:
|
||||||
# it only changes these lines if it has received a --prefix=... or
|
# it only changes these lines if it has received a --prefix=... or
|
||||||
# --exec-prefix-... command line option, or if it has figured out
|
# --exec-prefix=... command line option. Note that $(prefix) is
|
||||||
# a value by searching for python in $PATH. Note that $(prefix) is
|
|
||||||
# also used when compiling config.c in Modules to set the default
|
# also used when compiling config.c in Modules to set the default
|
||||||
# module search path, so if you change it later be sure to change it
|
# module search path, so if you change it later be sure to change it
|
||||||
# there too and rebuild.
|
# there too and rebuild.
|
||||||
|
|
|
@ -316,22 +316,6 @@ ac_ext=c
|
||||||
ac_cpp='${CPP} $CFLAGS'
|
ac_cpp='${CPP} $CFLAGS'
|
||||||
ac_compile='${CC-cc} $CFLAGS $LDFLAGS conftest.${ac_ext} -o conftest $LIBS >/dev/null 2>&1'
|
ac_compile='${CC-cc} $CFLAGS $LDFLAGS conftest.${ac_ext} -o conftest $LIBS >/dev/null 2>&1'
|
||||||
|
|
||||||
if test -z "$prefix"
|
|
||||||
then
|
|
||||||
test -n "$silent" || echo "checking for python to derive installation directory prefix"
|
|
||||||
IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="$IFS:"
|
|
||||||
for ac_dir in $PATH; do
|
|
||||||
test -z "$ac_dir" && ac_dir=.
|
|
||||||
if test $ac_dir != . && test -f $ac_dir/python; then
|
|
||||||
# Not all systems have dirname.
|
|
||||||
prefix=`echo $ac_dir|sed 's%/[^/][^/]*$%%'`
|
|
||||||
break
|
|
||||||
fi
|
|
||||||
done
|
|
||||||
IFS="$ac_save_ifs"
|
|
||||||
test -n "$verbose" && echo " chose installation directory prefix ${prefix}"
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Don't suppress compiler output when --verbose is specified
|
# Don't suppress compiler output when --verbose is specified
|
||||||
test -n "$verbose" &&
|
test -n "$verbose" &&
|
||||||
ac_compile=`echo "$ac_compile" | sed "s|>/dev/null 2>&1||"`
|
ac_compile=`echo "$ac_compile" | sed "s|>/dev/null 2>&1||"`
|
||||||
|
|
|
@ -2,7 +2,6 @@ dnl Process this file with autoconf 1.8 or later to produce a configure script.
|
||||||
AC_REVISION($Revision$)dnl
|
AC_REVISION($Revision$)dnl
|
||||||
AC_PREREQ(1.8)dnl
|
AC_PREREQ(1.8)dnl
|
||||||
AC_INIT(Include/object.h)
|
AC_INIT(Include/object.h)
|
||||||
AC_PREFIX(python)
|
|
||||||
AC_CONFIG_HEADER(config.h)dnl
|
AC_CONFIG_HEADER(config.h)dnl
|
||||||
# Don't suppress compiler output when --verbose is specified
|
# Don't suppress compiler output when --verbose is specified
|
||||||
test -n "$verbose" &&
|
test -n "$verbose" &&
|
||||||
|
|
Loading…
Reference in New Issue