Holger Hans Peter Freyther | 0b0ef8a | 2011-11-11 21:41:31 +0800 | [diff] [blame] | 1 | Index: git/Makefile.am |
| 2 | =================================================================== |
| 3 | --- git.orig/Makefile.am 2011-10-14 00:53:48.245117239 +0800 |
| 4 | +++ git/Makefile.am 2011-10-14 00:53:48.633117240 +0800 |
| 5 | @@ -53,7 +53,7 @@ |
| 6 | |
| 7 | GSM_SOURCE += gsm_audio.c gsm.cpp |
| 8 | |
| 9 | -GSM_LIB += /usr/lib/libgsm.a |
| 10 | +GSM_LIB += -lgsm |
| 11 | |
| 12 | #gsm_audio.po: gsm_audio.c gsm_audio.h |
| 13 | # $(CC) -D_GNU_SOURCE -fPIC -c gsm_audio.c -o gsm_audio.po |
| 14 | Index: git/configure.ac |
| 15 | =================================================================== |
| 16 | --- git.orig/configure.ac 2011-10-14 00:53:48.257117239 +0800 |
| 17 | +++ git/configure.ac 2011-10-14 00:53:48.633117240 +0800 |
| 18 | @@ -178,12 +178,7 @@ |
| 19 | AM_CONDITIONAL(ENABLE_GSM, test "x$with_gsm_bs" == "xyes" -o "x$with_gsm_ms" == "xyes") |
| 20 | |
| 21 | AS_IF([test "x$with_gsm_bs" == xyes -o "x$with_gsm_ms" == xyes], |
| 22 | - [AC_MSG_CHECKING(/usr/include/gsm/gsm.h) |
| 23 | - if test -e /usr/include/gsm/gsm.h; then |
| 24 | - AC_MSG_RESULT(yes) |
| 25 | - else |
| 26 | - AC_MSG_FAILURE([You have enabled GSM, but /usr/include/gsm/gsm.h not found! Please install the lossy GSM codec. Be sure to install it in /usr/ and not in /usr/local/. You will also find a copy on http://www.linux-call-router.de.]) |
| 27 | - fi |
| 28 | + AC_MSG_RESULT(yes...why not use ac_check_headers...) |
| 29 | ]) |
| 30 | |
| 31 | # check for ss5 |
| 32 | Index: git/gsm_audio.c |
| 33 | =================================================================== |
| 34 | --- git.orig/gsm_audio.c 2011-10-14 00:53:48.000000000 +0800 |
| 35 | +++ git/gsm_audio.c 2011-10-14 00:55:12.929117386 +0800 |
| 36 | @@ -10,7 +10,7 @@ |
| 37 | \*****************************************************************************/ |
| 38 | |
| 39 | extern "C" { |
| 40 | -#include "/usr/include/gsm/gsm.h" |
| 41 | +#include <gsm/gsm.h> |
| 42 | |
| 43 | |
| 44 | /* create gsm instance */ |