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

diff --git a/configure b/configure
index 611636bff0565f29c09456719c888f92543fa57e..392e42362c5b92ecfa1ac05de0cb3bfead3824f1 100755 (executable)
--- 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

diff --git a/configure.ac b/configure.ac
index 365b9b975510283473cb7b95cd5a9c90ce8c2401..32d43e786032cee8e2730e0d1fd9faa998b3d538 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1921,7 +1921,7 @@ AC_SUBST(PBX_SPEEX_PREPROCESS)
 
 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])