From bb9908680ba53a3d1fe964dcd8caaeb7212bf3a4 Mon Sep 17 00:00:00 2001
From: Richard Boulton <richard@tartarus.org>
Date: Sat, 2 Jun 2001 12:21:26 +0000
Subject: [PATCH] Fix gsm to check for "gsm.h" as well as "gsm/gsm.h".

Original commit message from CVS:
Fix gsm to check for "gsm.h" as well as "gsm/gsm.h".
---
 configure.base | 20 ++++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

diff --git a/configure.base b/configure.base
index 451ea5d47e..6d2816342d 100644
--- a/configure.base
+++ b/configure.base
@@ -493,15 +493,23 @@ AC_CHECK_HEADER(Hermes/Hermes.h, :, HAVE_LIBHERMES=no)
 
 dnl Check for libgsm
 AC_MSG_CHECKING(GSM library)
-AC_CHECK_LIB(gsm, gsm_create,
-  HAVE_LIBGSM=yes
-  AC_DEFINE(HAVE_LIBGSM, 1, [Define if GSM library is available]),
+AC_CHECK_LIB(gsm, gsm_create, HAVE_LIBGSM=yes, HAVE_LIBGSM=no,)
+GSM_CFLAGS=
+GSM_LIBS=-lgsm
+AC_CHECK_HEADER(gsm.h, :, 
+  GSM_CFLAGS="$GSM_CFLAGS -DGSM_HEADER_IN_SUBDIR"
+  AC_CHECK_HEADER(gsm/gsm.h, :, HAVE_LIBGSM=no)
+)
+AC_SUBST(GSM_CFLAGS)
+AC_SUBST(GSM_LIBS)
+
+if test "x$HAVE_LIBGSM" == "xyes"; then
+  AC_DEFINE(HAVE_LIBGSM, 1, [Define if GSM library is available])
+else
   AC_MSG_WARN(
 ***** NOTE: These plugins won't be built: gsmdec, gsmenc
 )
-  HAVE_LIBGSM=no,
-)
-AC_CHECK_HEADER(gsm/gsm.h, :, HAVE_LIBGSM=no)
+fi
 
 dnl Check for cdparanoia
 AC_MSG_CHECKING(CDparanoia library)