Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-winehq
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
wine
wine-winehq
Commits
e9b1a406
Commit
e9b1a406
authored
Jul 21, 2008
by
Francois Gouget
Committed by
Alexandre Julliard
Jul 22, 2008
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
wineesd: Make use of `esd-config --libs` for the configure check.
Also follow the naming convention for the 'xxx-config' variables.
parent
4bc03fe8
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
17 additions
and
16 deletions
+17
-16
configure
configure
+9
-9
configure.ac
configure.ac
+8
-7
No files found.
configure
View file @
e9b1a406
...
...
@@ -759,8 +759,8 @@ FREETYPELIBS
FREETYPEINCL
FONTSSUBDIRS
ESDCONFIG
ESDLIBS
ESDINCL
ESDLIBS
ALSALIBS
AUDIOIOLIBS
FONTCONFIGINCL
...
...
@@ -14633,23 +14633,23 @@ fi
if
test
"x
$with_esd
"
!=
xno
-a
"x
$ESDCONFIG
"
!=
x
-a
"x
$ESDCONFIG
"
!=
x
'"$ESDCONFIG"'
;
then
ESD_CFLAGS
=
""
ac_esd_incl
=
""
for
i
in
`
$ESDCONFIG
--cflags
`
do
case
"
$i
"
in
-I
*
)
ESD_CFLAGS
=
"
$ESD_CFLAGS
$i
"
;;
-I
*
)
ac_esd_incl
=
"
$ac_esd_incl
$i
"
;;
esac
done
ESD_LIBS
=
`
$ESDCONFIG
--libs
`
ac_esd_libs
=
`
$ESDCONFIG
--libs
`
save_CFLAGS
=
"
$CFLAGS
"
CFLAGS
=
"
$CFLAGS
$
ESD_CFLAGS
"
CFLAGS
=
"
$CFLAGS
$
ac_esd_incl
"
{
echo
"
$as_me
:
$LINENO
: checking for esd_open_sound in -lesd"
>
&5
echo
$ECHO_N
"checking for esd_open_sound in -lesd...
$ECHO_C
"
>
&6
;
}
if
test
"
${
ac_cv_lib_esd_esd_open_sound
+set
}
"
=
set
;
then
echo
$ECHO_N
"(cached)
$ECHO_C
"
>
&6
else
ac_check_lib_save_LIBS
=
$LIBS
LIBS
=
"-lesd
$LIBS
"
LIBS
=
"-lesd
$ac_esd_libs
$LIBS
"
cat
>
conftest.
$ac_ext
<<
_ACEOF
/* confdefs.h. */
_ACEOF
...
...
@@ -14705,9 +14705,9 @@ fi
{
echo
"
$as_me
:
$LINENO
: result:
$ac_cv_lib_esd_esd_open_sound
"
>
&5
echo
"
${
ECHO_T
}
$ac_cv_lib_esd_esd_open_sound
"
>
&6
;
}
if
test
$ac_cv_lib_esd_esd_open_sound
=
yes
;
then
ESD
LIBS
=
$ESD_LIBS
ESD
INCL
=
"
$ac_esd_incl
"
ESD
INCL
=
$ESD_CFLAGS
ESD
LIBS
=
"
$ac_esd_libs
"
cat
>>
confdefs.h
<<
\
_ACEOF
...
...
@@ -23841,8 +23841,8 @@ FREETYPELIBS!$FREETYPELIBS$ac_delim
FREETYPEINCL!
$FREETYPEINCL$ac_delim
FONTSSUBDIRS!
$FONTSSUBDIRS$ac_delim
ESDCONFIG!
$ESDCONFIG$ac_delim
ESDLIBS!
$ESDLIBS$ac_delim
ESDINCL!
$ESDINCL$ac_delim
ESDLIBS!
$ESDLIBS$ac_delim
ALSALIBS!
$ALSALIBS$ac_delim
AUDIOIOLIBS!
$AUDIOIOLIBS$ac_delim
FONTCONFIGINCL!
$FONTCONFIGINCL$ac_delim
...
...
configure.ac
View file @
e9b1a406
...
...
@@ -1070,20 +1070,21 @@ dnl **** Check for EsounD ****
AC_PATH_PROG(ESDCONFIG, esd-config)
if test "x$with_esd" != xno -a "x$ESDCONFIG" != x -a "x$ESDCONFIG" != x'"$ESDCONFIG"';
then
ESD_CFLAGS
=""
ac_esd_incl
=""
for i in `$ESDCONFIG --cflags`
do
case "$i" in
-I*)
ESD_CFLAGS="$ESD_CFLAGS
$i";;
-I*)
ac_esd_incl="$ac_esd_incl
$i";;
esac
done
ESD_LIBS
=`$ESDCONFIG --libs`
ac_esd_libs
=`$ESDCONFIG --libs`
save_CFLAGS="$CFLAGS"
CFLAGS="$CFLAGS $
ESD_CFLAGS
"
CFLAGS="$CFLAGS $
ac_esd_incl
"
AC_CHECK_LIB(esd,esd_open_sound,
[AC_SUBST(ESDLIBS, $ESD_LIBS)
AC_SUBST(ESDINCL, $ESD_CFLAGS)
AC_DEFINE(HAVE_ESD, 1, [Define if you have EsounD sound server])])
[AC_SUBST(ESDINCL, "$ac_esd_incl")
AC_SUBST(ESDLIBS, "$ac_esd_libs")
AC_DEFINE(HAVE_ESD, 1, [Define if you have EsounD sound server])],,
[$ac_esd_libs])
CFLAGS="$save_CFLAGS"
fi
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment