Fix for issue 7714 (backport from trunk)
This commit is contained in:
parent
4da7d7822a
commit
c0fa2d24eb
|
@ -1,5 +1,5 @@
|
||||||
#! /bin/sh
|
#! /bin/sh
|
||||||
# From configure.in Revision: 77195 .
|
# From configure.in Revision: 77864 .
|
||||||
# Guess values for system-dependent variables and create Makefiles.
|
# Guess values for system-dependent variables and create Makefiles.
|
||||||
# Generated by GNU Autoconf 2.61 for python 2.6.
|
# Generated by GNU Autoconf 2.61 for python 2.6.
|
||||||
#
|
#
|
||||||
|
@ -3855,7 +3855,7 @@ else
|
||||||
{ echo "$as_me:$LINENO: result: no" >&5
|
{ echo "$as_me:$LINENO: result: no" >&5
|
||||||
echo "${ECHO_T}no" >&6; }
|
echo "${ECHO_T}no" >&6; }
|
||||||
fi
|
fi
|
||||||
rm -f conftest*
|
rm -f -r conftest*
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
@ -5394,7 +5394,7 @@ if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
|
||||||
else
|
else
|
||||||
ac_cv_header_stdc=no
|
ac_cv_header_stdc=no
|
||||||
fi
|
fi
|
||||||
rm -f conftest*
|
rm -f -r conftest*
|
||||||
|
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
@ -5415,7 +5415,7 @@ if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
|
||||||
else
|
else
|
||||||
ac_cv_header_stdc=no
|
ac_cv_header_stdc=no
|
||||||
fi
|
fi
|
||||||
rm -f conftest*
|
rm -f -r conftest*
|
||||||
|
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
@ -6513,7 +6513,7 @@ _ACEOF
|
||||||
|
|
||||||
|
|
||||||
fi
|
fi
|
||||||
rm -f conftest*
|
rm -f -r conftest*
|
||||||
|
|
||||||
{ echo "$as_me:$LINENO: result: $was_it_defined" >&5
|
{ echo "$as_me:$LINENO: result: $was_it_defined" >&5
|
||||||
echo "${ECHO_T}$was_it_defined" >&6; }
|
echo "${ECHO_T}$was_it_defined" >&6; }
|
||||||
|
@ -7043,7 +7043,7 @@ if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
|
||||||
else
|
else
|
||||||
ac_cv_type_uid_t=no
|
ac_cv_type_uid_t=no
|
||||||
fi
|
fi
|
||||||
rm -f conftest*
|
rm -f -r conftest*
|
||||||
|
|
||||||
fi
|
fi
|
||||||
{ echo "$as_me:$LINENO: result: $ac_cv_type_uid_t" >&5
|
{ echo "$as_me:$LINENO: result: $ac_cv_type_uid_t" >&5
|
||||||
|
@ -12973,7 +12973,7 @@ case $ac_sys_system/$ac_sys_release in
|
||||||
LIBTOOL_CRUFT=$LIBTOOL_CRUFT' -install_name $(PYTHONFRAMEWORKINSTALLDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK)'
|
LIBTOOL_CRUFT=$LIBTOOL_CRUFT' -install_name $(PYTHONFRAMEWORKINSTALLDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK)'
|
||||||
LIBTOOL_CRUFT=$LIBTOOL_CRUFT' -compatibility_version $(VERSION) -current_version $(VERSION)';;
|
LIBTOOL_CRUFT=$LIBTOOL_CRUFT' -compatibility_version $(VERSION) -current_version $(VERSION)';;
|
||||||
Darwin/*)
|
Darwin/*)
|
||||||
gcc_version=`gcc -v 2>&1 | grep version | cut -d\ -f3`
|
gcc_version=`gcc -dumpversion`
|
||||||
if test ${gcc_version} '<' 4.0
|
if test ${gcc_version} '<' 4.0
|
||||||
then
|
then
|
||||||
LIBTOOL_CRUFT="-lcc_dynamic"
|
LIBTOOL_CRUFT="-lcc_dynamic"
|
||||||
|
@ -14168,7 +14168,7 @@ if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
|
||||||
else
|
else
|
||||||
unistd_defines_pthreads=no
|
unistd_defines_pthreads=no
|
||||||
fi
|
fi
|
||||||
rm -f conftest*
|
rm -f -r conftest*
|
||||||
|
|
||||||
{ echo "$as_me:$LINENO: result: $unistd_defines_pthreads" >&5
|
{ echo "$as_me:$LINENO: result: $unistd_defines_pthreads" >&5
|
||||||
echo "${ECHO_T}$unistd_defines_pthreads" >&6; }
|
echo "${ECHO_T}$unistd_defines_pthreads" >&6; }
|
||||||
|
@ -15782,7 +15782,7 @@ if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
|
||||||
$EGREP "yes" >/dev/null 2>&1; then
|
$EGREP "yes" >/dev/null 2>&1; then
|
||||||
ipv6type=$i
|
ipv6type=$i
|
||||||
fi
|
fi
|
||||||
rm -f conftest*
|
rm -f -r conftest*
|
||||||
|
|
||||||
;;
|
;;
|
||||||
kame)
|
kame)
|
||||||
|
@ -15805,7 +15805,7 @@ if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
|
||||||
ipv6libdir=/usr/local/v6/lib
|
ipv6libdir=/usr/local/v6/lib
|
||||||
ipv6trylibc=yes
|
ipv6trylibc=yes
|
||||||
fi
|
fi
|
||||||
rm -f conftest*
|
rm -f -r conftest*
|
||||||
|
|
||||||
;;
|
;;
|
||||||
linux-glibc)
|
linux-glibc)
|
||||||
|
@ -15826,7 +15826,7 @@ if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
|
||||||
ipv6type=$i;
|
ipv6type=$i;
|
||||||
ipv6trylibc=yes
|
ipv6trylibc=yes
|
||||||
fi
|
fi
|
||||||
rm -f conftest*
|
rm -f -r conftest*
|
||||||
|
|
||||||
;;
|
;;
|
||||||
linux-inet6)
|
linux-inet6)
|
||||||
|
@ -15864,7 +15864,7 @@ if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
|
||||||
ipv6lib=inet6;
|
ipv6lib=inet6;
|
||||||
ipv6libdir=/usr/local/v6/lib
|
ipv6libdir=/usr/local/v6/lib
|
||||||
fi
|
fi
|
||||||
rm -f conftest*
|
rm -f -r conftest*
|
||||||
|
|
||||||
;;
|
;;
|
||||||
v6d)
|
v6d)
|
||||||
|
@ -15887,7 +15887,7 @@ if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
|
||||||
ipv6libdir=/usr/local/v6/lib;
|
ipv6libdir=/usr/local/v6/lib;
|
||||||
BASECFLAGS="-I/usr/local/v6/include $BASECFLAGS"
|
BASECFLAGS="-I/usr/local/v6/include $BASECFLAGS"
|
||||||
fi
|
fi
|
||||||
rm -f conftest*
|
rm -f -r conftest*
|
||||||
|
|
||||||
;;
|
;;
|
||||||
zeta)
|
zeta)
|
||||||
|
@ -15909,7 +15909,7 @@ if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
|
||||||
ipv6lib=inet6;
|
ipv6lib=inet6;
|
||||||
ipv6libdir=/usr/local/v6/lib
|
ipv6libdir=/usr/local/v6/lib
|
||||||
fi
|
fi
|
||||||
rm -f conftest*
|
rm -f -r conftest*
|
||||||
|
|
||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
|
@ -23684,7 +23684,7 @@ cat >>confdefs.h <<\_ACEOF
|
||||||
_ACEOF
|
_ACEOF
|
||||||
|
|
||||||
fi
|
fi
|
||||||
rm -f conftest*
|
rm -f -r conftest*
|
||||||
|
|
||||||
cat >conftest.$ac_ext <<_ACEOF
|
cat >conftest.$ac_ext <<_ACEOF
|
||||||
/* confdefs.h. */
|
/* confdefs.h. */
|
||||||
|
@ -23703,7 +23703,7 @@ cat >>confdefs.h <<\_ACEOF
|
||||||
_ACEOF
|
_ACEOF
|
||||||
|
|
||||||
fi
|
fi
|
||||||
rm -f conftest*
|
rm -f -r conftest*
|
||||||
|
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
@ -23973,7 +23973,7 @@ cat >>confdefs.h <<\_ACEOF
|
||||||
_ACEOF
|
_ACEOF
|
||||||
|
|
||||||
fi
|
fi
|
||||||
rm -f conftest*
|
rm -f -r conftest*
|
||||||
|
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|
|
@ -1574,7 +1574,7 @@ case $ac_sys_system/$ac_sys_release in
|
||||||
LIBTOOL_CRUFT=$LIBTOOL_CRUFT' -install_name $(PYTHONFRAMEWORKINSTALLDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK)'
|
LIBTOOL_CRUFT=$LIBTOOL_CRUFT' -install_name $(PYTHONFRAMEWORKINSTALLDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK)'
|
||||||
LIBTOOL_CRUFT=$LIBTOOL_CRUFT' -compatibility_version $(VERSION) -current_version $(VERSION)';;
|
LIBTOOL_CRUFT=$LIBTOOL_CRUFT' -compatibility_version $(VERSION) -current_version $(VERSION)';;
|
||||||
Darwin/*)
|
Darwin/*)
|
||||||
gcc_version=`gcc -v 2>&1 | grep version | cut -d\ -f3`
|
gcc_version=`gcc -dumpversion`
|
||||||
if test ${gcc_version} '<' 4.0
|
if test ${gcc_version} '<' 4.0
|
||||||
then
|
then
|
||||||
LIBTOOL_CRUFT="-lcc_dynamic"
|
LIBTOOL_CRUFT="-lcc_dynamic"
|
||||||
|
|
Loading…
Reference in New Issue