From cbc7e7fdf73ec34e1d060a8d93235b031ccbe602 Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Wed, 13 Apr 2011 00:26:48 +0200 Subject: [PATCH] gsm: Partially fix the gsm.h/libgsm handling * There might not be a static library (Fedora) * When cross compiling it will certainly not be in /usr/include * The code should use AC_CHECK_HEADERS... but that is for another day --- Makefile.am | 2 +- configure.ac | 7 +------ gsm_audio.c | 2 +- 3 files changed, 3 insertions(+), 8 deletions(-) diff --git a/Makefile.am b/Makefile.am index 26e575c..aa5dd07 100644 --- a/Makefile.am +++ b/Makefile.am @@ -61,7 +61,7 @@ GSM_INCLUDE += GSM_SOURCE += gsm_audio.c gsm.cpp -GSM_LIB += /usr/lib/libgsm.a +GSM_LIB += -lgsm #gsm_audio.po: gsm_audio.c gsm_audio.h # $(CC) -D_GNU_SOURCE -fPIC -c gsm_audio.c -o gsm_audio.po diff --git a/configure.ac b/configure.ac index ae7446c..bbf310c 100644 --- a/configure.ac +++ b/configure.ac @@ -184,12 +184,7 @@ AM_CONDITIONAL(ENABLE_GSM_MS, test "x$with_gsm_ms" == "xyes" ) AM_CONDITIONAL(ENABLE_GSM, test "x$with_gsm_bs" == "xyes" -o "x$with_gsm_ms" == "xyes") AS_IF([test "x$with_gsm_bs" == xyes -o "x$with_gsm_ms" == xyes], - [AC_MSG_CHECKING(/usr/include/gsm/gsm.h) - if test -e /usr/include/gsm/gsm.h; then - AC_MSG_RESULT(yes) - else - 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.]) - fi + AC_MSG_RESULT(yes...why not use ac_check_headers...) ]) # check for ss5 diff --git a/gsm_audio.c b/gsm_audio.c index 972ab39..8af7439 100644 --- a/gsm_audio.c +++ b/gsm_audio.c @@ -10,7 +10,7 @@ \*****************************************************************************/ extern "C" { -#include "/usr/include/gsm/gsm.h" +#include /* create gsm instance */ -- 2.13.6