diff options
| author | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-12-17 21:03:06 +0000 |
|---|---|---|
| committer | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-12-17 21:03:06 +0000 |
| commit | 1c923ad9517ce0ce50806f1348fc861089285b01 (patch) | |
| tree | da31775d690a05a6f4914a41a93e71452bd5e334 | |
| parent | 2853b42628e465fe2dc0570788208b3582203d61 (diff) | |
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.6.2@298817 f38db490-d61c-443f-a65b-d21fe96a405b
| -rwxr-xr-x | configure | 10 | ||||
| -rw-r--r-- | configure.ac | 2 |
2 files changed, 6 insertions, 6 deletions
@@ -1,5 +1,5 @@ #! /bin/sh -# From configure.ac Revision: 296533 . +# From configure.ac Revision: 298050 . # Guess values for system-dependent variables and create Makefiles. # Generated by GNU Autoconf 2.65 for asterisk 1.6.2. # @@ -22654,7 +22654,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; } @@ -22662,7 +22662,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. */ @@ -22705,12 +22705,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 e4b600a74..5a8924e50 100644 --- a/configure.ac +++ b/configure.ac @@ -1699,7 +1699,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]) |