Tha_14/toxic
1
0
Fork 0
mirror of https://github.com/Tha14/toxic.git synced 2024-11-23 06:43:03 +01:00
Code Issues Projects Releases Wiki Activity

Use tox.h and tox_new for toxcore discovery

Browse Source
This commit is contained in:
Florian Hahn 2013-08-24 00:21:39 +02:00
parent 2db69f0fd6
commit 6f9813ceee
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
configure.ac
View File

@ -252,7 +252,7 @@ CPPFLAGS_SAVE="$CPPFLAGS"
if test -n "$LIBTOXCORE_SEARCH_HEADERS"; then if test -n "$LIBTOXCORE_SEARCH_HEADERS"; then
CFLAGS="$CFLAGS -I$LIBTOXCORE_SEARCH_HEADERS $LIBSODIUM_CFLAGS" CFLAGS="$CFLAGS -I$LIBTOXCORE_SEARCH_HEADERS $LIBSODIUM_CFLAGS"
CPPFLAGS="$CPPFLAGS -I$LIBTOXCORE_SEARCH_HEADERS $LIBSODIUM_CFLAGS" CPPFLAGS="$CPPFLAGS -I$LIBTOXCORE_SEARCH_HEADERS $LIBSODIUM_CFLAGS"
AC_CHECK_HEADER([Messenger.h], AC_CHECK_HEADER([tox.h],
[ [
LIBTOXCORE_CFLAGS="-I$LIBTOXCORE_SEARCH_HEADERS" LIBTOXCORE_CFLAGS="-I$LIBTOXCORE_SEARCH_HEADERS"
], ],
@ -263,7 +263,7 @@ if test -n "$LIBTOXCORE_SEARCH_HEADERS"; then
else else
CFLAGS="$CFLAGS $LIBSODIUM_CFLAGS" CFLAGS="$CFLAGS $LIBSODIUM_CFLAGS"
CPPFLAGS="$CPPFLAGS $LIBSODIUM_CFLAGS" CPPFLAGS="$CPPFLAGS $LIBSODIUM_CFLAGS"
AC_CHECK_HEADER([Messenger.h], AC_CHECK_HEADER([tox.h],
[], [],
[ [
AC_MSG_ERROR([headers for the toxcore library were not found on your system]) AC_MSG_ERROR([headers for the toxcore library were not found on your system])
@ -279,7 +279,7 @@ LIBTOXCORE_LDFLAGS=
LDFLAGS_SAVE="$LDFLAGS" LDFLAGS_SAVE="$LDFLAGS"
if test -n "$LIBTOXCORE_SEARCH_LIBS"; then if test -n "$LIBTOXCORE_SEARCH_LIBS"; then
LDFLAGS="$LDFLAGS $LIBSODIUM_LDFLAGS -L$LIBTOXCORE_SEARCH_LIBS $LIBSODIUM_LIBS" LDFLAGS="$LDFLAGS $LIBSODIUM_LDFLAGS -L$LIBTOXCORE_SEARCH_LIBS $LIBSODIUM_LIBS"
AC_CHECK_LIB([toxcore], [initMessenger], AC_CHECK_LIB([toxcore], [tox_new],
[ [
LIBTOXCORE_LDFLAGS="-L$LIBTOXCORE_SEARCH_LIBS" LIBTOXCORE_LDFLAGS="-L$LIBTOXCORE_SEARCH_LIBS"
LIBTOXCORE_LIBS="-ltoxcore" LIBTOXCORE_LIBS="-ltoxcore"
@ -290,7 +290,7 @@ if test -n "$LIBTOXCORE_SEARCH_LIBS"; then
) )
else else
LDFLAGS="$LDFLAGS $LIBSODIUM_LDFLAGS $LIBSODIUM_LIBS" LDFLAGS="$LDFLAGS $LIBSODIUM_LDFLAGS $LIBSODIUM_LIBS"
AC_CHECK_LIB([toxcore], [initMessenger], AC_CHECK_LIB([toxcore], [tox_new],
[], [],
[ [
AC_MSG_ERROR([required library toxcore was not found on your system]) AC_MSG_ERROR([required library toxcore was not found on your system])