Module: wine Branch: master Commit: c186d8a337cf224afbd8e97bfedc61ff00d9b17d URL: http://source.winehq.org/git/wine.git/?a=commit;h=c186d8a337cf224afbd8e97bfe...
Author: Maarten Lankhorst m.b.lankhorst@gmail.com Date: Wed Aug 5 11:35:50 2009 +0200
msgsm32.acm: Also check for gsm/gsm.h.
Some systems don't have a gsm.h, so try including gsm/gsm.h first
---
configure | 6 ++++-- configure.ac | 5 +++-- dlls/msgsm32.acm/msgsm32.c | 4 +++- include/config.h.in | 3 +++ 4 files changed, 13 insertions(+), 5 deletions(-)
diff --git a/configure b/configure index d467088..5402e55 100755 --- a/configure +++ b/configure @@ -2145,7 +2145,7 @@ fi
# Check whether --with-libgsm was given. if test "${with_libgsm+set}" = set; then - withval=$with_libgsm; if test "x$withval" = "xno"; then ac_cv_header_gsm_h=no; fi + withval=$with_libgsm; if test "x$withval" = "xno"; then ac_cv_header_gsm_h=no; ac_cv_header_gsm_gsm_h=no; fi fi
@@ -5750,6 +5750,7 @@ done
+ for ac_header in \ AudioUnit/AudioUnit.h \ Carbon/Carbon.h \ @@ -5774,6 +5775,7 @@ for ac_header in \ getopt.h \ grp.h \ gsm.h \ + gsm/gsm.h \ ieeefp.h \ inet/mib2.h \ io.h \ @@ -16654,7 +16656,7 @@ esac fi
-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 { $as_echo "$as_me:$LINENO: checking for -lgsm" >&5 $as_echo_n "checking for -lgsm... " >&6; } 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
diff --git a/include/config.h.in b/include/config.h.in index 34de7d9..7648aae 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -234,6 +234,9 @@ /* Define to 1 if you have the <grp.h> header file. */ #undef HAVE_GRP_H
+/* Define to 1 if you have the <gsm/gsm.h> header file. */ +#undef HAVE_GSM_GSM_H + /* Define to 1 if you have the <gsm.h> header file. */ #undef HAVE_GSM_H