diff options
| author | tzafrir <tzafrir@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-10-26 23:48:25 +0000 |
|---|---|---|
| committer | tzafrir <tzafrir@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-10-26 23:48:25 +0000 |
| commit | 335b953c2987536072cad052397417e1ffa19515 (patch) | |
| tree | f8d4290a45a9c1830634c5712b18f66c9173c4b0 /configure.ac | |
| parent | 722e3c7c23c83d192ea8869d08f11ecace228186 (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
Merged revisions 225957 via svnmerge from
http://svn.digium.com/svn/asterisk/branches/1.4
Merged revisions 226018 via svnmerge from
http://svn.digium.com/svn/asterisk/trunk
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@226053 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac index 773ab9b48..5b971953d 100644 --- a/configure.ac +++ b/configure.ac @@ -109,6 +109,9 @@ case "${host_os}" in OSARCH=cygwin WINARCH=1 ;; + linux-gnueabi) + OSARCH=linux-gnu + ;; *) OSARCH=${host_os} ;; @@ -634,7 +637,7 @@ AST_EXT_LIB_CHECK([ALSA], [asound], [snd_spcm_init], [alsa/asoundlib.h], [-lm -l AST_EXT_LIB_CHECK([CURSES], [curses], [initscr], [curses.h]) -if test "x${host_os}" = "xlinux-gnu" ; then +if test "x${OSARCH}" = "xlinux-gnu" ; then AST_EXT_LIB_CHECK([CAP], [cap], [cap_from_text], [sys/capability.h]) fi |