[asterisk-commits] tilghman: branch 1.6.0 r261914 - in /branches/1.6.0: ./ include/asterisk/
SVN commits to the Asterisk project
asterisk-commits at lists.digium.com
Fri May 7 15:42:42 CDT 2010
Author: tilghman
Date: Fri May 7 15:42:37 2010
New Revision: 261914
URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=261914
Log:
Merged revisions 261913 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
........
r261913 | tilghman | 2010-05-07 15:35:17 -0500 (Fri, 07 May 2010) | 14 lines
Use the detected pthread building flags in every place, instead of hardcoding -lpthread.
We nicely detect the right flags on each system for building Asterisk with
pthreads, then ignore it for every other build option that requires us to
build with pthreads. This caused some items to return a false negative.
Also cleanup some minor naming issues that caused "library library" redundancy
in the output.
(closes issue #17303)
Reported by: stuarth
Patches:
20100507__issue17303.diff.txt uploaded by tilghman (license 14)
Tested by: stuarth
........
Modified:
branches/1.6.0/ (props changed)
branches/1.6.0/configure
branches/1.6.0/configure.ac
branches/1.6.0/include/asterisk/autoconfig.h.in
Propchange: branches/1.6.0/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.
Modified: branches/1.6.0/configure.ac
URL: http://svnview.digium.com/svn/asterisk/branches/1.6.0/configure.ac?view=diff&rev=261914&r1=261913&r2=261914
==============================================================================
--- branches/1.6.0/configure.ac (original)
+++ branches/1.6.0/configure.ac Fri May 7 15:42:37 2010
@@ -275,26 +275,26 @@
# BKTR is used for backtrace support on platforms that do not
# have it natively.
-AST_EXT_LIB_SETUP([BKTR], [Stack Backtrace support], [execinfo])
+AST_EXT_LIB_SETUP([BKTR], [Stack Backtrace], [execinfo])
AST_EXT_LIB_SETUP([CAP], [POSIX 1.e capabilities], [cap])
AST_EXT_LIB_SETUP([CURL], [cURL], [curl])
AST_EXT_LIB_SETUP([CURSES], [curses], [curses])
-AST_EXT_LIB_SETUP([CRYPTO], [OpenSSL Cryptography support], [crypto])
+AST_EXT_LIB_SETUP([CRYPTO], [OpenSSL Cryptography], [crypto])
AST_EXT_LIB_SETUP([DAHDI], [DAHDI], [dahdi])
-AST_EXT_LIB_SETUP([FFMPEG], [Ffmpeg and avcodec library], [avcodec])
-AST_EXT_LIB_SETUP([GSM], [External GSM library], [gsm], [, use 'internal' GSM otherwise])
+AST_EXT_LIB_SETUP([FFMPEG], [Ffmpeg and avcodec], [avcodec])
+AST_EXT_LIB_SETUP([GSM], [External GSM], [gsm], [, use 'internal' GSM otherwise])
AST_EXT_LIB_SETUP([GTK], [gtk libraries], [gtk])
-AST_EXT_LIB_SETUP([GTK2], [gtk2 libraries], [gtk2])
-AST_EXT_LIB_SETUP([GMIME], [GMime library], [gmime])
-AST_EXT_LIB_SETUP([ICONV], [Iconv Library], [iconv])
-AST_EXT_LIB_SETUP([IKSEMEL], [Iksemel Jabber Library], [iksemel])
+AST_EXT_LIB_SETUP([GTK2], [gtk2], [gtk2])
+AST_EXT_LIB_SETUP([GMIME], [GMime], [gmime])
+AST_EXT_LIB_SETUP([ICONV], [Iconv], [iconv])
+AST_EXT_LIB_SETUP([IKSEMEL], [Iksemel Jabber], [iksemel])
AST_EXT_LIB_SETUP([IMAP_TK], [UW IMAP Toolkit], [imap])
-AST_EXT_LIB_SETUP([ISDNNET], [ISDN4Linux Library], [isdnnet])
+AST_EXT_LIB_SETUP([ISDNNET], [ISDN4Linux], [isdnnet])
AST_EXT_LIB_SETUP([JACK], [Jack Audio Connection Kit], [jack])
AST_EXT_LIB_SETUP([LDAP], [OpenLDAP], [ldap])
AST_EXT_LIB_SETUP([LTDL], [libtool], [ltdl])
AST_EXT_LIB_SETUP([LUA], [Lua], [lua])
-AST_EXT_LIB_SETUP([MISDN], [mISDN User Library], [misdn])
+AST_EXT_LIB_SETUP([MISDN], [mISDN user], [misdn])
AST_EXT_LIB_SETUP([NBS], [Network Broadcast Sound], [nbs])
AST_EXT_LIB_SETUP([NCURSES], [ncurses], [ncurses])
AST_EXT_LIB_SETUP([NETSNMP], [Net-SNMP], [netsnmp])
@@ -319,15 +319,15 @@
AST_EXT_LIB_SETUP([OPENH323], [OpenH323], [h323])
AST_EXT_LIB_SETUP([RADIUS], [Radius Client], [radius])
AST_EXT_LIB_SETUP([SDL], [Sdl], [sdl])
-AST_EXT_LIB_SETUP([SDL_IMAGE], [Sdl Image library], [SDL_image])
+AST_EXT_LIB_SETUP([SDL_IMAGE], [Sdl Image], [SDL_image])
AST_EXT_LIB_SETUP([SPEEX], [Speex], [speex])
AST_EXT_LIB_SETUP([SPEEX_PREPROCESS], [Speex preprocess routines], [speex])
-AST_EXT_LIB_SETUP([SPEEXDSP], [Speexdsp], [speexdsp])
+AST_EXT_LIB_SETUP([SPEEXDSP], [SpeexDSP], [speexdsp])
AST_EXT_LIB_SETUP_DEPENDENT([SPEEX_PREPROCESS], [speex_preprocess_ctl], [], [speex])
AST_EXT_LIB_SETUP([SQLITE], [SQLite], [sqlite])
AST_EXT_LIB_SETUP([SQLITE3], [SQLite], [sqlite3])
AST_EXT_LIB_SETUP([SUPPSERV], [mISDN Supplemental Services], [suppserv])
-AST_EXT_LIB_SETUP([OPENSSL], [OpenSSL Secure Sockets Layer support], [ssl])
+AST_EXT_LIB_SETUP([OPENSSL], [OpenSSL Secure Sockets Layer], [ssl])
AST_EXT_LIB_SETUP([FREETDS], [FreeTDS], [tds])
AST_EXT_LIB_SETUP([TERMCAP], [Termcap], [termcap])
AST_EXT_LIB_SETUP([TINFO], [Term Info], [tinfo])
@@ -335,8 +335,8 @@
AST_EXT_LIB_SETUP([USB], [usb], [usb])
AST_EXT_LIB_SETUP([VORBIS], [Vorbis], [vorbis])
AST_EXT_LIB_SETUP([VPB], [Voicetronix API], [vpb])
-AST_EXT_LIB_SETUP([X11], [X11 support], [x11])
-AST_EXT_LIB_SETUP([ZLIB], [zlib], [z])
+AST_EXT_LIB_SETUP([X11], [X11], [x11])
+AST_EXT_LIB_SETUP([ZLIB], [zlib compression], [z])
# check for basic system features and functionality before
# checking for package libraries
@@ -505,6 +505,10 @@
)
AC_MSG_CHECKING(for pthread_rwlock_timedwrlock() in pthread.h)
+save_LIBS="$LIBS"
+save_CFLAGS="$CFLAGS"
+LIBS="$PTHREAD_LIBS $LIBS"
+CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
AC_LINK_IFELSE(
[AC_LANG_PROGRAM(
[#include <pthread.h>
@@ -518,6 +522,8 @@
ac_cv_pthread_rwlock_timedwrlock="no"
]
)
+LIBS="$save_LIBS"
+CFLAGS="$save_CFLAGS"
if test "${ac_cv_pthread_rwlock_timedwrlock}" = "yes"; then
AC_DEFINE([HAVE_PTHREAD_RWLOCK_TIMEDWRLOCK], 1, [Define if your system has pthread_rwlock_timedwrlock()])
fi
@@ -1558,6 +1564,7 @@
if test "${USE_VPB}" != "no"; then
AC_MSG_CHECKING(for vpb_open in -lvpb)
saved_libs="${LIBS}"
+ saved_cflags="${CFLAGS}"
saved_cppflags="${CPPFLAGS}"
if test "x${VPB_DIR}" != "x"; then
if test -d ${VPB_DIR}/lib; then
@@ -1568,7 +1575,8 @@
LIBS="${LIBS} -L${vpblibdir}"
CPPFLAGS="${CPPFLAGS} -I${VPB_DIR}/include"
fi
- LIBS="${LIBS} -lvpb -lpthread"
+ LIBS="${PTHREAD_LIBS} ${LIBS} -lvpb"
+ CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
AC_LINK_IFELSE(
[
AC_LANG_PROGRAM(
@@ -1582,6 +1590,7 @@
ac_cv_lib_vpb_vpb_open="no"
]
)
+ CFLAGS="${saved_cflags}"
LIBS="${saved_libs}"
CPPFLAGS="${saved_cppflags}"
if test "${ac_cv_lib_vpb_vpb_open}" = "yes"; then
@@ -1629,7 +1638,7 @@
AST_EXT_TOOL_CHECK([SDL], [sdl])
AST_EXT_LIB_CHECK([SDL_IMAGE], [SDL_image], [IMG_Load], [SDL_image.h], [${SDL_LIB}], [${SDL_INCLUDE}])
-AST_EXT_LIB_CHECK([FFMPEG], [avcodec], [sws_getContext], [ffmpeg/avcodec.h], [-lpthread -lz -lm])
+AST_EXT_LIB_CHECK([FFMPEG], [avcodec], [sws_getContext], [ffmpeg/avcodec.h], [${PTHREAD_LIBS} -lz -lm], [${PTHREAD_CFLAGS}])
# possible places for video4linux version 1
AC_CHECK_HEADER([linux/videodev.h],
Modified: branches/1.6.0/include/asterisk/autoconfig.h.in
URL: http://svnview.digium.com/svn/asterisk/branches/1.6.0/include/asterisk/autoconfig.h.in?view=diff&rev=261914&r1=261913&r2=261914
==============================================================================
--- branches/1.6.0/include/asterisk/autoconfig.h.in (original)
+++ branches/1.6.0/include/asterisk/autoconfig.h.in Fri May 7 15:42:37 2010
@@ -96,10 +96,10 @@
/* Define to 1 if your GCC C compiler supports the 'weak' attribute. */
#undef HAVE_ATTRIBUTE_weak
-/* Define to 1 if you have the Stack Backtrace support library. */
+/* Define to 1 if you have the Stack Backtrace library. */
#undef HAVE_BKTR
-/* Define to the version of the Stack Backtrace support library. */
+/* Define to the version of the Stack Backtrace library. */
#undef HAVE_BKTR_VERSION
/* Define to 1 if byteswap.h macros are available. */
@@ -126,10 +126,10 @@
/* Define to 1 if you have the `cosl' function. */
#undef HAVE_COSL
-/* Define to 1 if you have the OpenSSL Cryptography support library. */
+/* Define to 1 if you have the OpenSSL Cryptography library. */
#undef HAVE_CRYPTO
-/* Define to the version of the OpenSSL Cryptography support library. */
+/* Define to the version of the OpenSSL Cryptography library. */
#undef HAVE_CRYPTO_VERSION
/* Define to 1 if you have a functional curl library. */
@@ -193,10 +193,10 @@
/* Define to 1 if you have the <fcntl.h> header file. */
#undef HAVE_FCNTL_H
-/* Define to 1 if you have the Ffmpeg and avcodec library library. */
+/* Define to 1 if you have the Ffmpeg and avcodec library. */
#undef HAVE_FFMPEG
-/* Define to the version of the Ffmpeg and avcodec library library. */
+/* Define to the version of the Ffmpeg and avcodec library. */
#undef HAVE_FFMPEG_VERSION
/* Define to 1 if you have the `floor' function. */
@@ -283,7 +283,7 @@
/* Define if your system has the GMIME libraries. */
#undef HAVE_GMIME
-/* Define to the version of the GMime library library. */
+/* Define to the version of the GMime library. */
#undef HAVE_GMIME_VERSION
/* Define to indicate the GSM library */
@@ -295,7 +295,7 @@
/* Define to indicate that gsm.h has no prefix for its location */
#undef HAVE_GSM_HEADER
-/* Define to the version of the External GSM library library. */
+/* Define to the version of the External GSM library. */
#undef HAVE_GSM_VERSION
/* Define if your system has the GTK libraries. */
@@ -304,22 +304,22 @@
/* Define if your system has the GTK2 libraries. */
#undef HAVE_GTK2
-/* Define to the version of the gtk2 libraries library. */
+/* Define to the version of the gtk2 library. */
#undef HAVE_GTK2_VERSION
/* Define to the version of the gtk libraries library. */
#undef HAVE_GTK_VERSION
-/* Define to 1 if you have the Iconv Library library. */
+/* Define to 1 if you have the Iconv library. */
#undef HAVE_ICONV
-/* Define to the version of the Iconv Library library. */
+/* Define to the version of the Iconv library. */
#undef HAVE_ICONV_VERSION
-/* Define to 1 if you have the Iksemel Jabber Library library. */
+/* Define to 1 if you have the Iksemel Jabber library. */
#undef HAVE_IKSEMEL
-/* Define to the version of the Iksemel Jabber Library library. */
+/* Define to the version of the Iksemel Jabber library. */
#undef HAVE_IKSEMEL_VERSION
/* Define if your system has the UW IMAP Toolkit c-client library. */
@@ -350,10 +350,10 @@
/* Define to 1 if you have the `isascii' function. */
#undef HAVE_ISASCII
-/* Define to 1 if you have the ISDN4Linux Library library. */
+/* Define to 1 if you have the ISDN4Linux library. */
#undef HAVE_ISDNNET
-/* Define to the version of the ISDN4Linux Library library. */
+/* Define to the version of the ISDN4Linux library. */
#undef HAVE_ISDNNET_VERSION
/* Define to 1 if you have the Jack Audio Connection Kit library. */
@@ -431,7 +431,7 @@
/* Define to 1 if you have the `memset' function. */
#undef HAVE_MEMSET
-/* Define to 1 if you have the mISDN User Library library. */
+/* Define to 1 if you have the mISDN user library. */
#undef HAVE_MISDN
/* Define if your system has the MISDN_FAC_ERROR headers. */
@@ -446,7 +446,7 @@
/* Define MISDN_FAC_RESULT headers version */
#undef HAVE_MISDN_FAC_RESULT_VERSION
-/* Define to the version of the mISDN User Library library. */
+/* Define to the version of the mISDN user library. */
#undef HAVE_MISDN_VERSION
/* Define to 1 if you have the `mkdir' function. */
@@ -503,12 +503,10 @@
/* Define to the version of the OpenH323 library. */
#undef HAVE_OPENH323_VERSION
-/* Define to 1 if you have the OpenSSL Secure Sockets Layer support library.
- */
+/* Define to 1 if you have the OpenSSL Secure Sockets Layer library. */
#undef HAVE_OPENSSL
-/* Define to the version of the OpenSSL Secure Sockets Layer support library.
- */
+/* Define to the version of the OpenSSL Secure Sockets Layer library. */
#undef HAVE_OPENSSL_VERSION
/* Define to 1 if you have the OSP Toolkit library. */
@@ -658,10 +656,10 @@
/* Define if your system has the SDL libraries. */
#undef HAVE_SDL
-/* Define to 1 if you have the Sdl Image library library. */
+/* Define to 1 if you have the Sdl Image library. */
#undef HAVE_SDL_IMAGE
-/* Define to the version of the Sdl Image library library. */
+/* Define to the version of the Sdl Image library. */
#undef HAVE_SDL_IMAGE_VERSION
/* Define to the version of the Sdl library. */
@@ -697,10 +695,10 @@
/* Define to 1 if you have the Speex library. */
#undef HAVE_SPEEX
-/* Define to 1 if you have the Speexdsp library. */
+/* Define to 1 if you have the SpeexDSP library. */
#undef HAVE_SPEEXDSP
-/* Define to the version of the Speexdsp library. */
+/* Define to the version of the SpeexDSP library. */
#undef HAVE_SPEEXDSP_VERSION
/* Define to 1 if you have the speex_preprocess_ctl library. */
@@ -981,16 +979,16 @@
/* Define to 1 if `vfork' works. */
#undef HAVE_WORKING_VFORK
-/* Define to 1 if you have the X11 support library. */
+/* Define to 1 if you have the X11 library. */
#undef HAVE_X11
-/* Define to the version of the X11 support library. */
+/* Define to the version of the X11 library. */
#undef HAVE_X11_VERSION
-/* Define to 1 if you have the zlib library. */
+/* Define to 1 if you have the zlib compression library. */
#undef HAVE_ZLIB
-/* Define to the version of the zlib library. */
+/* Define to the version of the zlib compression library. */
#undef HAVE_ZLIB_VERSION
/* Define to 1 if the system has the type `_Bool'. */
More information about the asterisk-commits
mailing list