diff options
| author | Andy Wingo <wingo@pobox.com> | 2002-01-07 10:28:29 +0000 |
|---|---|---|
| committer | Andy Wingo <wingo@pobox.com> | 2002-01-07 10:28:29 +0000 |
| commit | 74263a25ad53f8f78bec09a0a59742a4bedcaf0d (patch) | |
| tree | 62ea9099f30341553325536f9c756e9b86a5b439 | |
| parent | 45ae8260aa60c8225e9c7b4c4f88d45f4daafd7e (diff) | |
| download | gst-plugins-bad-74263a25ad53f8f78bec09a0a59742a4bedcaf0d.tar.gz gst-plugins-bad-74263a25ad53f8f78bec09a0a59742a4bedcaf0d.tar.bz2 gst-plugins-bad-74263a25ad53f8f78bec09a0a59742a4bedcaf0d.zip | |
fix for gsm
Original commit message from CVS:
fix for gsm
| -rw-r--r-- | acconfig.h | 2 | ||||
| -rw-r--r-- | configure.ac | 6 | ||||
| -rw-r--r-- | ext/gsm/gstgsmdec.h | 4 | ||||
| -rw-r--r-- | ext/gsm/gstgsmenc.h | 4 |
4 files changed, 16 insertions, 0 deletions
@@ -51,6 +51,8 @@ #undef HAVE_LIBSDL #undef HAVE_LIBOPENQUICKTIME +#undef GSM_HEADER_IN_SUBDIR + #undef HAVE_ATOMIC_H #undef GST_DEBUG_ENABLED diff --git a/configure.ac b/configure.ac index 830727db..3028b419 100644 --- a/configure.ac +++ b/configure.ac @@ -447,6 +447,12 @@ dnl *** gsm *** translit(dnm, m, l) AM_CONDITIONAL(USE_GSM, true) GST_CHECK_FEATURE(GSM, [GSM library], gsmenc gsmdec, [ GST_CHECK_LIBHEADER(GSM, gsm, gsm_create, , gsm.h, GSM_LIBS="-lgsm") + if test $HAVE_GSM != "yes"; then + GST_CHECK_LIBHEADER(GSM, gsm, gsm_create, , gsm/gsm.h, GSM_LIBS="-lgsm") + if test $HAVE_GSM = "yes"; then + AC_DEFINE(GSM_HEADER_IN_SUBDIR) + fi + fi AC_SUBST(GSM_LIBS) ]) diff --git a/ext/gsm/gstgsmdec.h b/ext/gsm/gstgsmdec.h index d46c5cd1..a08e857e 100644 --- a/ext/gsm/gstgsmdec.h +++ b/ext/gsm/gstgsmdec.h @@ -25,7 +25,11 @@ #include <config.h> #include <gst/gst.h> +#ifdef GSM_HEADER_IN_SUBDIR +#include <gsm/gsm.h> +#else #include <gsm.h> +#endif #ifdef __cplusplus extern "C" { diff --git a/ext/gsm/gstgsmenc.h b/ext/gsm/gstgsmenc.h index dcaa8566..a56099e1 100644 --- a/ext/gsm/gstgsmenc.h +++ b/ext/gsm/gstgsmenc.h @@ -25,7 +25,11 @@ #include <config.h> #include <gst/gst.h> +#ifdef GSM_HEADER_IN_SUBDIR +#include <gsm/gsm.h> +#else #include <gsm.h> +#endif #ifdef __cplusplus extern "C" { |