summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndy Wingo <wingo@pobox.com>2002-01-07 10:28:29 +0000
committerAndy Wingo <wingo@pobox.com>2002-01-07 10:28:29 +0000
commit3899efe25be46de96054251089b2913e4abaf466 (patch)
tree5692dcafab861971a7a58ca2699e5a4b0dd58dd4
parent265582a8812878f98f34ce109516cbdb054c320d (diff)
fix for gsm
Original commit message from CVS: fix for gsm
-rw-r--r--acconfig.h2
-rw-r--r--configure.ac6
2 files changed, 8 insertions, 0 deletions
diff --git a/acconfig.h b/acconfig.h
index 0b2f1651..49c9678f 100644
--- a/acconfig.h
+++ b/acconfig.h
@@ -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)
])