StarMirror
/
toxcore
mirror of https://github.com/irungentoo/toxcore
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Build system fixes. 

libtoxcore.pc now has -lpthread like it's supposed to on systems
where it is needed.
pull/1203/head
irungentoo 2014-12-18 10:04:31 -05:00
parent 9da75d009f
commit 1db01073e5
No known key found for this signature in database
GPG Key ID: 10349DC9BED89E98
3 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
configure.ac
View File

@ -489,6 +489,13 @@ AX_PTHREAD(
] ]
) )
AC_CHECK_LIB([pthread], [pthread_self],
[
PTHREAD_LDFLAGS="-lpthread"
AC_SUBST(PTHREAD_LDFLAGS)
]
)
if test "x$BUILD_AV" = "xyes"; then if test "x$BUILD_AV" = "xyes"; then
PKG_CHECK_MODULES([OPUS], [opus], PKG_CHECK_MODULES([OPUS], [opus],
[], [],
@ -512,8 +519,7 @@ fi
if test "x$BUILD_AV" = "xyes"; then if test "x$BUILD_AV" = "xyes"; then
# toxcore lib needs an global? # toxcore lib needs an global?
# So far this works okay # So far this works okay
## What about pthread? AV_LIBS="$OPUS_LIBS $VPX_LIBS"
AV_LIBS="$OPUS_LIBS $VPX_LIBS -pthread"
AC_SUBST(AV_LIBS) AC_SUBST(AV_LIBS)
AV_CFLAGS="$OPUS_CFLAGS $VPX_CFLAGS" AV_CFLAGS="$OPUS_CFLAGS $VPX_CFLAGS"

4
libtoxav.pc.in
View File

@ -5,7 +5,7 @@ includedir=@includedir@
Name: libtoxav Name: libtoxav
Description: Tox A/V library Description: Tox A/V library
Requires: Requires: libtoxcore
Version: @PACKAGE_VERSION@ Version: @PACKAGE_VERSION@
Libs: -L${libdir} -ltoxav @AV_LIBS@ Libs: -L${libdir} -ltoxav @AV_LIBS@
Cflags: -I${includedir} Cflags: -I${includedir}

2
libtoxcore.pc.in
View File

@ -7,5 +7,5 @@ Name: libtoxcore
Description: Tox protocol library Description: Tox protocol library
Requires: Requires:
Version: @PACKAGE_VERSION@ Version: @PACKAGE_VERSION@
Libs: @NACL_OBJECTS_PKGCONFIG@ -L${libdir} @NACL_LDFLAGS@ -ltoxdns -ltoxencryptsave -ltoxcore @NACL_LIBS@ @LIBS@ @MATH_LDFLAGS@ Libs: @NACL_OBJECTS_PKGCONFIG@ -L${libdir} @NACL_LDFLAGS@ -ltoxdns -ltoxencryptsave -ltoxcore @NACL_LIBS@ @LIBS@ @MATH_LDFLAGS@ @PTHREAD_LDFLAGS@
Cflags: -I${includedir} Cflags: -I${includedir}