[svn-commits] tzafrir: branch 1.6.2 r226055 - in /branches/1.6.2: ./ configure configure.ac

[SVN commits to the Digium repositories]

Author: tzafrir
Date: Mon Oct 26 19:16:39 2009
New Revision: 226055

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=226055
Log:
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

Modified:
    branches/1.6.2/   (props changed)
    branches/1.6.2/configure
    branches/1.6.2/configure.ac

Propchange: branches/1.6.2/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.2/configure.ac
URL: http://svnview.digium.com/svn/asterisk/branches/1.6.2/configure.ac?view=diff&rev=226055&r1=226054&r2=226055
==============================================================================
--- branches/1.6.2/configure.ac (original)
+++ branches/1.6.2/configure.ac Mon Oct 26 19:16:39 2009
@@ -120,6 +120,9 @@
      cygwin)
      OSARCH=cygwin
      PBX_WINARCH=1
+     ;;
+     linux-gnueabi)
+     OSARCH=linux-gnu
      ;;
      *)
      OSARCH=${host_os}
@@ -656,7 +659,7 @@
 
 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