ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

msgsm32.acm: Also check for gsm/gsm.h. 

Some systems don't have a gsm.h, so try including gsm/gsm.h first
This commit is contained in:
Maarten Lankhorst 2009-08-05 11:35:50 +02:00 committed by Alexandre Julliard
parent bc1f3f4c95
commit c186d8a337
4 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
configure vendored
View File

@ -2145,7 +2145,7 @@ fi
# Check whether --with-libgsm was given. # Check whether --with-libgsm was given.
if test "${with_libgsm+set}" = set; then 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 fi
@ -5748,6 +5748,7 @@ done
for ac_header in \ for ac_header in \
@ -5774,6 +5775,7 @@ for ac_header in \
getopt.h \ getopt.h \
grp.h \ grp.h \
gsm.h \ gsm.h \
gsm/gsm.h \
ieeefp.h \ ieeefp.h \
inet/mib2.h \ inet/mib2.h \
io.h \ io.h \
@ -16654,7 +16656,7 @@ esac
fi 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 then
{ $as_echo "$as_me:$LINENO: checking for -lgsm" >&5 { $as_echo "$as_me:$LINENO: checking for -lgsm" >&5
$as_echo_n "checking for -lgsm... " >&6; } $as_echo_n "checking for -lgsm... " >&6; }

5
configure.ac
View File

@ -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]) [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(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)]), 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(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]), 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]) [if test "x$withval" = "xno"; then ac_cv_header_jack_jack_h=no; fi])
@ -289,6 +289,7 @@ AC_CHECK_HEADERS(\
getopt.h \ getopt.h \
grp.h \ grp.h \
gsm.h \ gsm.h \
gsm/gsm.h \
ieeefp.h \ ieeefp.h \
inet/mib2.h \ inet/mib2.h \
io.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.]) [OpenSSL ${notice_platform}development files not found, SSL won't be supported.])
dnl **** Check for gsm codec **** 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 then
WINE_CHECK_SONAME(gsm,gsm_create) WINE_CHECK_SONAME(gsm,gsm_create)
fi fi

4
dlls/msgsm32.acm/msgsm32.c
View File

@ -27,7 +27,9 @@
#include <stdarg.h> #include <stdarg.h>
#include <string.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> #include <gsm.h>
#endif #endif

3
include/config.h.in
View File

@ -234,6 +234,9 @@
/* Define to 1 if you have the <grp.h> header file. */ /* Define to 1 if you have the <grp.h> header file. */
#undef HAVE_GRP_H #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. */ /* Define to 1 if you have the <gsm.h> header file. */
#undef HAVE_GSM_H #undef HAVE_GSM_H