diff options
author | tzafrir <tzafrir@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-10-26 22:13:25 +0000 |
---|---|---|
committer | tzafrir <tzafrir@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-10-26 22:13:25 +0000 |
commit | 8b0bc91966e7c3cc542933f6a40b2323fd1b0cc0 (patch) | |
tree | 2d3f591ef2661430be5a7046128f387fb16b0649 /configure | |
parent | d3c90b9f3120916f1bdeef7fc95cdf015fb49a30 (diff) |
detect ARM Linux EABI OSARCH as linux-gnu instead of linux-gnueabi
* Set OSARCH to linux-gnu even if host_os is linux-gnueabi
* When checking if we are Linux, check OSARCH rather than host_os
The newer ARM ABI ("EABI") shows the OS name 'linux-gnueabi' rather than
'linux-gnu' . This patch sets OSARCH to be 'linux-gnu' even in such a case.
OSARCH is tested for the value of 'linux-gnu' in one or two places in the
tree. This patch also fixes the check libcap to check for $OSARCH rather
than $host_os .
See also: http://wiki.debian.org/ArmEabiPort
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.4@225957 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'configure')
-rwxr-xr-x | configure | 21 |
1 files changed, 9 insertions, 12 deletions
@@ -1,5 +1,5 @@ #! /bin/sh -# From configure.ac Revision: 214436 . +# From configure.ac Revision: 214517 . # Guess values for system-dependent variables and create Makefiles. # Generated by GNU Autoconf 2.61 for asterisk 1.4. # @@ -4032,6 +4032,9 @@ case "${host_os}" in solaris*) OSARCH=SunOS ;; + linux-gnueabi) + OSARCH=linux-gnu + ;; *) OSARCH=${HOST_OS} ;; @@ -17377,7 +17380,7 @@ echo "$as_me: *** without explicitly specifying --with-${CURSES_OPTION}" >&6;} fi -if test "x${host_os}" = "xlinux-gnu" ; then +if test "x${OSARCH}" = "xlinux-gnu" ; then if test "${USE_CAP}" != "no"; then pbxlibdir="" @@ -32328,6 +32331,7 @@ _ACEOF + PBX_CURL=1 for _libcurl_feature in $_libcurl_features ; do cat >>confdefs.h <<_ACEOF @@ -32364,6 +32368,7 @@ _ACEOF else unset CURL_LIB unset CURL_INCLUDE + PBX_CURL=0 fi fi @@ -32380,18 +32385,10 @@ _ACEOF if test x$_libcurl_with = xno || test x$libcurl_cv_lib_curl_usable != xyes ; then # This is the IF-NO path - PBX_CURL=0 + : else # This is the IF-YES path - PBX_CURL=1 - -cat >>confdefs.h <<\_ACEOF -#define HAVE_CURL 1 -_ACEOF - - - - + : fi unset _libcurl_with |