kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-28 23:15:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged revisions 298817 via svnmerge from

Browse Source 
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: https://origsvn.digium.com/svn/asterisk/branches/1.8@298818 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Tilghman Lesher
2010-12-17 21:04:21 +00:00
parent 1c1631cebf
commit d82fd2fba5
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
configure vendored
View File

@@ -1,5 +1,5 @@
#! /bin/sh #! /bin/sh
# From configure.ac Revision: 296534 . # From configure.ac Revision: 298051 .
# Guess values for system-dependent variables and create Makefiles. # Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.65 for asterisk trunk. # 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 AST_SQLITE3_FOUND=yes
else else
ast_ext_lib_check_save_CFLAGS="${CFLAGS}" 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_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 "$as_me:${as_lineno-$LINENO}: checking for ${pbxfuncname} in -lsqlite3" >&5
$as_echo_n "checking for ${pbxfuncname} in -lsqlite3... " >&6; } $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 $as_echo_n "(cached) " >&6
else else
ac_check_lib_save_LIBS=$LIBS ac_check_lib_save_LIBS=$LIBS
LIBS="-lsqlite3 ${pbxlibdir} $LIBS" LIBS="-lsqlite3 ${pbxlibdir} ${PTHREAD_LIBS} $LIBS"
cat confdefs.h - <<_ACEOF >conftest.$ac_ext cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */ /* end confdefs.h. */
@@ -26220,12 +26220,12 @@ fi
# now check for the header. # now check for the header.
if test "${AST_SQLITE3_FOUND}" = "yes"; then 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 --with-SQLITE3=DIR has been specified, use it.
if test "x${SQLITE3_DIR}" != "x"; then if test "x${SQLITE3_DIR}" != "x"; then
SQLITE3_INCLUDE="-I${SQLITE3_DIR}/include" SQLITE3_INCLUDE="-I${SQLITE3_DIR}/include"
fi fi
SQLITE3_INCLUDE="${SQLITE3_INCLUDE} " SQLITE3_INCLUDE="${SQLITE3_INCLUDE} ${PTHREAD_CFLAGS}"
if test "xsqlite3.h" = "x" ; then # no header, assume found if test "xsqlite3.h" = "x" ; then # no header, assume found
SQLITE3_HEADER_FOUND="1" SQLITE3_HEADER_FOUND="1"
else # check for the header else # check for the header

2
configure.ac
View File

@@ -1921,7 +1921,7 @@ AC_SUBST(PBX_SPEEX_PREPROCESS)
AST_EXT_LIB_CHECK([SQLITE], [sqlite], [sqlite_exec], [sqlite.h]) AST_EXT_LIB_CHECK([SQLITE], [sqlite], [sqlite_exec], [sqlite.h])
AST_EXT_LIB_CHECK([SQLITE3], [sqlite3], [sqlite3_open], [sqlite3.h]) AST_EXT_LIB_CHECK([SQLITE3], [sqlite3], [sqlite3_open], [sqlite3.h], [${PTHREAD_LIBS}], [${PTHREAD_CFLAGS}])
AST_EXT_LIB_CHECK([CRYPTO], [crypto], [AES_encrypt], [openssl/aes.h]) AST_EXT_LIB_CHECK([CRYPTO], [crypto], [AES_encrypt], [openssl/aes.h])