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: https://origsvn.digium.com/svn/asterisk/branches/1.4@225957 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/configure b/configure
index b0cdd1fa16b2fb1054dde3b26548cffd72adfc2f..80ba7ed732099243f694b70804ee49ac841a0528 100755 (executable)
--- a/configure
+++ b/configure
@@ -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

diff --git a/configure.ac b/configure.ac
index 46281d57be6ffe4136b865a8379b4a15241b6459..c5c3f0c842c8e7e75d83c1f3f1049c7f324d8302 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -80,6 +80,9 @@ case "${host_os}" in
      solaris*)
      OSARCH=SunOS
      ;;
+     linux-gnueabi)
+     OSARCH=linux-gnu
+     ;;
      *)
      OSARCH=${HOST_OS}
      ;;
@@ -494,7 +497,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
 

diff --git a/include/asterisk/autoconfig.h.in b/include/asterisk/autoconfig.h.in
index af6f19a29eb133499f6b010f58217143fbfc905f..e84f204b996f6d744010321c173c4bfdbf61f537 100644 (file)
--- a/include/asterisk/autoconfig.h.in
+++ b/include/asterisk/autoconfig.h.in
@@ -71,7 +71,7 @@
 /* Define to 1 if your system has a working `chown' function. */
 #undef HAVE_CHOWN
 
-/* Define if your system has the curl libraries. */
+/* Define to 1 if you have a functional curl library. */
 #undef HAVE_CURL
 
 /* Define to 1 if you have the curses library. */