Fix typo in configure.in
This commit is contained in:
parent
5515990ee1
commit
23d925311d
|
@ -1,5 +1,5 @@
|
|||
#! /bin/sh
|
||||
# From configure.in Revision: 74667 .
|
||||
# From configure.in Revision: 74672 .
|
||||
# Guess values for system-dependent variables and create Makefiles.
|
||||
# Generated by GNU Autoconf 2.61 for python 2.7.
|
||||
#
|
||||
|
@ -1336,7 +1336,7 @@ Optional Packages:
|
|||
--without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no)
|
||||
--with-universal-archs=ARCH
|
||||
select architectures for universal build ("32-bit",
|
||||
"64-bit" or "all")
|
||||
"64-bit", "3-way", "intel" or "all")
|
||||
--with-framework-name=FRAMEWORK
|
||||
specify an alternate name of the framework built
|
||||
with --enable-framework
|
||||
|
@ -4694,6 +4694,14 @@ echo "${ECHO_T}$ac_cv_no_strict_aliasing_ok" >&6; }
|
|||
UNIVERSAL_ARCH_FLAGS="-arch i386 -arch ppc -arch ppc64 -arch x86_64"
|
||||
ARCH_RUN_32BIT="arch -i386 -ppc"
|
||||
|
||||
elif test "$UNIVERSAL_ARCHS" = "intel" ; then
|
||||
UNIVERSAL_ARCH_FLAGS="-arch i386 -arch x86_64"
|
||||
ARCH_RUN_32BIT="arch -i386"
|
||||
|
||||
elif test "$UNIVERSAL_ARCHS" = "3-way" ; then
|
||||
UNIVERSAL_ARCH_FLAGS="-arch i386 -arch ppc -arch x86_64"
|
||||
ARCH_RUN_32BIT="arch -i386 -ppc"
|
||||
|
||||
else
|
||||
{ { echo "$as_me:$LINENO: error: proper usage is --with-universalarch=32-bit|64-bit|all" >&5
|
||||
echo "$as_me: error: proper usage is --with-universalarch=32-bit|64-bit|all" >&2;}
|
||||
|
@ -4721,6 +4729,15 @@ echo "$as_me: error: proper usage is --with-universalarch=32-bit|64-bit|all" >&2
|
|||
# that's the first OS release where
|
||||
# 4-way builds make sense.
|
||||
cur_target='10.5'
|
||||
|
||||
elif test "${UNIVERSAL_ARCHS}" = "3-way"; then
|
||||
cur_target='10.5'
|
||||
|
||||
elif test "${UNIVERSAL_ARCHS}" = "intel"; then
|
||||
cur_target='10.5'
|
||||
|
||||
elif test "${UNIVERSAL_ARCHS}" = "64-bit"; then
|
||||
cur_target='10.5'
|
||||
fi
|
||||
else
|
||||
if test `arch` = "i386"; then
|
||||
|
@ -14488,7 +14505,7 @@ case $ac_sys_system/$ac_sys_release in
|
|||
LIBTOOL_CRUFT=""
|
||||
fi
|
||||
if test "$cross_compiling" = yes; then
|
||||
ac_osx_32bit=no
|
||||
ac_osx_32bit=yes
|
||||
else
|
||||
cat >conftest.$ac_ext <<_ACEOF
|
||||
/* confdefs.h. */
|
||||
|
@ -14496,7 +14513,7 @@ _ACEOF
|
|||
cat confdefs.h >>conftest.$ac_ext
|
||||
cat >>conftest.$ac_ext <<_ACEOF
|
||||
/* end confdefs.h. */
|
||||
[
|
||||
|
||||
#include <unistd.h>
|
||||
int main(int argc, char*argv[])
|
||||
{
|
||||
|
@ -14505,7 +14522,7 @@ cat >>conftest.$ac_ext <<_ACEOF
|
|||
} else {
|
||||
return 1;
|
||||
}
|
||||
]
|
||||
|
||||
_ACEOF
|
||||
rm -f conftest$ac_exeext
|
||||
if { (ac_try="$ac_link"
|
||||
|
|
25
configure.in
25
configure.in
|
@ -114,7 +114,7 @@ AC_SUBST(ARCH_RUN_32BIT)
|
|||
UNIVERSAL_ARCHS="32-bit"
|
||||
AC_MSG_CHECKING(for --with-universal-archs)
|
||||
AC_ARG_WITH(universal-archs,
|
||||
AC_HELP_STRING(--with-universal-archs=ARCH, select architectures for universal build ("32-bit", "64-bit" or "all")),
|
||||
AC_HELP_STRING(--with-universal-archs=ARCH, select architectures for universal build ("32-bit", "64-bit", "3-way", "intel" or "all")),
|
||||
[
|
||||
AC_MSG_RESULT($withval)
|
||||
UNIVERSAL_ARCHS="$withval"
|
||||
|
@ -952,6 +952,14 @@ yes)
|
|||
UNIVERSAL_ARCH_FLAGS="-arch i386 -arch ppc -arch ppc64 -arch x86_64"
|
||||
ARCH_RUN_32BIT="arch -i386 -ppc"
|
||||
|
||||
elif test "$UNIVERSAL_ARCHS" = "intel" ; then
|
||||
UNIVERSAL_ARCH_FLAGS="-arch i386 -arch x86_64"
|
||||
ARCH_RUN_32BIT="arch -i386"
|
||||
|
||||
elif test "$UNIVERSAL_ARCHS" = "3-way" ; then
|
||||
UNIVERSAL_ARCH_FLAGS="-arch i386 -arch ppc -arch x86_64"
|
||||
ARCH_RUN_32BIT="arch -i386 -ppc"
|
||||
|
||||
else
|
||||
AC_MSG_ERROR([proper usage is --with-universalarch=32-bit|64-bit|all])
|
||||
|
||||
|
@ -977,6 +985,15 @@ yes)
|
|||
# that's the first OS release where
|
||||
# 4-way builds make sense.
|
||||
cur_target='10.5'
|
||||
|
||||
elif test "${UNIVERSAL_ARCHS}" = "3-way"; then
|
||||
cur_target='10.5'
|
||||
|
||||
elif test "${UNIVERSAL_ARCHS}" = "intel"; then
|
||||
cur_target='10.5'
|
||||
|
||||
elif test "${UNIVERSAL_ARCHS}" = "64-bit"; then
|
||||
cur_target='10.5'
|
||||
fi
|
||||
else
|
||||
if test `arch` = "i386"; then
|
||||
|
@ -1539,7 +1556,7 @@ case $ac_sys_system/$ac_sys_release in
|
|||
else
|
||||
LIBTOOL_CRUFT=""
|
||||
fi
|
||||
AC_TRY_RUN([[
|
||||
AC_TRY_RUN([
|
||||
#include <unistd.h>
|
||||
int main(int argc, char*argv[])
|
||||
{
|
||||
|
@ -1548,9 +1565,9 @@ case $ac_sys_system/$ac_sys_release in
|
|||
} else {
|
||||
return 1;
|
||||
}
|
||||
]], ac_osx_32bit=yes,
|
||||
], ac_osx_32bit=yes,
|
||||
ac_osx_32bit=no,
|
||||
ac_osx_32bit=no)
|
||||
ac_osx_32bit=yes)
|
||||
|
||||
if test "${ac_osx_32bit}" = "yes"; then
|
||||
case `arch` in
|
||||
|
|
Loading…
Reference in New Issue