Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
wine
Manage
Activity
Members
Labels
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Package registry
Container Registry
Model registry
Operate
Terraform modules
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Alexey Alyaev
wine
Commits
c186d8a3
Commit
c186d8a3
authored
15 years ago
by
Maarten Lankhorst
Committed by
Alexandre Julliard
15 years ago
Browse files
Options
Downloads
Patches
Plain Diff
msgsm32.acm: Also check for gsm/gsm.h.
Some systems don't have a gsm.h, so try including gsm/gsm.h first
parent
bc1f3f4c
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
configure
+4
-2
4 additions, 2 deletions
configure
configure.ac
+3
-2
3 additions, 2 deletions
configure.ac
dlls/msgsm32.acm/msgsm32.c
+3
-1
3 additions, 1 deletion
dlls/msgsm32.acm/msgsm32.c
include/config.h.in
+3
-0
3 additions, 0 deletions
include/config.h.in
with
13 additions
and
5 deletions
configure
+
4
−
2
View file @
c186d8a3
...
...
@@ -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
...
...
@@ -5748,6 +5748,7 @@ done
for ac_header in \
...
...
@@ -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; }
...
...
This diff is collapsed.
Click to expand it.
configure.ac
+
3
−
2
View file @
c186d8a3
...
...
@@ -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
...
...
This diff is collapsed.
Click to expand it.
dlls/msgsm32.acm/msgsm32.c
+
3
−
1
View file @
c186d8a3
...
...
@@ -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
...
...
This diff is collapsed.
Click to expand it.
include/config.h.in
+
3
−
0
View file @
c186d8a3
...
...
@@ -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
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment