projects / packages / twinkle.git / blame
| Commit | Line | Data |
|---|---|---|
| 3db1ecb0 AM |
1 | --- twinkle-1.4.2/configure.in.org 2012-11-25 13:35:52.700436829 +0100 |
| 2 | +++ twinkle-1.4.2/configure.in 2012-11-25 13:36:12.737587289 +0100 | |
| 3 | @@ -247,15 +247,18 @@ | |
| 4 | # iLBC | |
| 5 | if test "x$ac_cv_ilbc" = "xyes" | |
| 6 | then | |
| 7 | - AC_CHECK_LIB(ilbc, iLBC_decode, [ | |
| 8 | - AC_CHECK_HEADER(ilbc/iLBC_define.h, [], | |
| 9 | - [AC_MSG_ERROR([ilbc header files missing])]) | |
| 10 | + saved_LIBS="$LIBS" | |
| 11 | + LIBS="$LIBS -lilbc" | |
| 12 | + AC_LINK_IFELSE([ | |
| 13 | + #include <stdio.h> | |
| 14 | + #include <ilbc.h> | |
| 15 | + int main() { iLBC_decode(NULL, NULL, NULL, 0); return 0; } ], [ | |
| 16 | AC_DEFINE(HAVE_ILBC, 1, [Define to 1 if you have the <ilbc> library.]) | |
| 17 | LIBS="-lilbc $LIBS" | |
| 18 | echo "LIBS += -lilbc" >> $QT_INCL_PRO | |
| 19 | have_ilbc="yes" | |
| 20 | ], [have_ilbc="no"]) | |
| 21 | - | |
| 22 | + LIBS="$saved_LIBS" | |
| 23 | if test "x$ac_cv_ilbc_cpp" = "xyes" | |
| 24 | then | |
| 25 | AC_DEFINE(HAVE_ILBC_CPP, 1, [Define to 1 if you have a C++ ilbc library.]) | |
| 26 | --- twinkle-1.4.2/src/audio/audio_encoder.h~ 2012-11-25 13:36:19.687755088 +0100 | |
| 27 | +++ twinkle-1.4.2/src/audio/audio_encoder.h 2012-11-25 13:37:58.863482959 +0100 | |
| 28 | @@ -39,7 +39,7 @@ | |
| 29 | #ifndef HAVE_ILBC_CPP | |
| 30 | extern "C" { | |
| 31 | #endif | |
| 32 | -#include <ilbc/iLBC_define.h> | |
| 33 | +#include <ilbc.h> | |
| 34 | #ifndef HAVE_ILBC_CPP | |
| 35 | } | |
| 36 | #endif | |
| 37 | --- twinkle-1.4.2/src/audio/audio_decoder.h~ 2012-11-25 13:36:19.687755088 +0100 | |
| 38 | +++ twinkle-1.4.2/src/audio/audio_decoder.h 2012-11-25 13:38:12.730484432 +0100 | |
| 39 | @@ -40,7 +40,7 @@ | |
| 40 | #ifndef HAVE_ILBC_CPP | |
| 41 | extern "C" { | |
| 42 | #endif | |
| 43 | -#include <ilbc/iLBC_define.h> | |
| 44 | +#include <ilbc.h> | |
| 45 | #ifndef HAVE_ILBC_CPP | |
| 46 | } | |
| 47 | #endif | |
| 48 | --- twinkle-1.4.2/src/audio/audio_encoder.cpp~ 2009-01-18 15:13:46.000000000 +0100 | |
| 49 | +++ twinkle-1.4.2/src/audio/audio_encoder.cpp 2012-11-25 13:39:31.529053658 +0100 | |
| 50 | @@ -24,7 +24,7 @@ | |
| 51 | #ifndef HAVE_ILBC_CPP | |
| 52 | extern "C" { | |
| 53 | #endif | |
| 54 | -#include <ilbc/iLBC_encode.h> | |
| 55 | +#include <ilbc.h> | |
| 56 | #ifndef HAVE_ILBC_CPP | |
| 57 | } | |
| 58 | #endif | |
| 59 | --- twinkle-1.4.2/src/audio/audio_decoder.cpp~ 2009-01-18 14:38:00.000000000 +0100 | |
| 60 | +++ twinkle-1.4.2/src/audio/audio_decoder.cpp 2012-11-25 13:39:48.622799700 +0100 | |
| 61 | @@ -25,7 +25,7 @@ | |
| 62 | #ifndef HAVE_ILBC_CPP | |
| 63 | extern "C" { | |
| 64 | #endif | |
| 65 | -#include <ilbc/iLBC_decode.h> | |
| 66 | +#include <ilbc.h> | |
| 67 | #ifndef HAVE_ILBC_CPP | |
| 68 | } | |
| 69 | #endif |