aboutsummaryrefslogtreecommitdiff
path: root/configure.in
diff options
context:
space:
mode:
authordavilla <davilla@svn>2010-05-20 02:48:20 +0000
committerdavilla <davilla@svn>2010-05-20 02:48:20 +0000
commit81c8bd0984c47ba77c9571e962550a6326f25f3f (patch)
tree69b78f693c4dd6ba40cbf1699c54bbb1dca1000c /configure.in
parent973121c89872e04418f610579e5b3f6cf1e56d90 (diff)
move host testing so we can setup use_arch/use_cpu defaults for arm
git-svn-id: https://xbmc.svn.sourceforge.net/svnroot/xbmc/trunk@30325 568bbfeb-2a22-0410-94d2-cc84cf5bfa90
Diffstat (limited to 'configure.in')
-rw-r--r--configure.in78
1 files changed, 39 insertions, 39 deletions
diff --git a/configure.in b/configure.in
index e7ab965dae..28980542eb 100644
--- a/configure.in
+++ b/configure.in
@@ -60,44 +60,6 @@ external_python_enabled="== Use of external python enabled. =="
external_python_disabled="== Use of external python disabled. =="
ffmpeg_vdpau_not_supported="== External ffmpeg doesn't support VDPAU. VDPAU support disabled. =="
-case $host in
- i*86*-linux-gnu*)
- ARCH="i486-linux"
- ;;
- x86_64-*-linux-gnu*)
- ARCH="x86_64-linux"
- ;;
- i386-apple-darwin*)
- ARCH="x86-osx"
- # define i386 or x86_64, cannot use $HOSTTYPE as it reports x86_64 on 10.6 regardless of kernel flavor
- ARCHTYPE=`uname -m`
- AC_SUBST([ARCHTYPE])
- AC_SUBST(ARCH_DEFINES, "-mmacosx-version-min=10.4 -isysroot /Developer/SDKs/MacOSX10.4u.sdk")
- ;;
- powerpc-apple-darwin*)
- ARCH="powerpc-osx"
- # define ppc
- ARCHTYPE=`arch`
- AC_SUBST([ARCHTYPE])
- AC_SUBST(ARCH_DEFINES, "-mmacosx-version-min=10.4 -isysroot /Developer/SDKs/MacOSX10.4u.sdk")
- ;;
- powerpc-*-linux-gnu*)
- ARCH="powerpc-linux"
- AC_SUBST(ARCH_DEFINES, "-D_POWERPC")
- ;;
- powerpc64-*-linux-gnu*)
- ARCH="powerpc64-linux"
- AC_SUBST(ARCH_DEFINES, "-D_POWERPC64")
- ;;
- arm*-*-linux-gnu*)
- ARCH="arm"
- AC_SUBST(ARCH_DEFINES, "-D_ARMEL")
- ;;
- *)
- AC_MSG_ERROR(unsupported host ($host))
-esac
-AC_SUBST([ARCH])
-
AC_ARG_ENABLE([debug],
[AS_HELP_STRING([--enable-debug],
[enable debugging information (default is yes)])],
@@ -297,7 +259,6 @@ AC_ARG_ENABLE([external-python],
[use_external_python=$use_external_libraries])
use_external_libass="yes"
-
### End of external library options
# Checks for programs.
@@ -311,6 +272,45 @@ AC_PROG_AWK
AC_PROG_LN_S
AC_PROG_MAKE_SET
+# host detection and setup
+case $host in
+ i*86*-linux-gnu*)
+ ARCH="i486-linux"
+ ;;
+ x86_64-*-linux-gnu*)
+ ARCH="x86_64-linux"
+ ;;
+ i386-apple-darwin*)
+ ARCH="x86-osx"
+ # define i386 or x86_64, cannot use $HOSTTYPE as it reports x86_64 on 10.6 regardless of kernel flavor
+ ARCHTYPE=`uname -m`
+ AC_SUBST([ARCHTYPE])
+ AC_SUBST(ARCH_DEFINES, "-mmacosx-version-min=10.4 -isysroot /Developer/SDKs/MacOSX10.4u.sdk")
+ ;;
+ powerpc-apple-darwin*)
+ ARCH="powerpc-osx"
+ # define ppc
+ ARCHTYPE=`arch`
+ AC_SUBST([ARCHTYPE])
+ AC_SUBST(ARCH_DEFINES, "-mmacosx-version-min=10.4 -isysroot /Developer/SDKs/MacOSX10.4u.sdk")
+ ;;
+ powerpc-*-linux-gnu*)
+ ARCH="powerpc-linux"
+ AC_SUBST(ARCH_DEFINES, "-D_POWERPC")
+ ;;
+ powerpc64-*-linux-gnu*)
+ ARCH="powerpc64-linux"
+ AC_SUBST(ARCH_DEFINES, "-D_POWERPC64")
+ ;;
+ arm*-*-linux-gnu*)
+ ARCH="arm"
+ AC_SUBST(ARCH_DEFINES, "-D_ARMEL")
+ ;;
+ *)
+ AC_MSG_ERROR(unsupported host ($host))
+esac
+AC_SUBST([ARCH])
+
# platform specific flags
if test "$host_vendor" = "apple" ; then
AC_SUBST(MACOSX_DEPLOYMENT_TARGET, "10.4")