[PATCH] msgsm32.acm: Also check for gsm/gsm.h

Maarten Lankhorst (none) mlankhorst at patser.
Wed Aug 5 04:35:50 CDT 2009


Some systems don't have gsm.h, so try gsm/gsm.h first
---
 configure.ac               |    5 +++--
 dlls/msgsm32.acm/msgsm32.c |    4 +++-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/configure.ac b/configure.ac
index d8d0679..59b771c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -41,7 +41,7 @@ AC_ARG_WITH(glu,       AS_HELP_STRING([--without-glu],[do not use the GLU librar
             [if test "x$withval" = "xno"; then ac_cv_header_GL_glu_h=no; fi])
 AC_ARG_WITH(gnutls,    AS_HELP_STRING([--without-gnutls],[do not use GnuTLS (schannel support)]))
 AC_ARG_WITH(libgsm,    AS_HELP_STRING([--without-libgsm],[do not use libgsm (GSM 06.10 codec support)]),
-            [if test "x$withval" = "xno"; then ac_cv_header_gsm_h=no; fi])
+            [if test "x$withval" = "xno"; then ac_cv_header_gsm_h=no; ac_cv_header_gsm_gsm_h=no; fi])
 AC_ARG_WITH(hal,       AS_HELP_STRING([--without-hal],[do not use HAL (dynamic device support)]))
 AC_ARG_WITH(jack,      AS_HELP_STRING([--without-jack],[do not use the Jack sound support]),
             [if test "x$withval" = "xno"; then ac_cv_header_jack_jack_h=no; fi])
@@ -289,6 +289,7 @@ AC_CHECK_HEADERS(\
 	getopt.h \
 	grp.h \
 	gsm.h \
+	gsm/gsm.h \
 	ieeefp.h \
 	inet/mib2.h \
 	io.h \
@@ -1342,7 +1343,7 @@ WINE_WARNING_WITH(openssl,[test "x$ac_cv_lib_soname_ssl" = "x" -o "x$ac_cv_lib_s
                  [OpenSSL ${notice_platform}development files not found, SSL won't be supported.])
 
 dnl **** Check for gsm codec ****
-if test "$ac_cv_header_gsm_h" = "yes"
+if test "$ac_cv_header_gsm_h" = "yes" -o "$ac_cv_header_gsm_gsm_h" = "yes"
 then
     WINE_CHECK_SONAME(gsm,gsm_create)
 fi
diff --git a/dlls/msgsm32.acm/msgsm32.c b/dlls/msgsm32.acm/msgsm32.c
index 6ad28fb..ad86bc1 100644
--- a/dlls/msgsm32.acm/msgsm32.c
+++ b/dlls/msgsm32.acm/msgsm32.c
@@ -27,7 +27,9 @@
 #include <stdarg.h>
 #include <string.h>
 
-#ifdef HAVE_GSM_H
+#ifdef HAVE_GSM_GSM_H
+#include <gsm/gsm.h>
+#elif defined(HAVE_GSM_H)
 #include <gsm.h>
 #endif
 
-- 
1.6.3.3


--------------010406010705030702090205--



More information about the wine-patches mailing list