aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xconfigure21
-rw-r--r--configure.ac5
-rw-r--r--include/asterisk/autoconfig.h.in2
3 files changed, 14 insertions, 14 deletions
diff --git a/configure b/configure
index b0cdd1fa1..80ba7ed73 100755
--- 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 46281d57b..c5c3f0c84 100644
--- 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 af6f19a29..e84f204b9 100644
--- 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. */