aboutsummaryrefslogtreecommitdiffstats
path: root/configure
diff options
context:
space:
mode:
authortilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b>2010-12-17 21:04:21 +0000
committertilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b>2010-12-17 21:04:21 +0000
commitf9793e94706d63f00e57aa81e4bf7fd22a8d42cd (patch)
treea4ff2dc02acaada560c58f2cf6738ff013fefe2d /configure
parent7615bbcb3de1363ec9a0da4e5187a2e2cf8f73cc (diff)
Merged revisions 298817 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.6.2 ........ r298817 | tilghman | 2010-12-17 15:03:06 -0600 (Fri, 17 Dec 2010) | 8 lines Also include PTHREAD_LIBS and PTHREAD_CFLAGS for SQLite 3, as it's needed on some platforms. (closes issue #18493) Reported by: pprindeville Patches: asterisk-1.8-sqlite3.patch uploaded by pprindeville (license 347) Tested by: pprindeville ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.8@298818 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure10
1 files changed, 5 insertions, 5 deletions
diff --git a/configure b/configure
index 611636bff..392e42362 100755
--- a/configure
+++ b/configure
@@ -1,5 +1,5 @@
#! /bin/sh
-# From configure.ac Revision: 296534 .
+# From configure.ac Revision: 298051 .
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.65 for asterisk trunk.
#
@@ -26169,7 +26169,7 @@ if test "x${PBX_SQLITE3}" != "x1" -a "${USE_SQLITE3}" != "no"; then
AST_SQLITE3_FOUND=yes
else
ast_ext_lib_check_save_CFLAGS="${CFLAGS}"
- CFLAGS="${CFLAGS} "
+ CFLAGS="${CFLAGS} ${PTHREAD_CFLAGS}"
as_ac_Lib=`$as_echo "ac_cv_lib_sqlite3_${pbxfuncname}" | $as_tr_sh`
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${pbxfuncname} in -lsqlite3" >&5
$as_echo_n "checking for ${pbxfuncname} in -lsqlite3... " >&6; }
@@ -26177,7 +26177,7 @@ if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
-LIBS="-lsqlite3 ${pbxlibdir} $LIBS"
+LIBS="-lsqlite3 ${pbxlibdir} ${PTHREAD_LIBS} $LIBS"
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
@@ -26220,12 +26220,12 @@ fi
# now check for the header.
if test "${AST_SQLITE3_FOUND}" = "yes"; then
- SQLITE3_LIB="${pbxlibdir} -lsqlite3 "
+ SQLITE3_LIB="${pbxlibdir} -lsqlite3 ${PTHREAD_LIBS}"
# if --with-SQLITE3=DIR has been specified, use it.
if test "x${SQLITE3_DIR}" != "x"; then
SQLITE3_INCLUDE="-I${SQLITE3_DIR}/include"
fi
- SQLITE3_INCLUDE="${SQLITE3_INCLUDE} "
+ SQLITE3_INCLUDE="${SQLITE3_INCLUDE} ${PTHREAD_CFLAGS}"
if test "xsqlite3.h" = "x" ; then # no header, assume found
SQLITE3_HEADER_FOUND="1"
else # check for the header