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
Zsolt Vadász
wine
Commits
34200c35
Commit
34200c35
authored
17 years ago
by
Alexandre Julliard
Browse files
Options
Downloads
Patches
Plain Diff
configure: Make the libjack soname check depend on the header check.
parent
702d3556
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
+82
-78
82 additions, 78 deletions
configure
configure.ac
+6
-1
6 additions, 1 deletion
configure.ac
dlls/winejack.drv/audio.c
+3
-3
3 additions, 3 deletions
dlls/winejack.drv/audio.c
dlls/winejack.drv/jack.c
+3
-7
3 additions, 7 deletions
dlls/winejack.drv/jack.c
with
94 additions
and
89 deletions
configure
+
82
−
78
View file @
34200c35
...
...
@@ -13660,6 +13660,88 @@ cat >>confdefs.h <<_ACEOF
_ACEOF
fi
fi
if test "$ac_cv_header_jack_jack_h" = "yes"
then
{ echo "$as_me:$LINENO: checking for -ljack" >&5
echo $ECHO_N "checking for -ljack... $ECHO_C" >&6; }
if test "${ac_cv_lib_soname_jack+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
ac_check_soname_save_LIBS=$LIBS
LIBS="-ljack $LIBS"
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
Use char because int might match the return type of a GCC
builtin and then its argument prototype would still apply. */
#ifdef __cplusplus
extern "C"
#endif
char jack_client_new ();
int
main ()
{
return jack_client_new ();
;
return 0;
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
if { (ac_try="$ac_link"
case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
(eval "$ac_link") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && {
test -z "$ac_c_werror_flag" ||
test ! -s conftest.err
} && test -s conftest$ac_exeext &&
$as_test_x conftest$ac_exeext; then
case "$LIBEXT" in
dll) ;;
dylib) ac_cv_lib_soname_jack=`otool -L conftest$ac_exeext | grep "libjack\\.[0-9A-Za-z.]*dylib" | sed -e "s/^.*\/\(libjack\.[0-9A-Za-z.]*dylib\).*$/\1/"';2,$d'` ;;
*) ac_cv_lib_soname_jack=`$ac_cv_path_LDD conftest$ac_exeext | grep "libjack\\.$LIBEXT" | sed -e "s/^.*\(libjack\.$LIBEXT[^ ]*\).*$/\1/"';2,$d'` ;;
esac
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
fi
rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_soname_save_LIBS
fi
if test "x$ac_cv_lib_soname_jack" = "x"; then
{ echo "$as_me:$LINENO: result: not found" >&5
echo "${ECHO_T}not found" >&6; }
else
{ echo "$as_me:$LINENO: result: $ac_cv_lib_soname_jack" >&5
echo "${ECHO_T}$ac_cv_lib_soname_jack" >&6; }
cat >>confdefs.h <<_ACEOF
#define SONAME_LIBJACK "$ac_cv_lib_soname_jack"
_ACEOF
fi
fi
...
...
@@ -15152,84 +15234,6 @@ cat >>confdefs.h <<_ACEOF
_ACEOF
fi
{ echo "$as_me:$LINENO: checking for -ljack" >&5
echo $ECHO_N "checking for -ljack... $ECHO_C" >&6; }
if test "${ac_cv_lib_soname_jack+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
ac_check_soname_save_LIBS=$LIBS
LIBS="-ljack $LIBS"
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
Use char because int might match the return type of a GCC
builtin and then its argument prototype would still apply. */
#ifdef __cplusplus
extern "C"
#endif
char jack_client_new ();
int
main ()
{
return jack_client_new ();
;
return 0;
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
if { (ac_try="$ac_link"
case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
(eval "$ac_link") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && {
test -z "$ac_c_werror_flag" ||
test ! -s conftest.err
} && test -s conftest$ac_exeext &&
$as_test_x conftest$ac_exeext; then
case "$LIBEXT" in
dll) ;;
dylib) ac_cv_lib_soname_jack=`otool -L conftest$ac_exeext | grep "libjack\\.[0-9A-Za-z.]*dylib" | sed -e "s/^.*\/\(libjack\.[0-9A-Za-z.]*dylib\).*$/\1/"';2,$d'` ;;
*) ac_cv_lib_soname_jack=`$ac_cv_path_LDD conftest$ac_exeext | grep "libjack\\.$LIBEXT" | sed -e "s/^.*\(libjack\.$LIBEXT[^ ]*\).*$/\1/"';2,$d'` ;;
esac
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
fi
rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_soname_save_LIBS
fi
if test "x$ac_cv_lib_soname_jack" = "x"; then
{ echo "$as_me:$LINENO: result: not found" >&5
echo "${ECHO_T}not found" >&6; }
else
{ echo "$as_me:$LINENO: result: $ac_cv_lib_soname_jack" >&5
echo "${ECHO_T}$ac_cv_lib_soname_jack" >&6; }
cat >>confdefs.h <<_ACEOF
#define SONAME_LIBJACK "$ac_cv_lib_soname_jack"
_ACEOF
fi
{ echo "$as_me:$LINENO: checking for -lfontconfig" >&5
...
...
This diff is collapsed.
Click to expand it.
configure.ac
+
6
−
1
View file @
34200c35
...
...
@@ -973,6 +973,12 @@ then
WINE_CHECK_SONAME(cups,cupsGetDefault)
fi
dnl **** Check for jack ****
if test "$ac_cv_header_jack_jack_h" = "yes"
then
WINE_CHECK_SONAME(jack,jack_client_new)
fi
dnl **** Check for gcc specific options ****
AC_SUBST(EXTRACFLAGS,"")
...
...
@@ -1121,7 +1127,6 @@ WINE_CHECK_SONAME(Xcursor,XcursorImageLoadCursor,,,[$X_LIBS -lX11 $X_EXTRA_LIBS]
WINE_CHECK_SONAME(freetype,FT_Init_FreeType,,,[$X_LIBS])
WINE_CHECK_SONAME(GL,glXQueryExtension,,,[$X_LIBS $X_EXTRA_LIBS])
WINE_CHECK_SONAME(txc_dxtn,fetch_2d_texel_rgba_dxt1)
WINE_CHECK_SONAME(jack,jack_client_new)
WINE_CHECK_SONAME(fontconfig,FcInit)
WINE_CHECK_SONAME(ssl,SSL_library_init)
WINE_CHECK_SONAME(crypto,BIO_new_socket)
...
...
This diff is collapsed.
Click to expand it.
dlls/winejack.drv/audio.c
+
3
−
3
View file @
34200c35
...
...
@@ -63,7 +63,7 @@
WINE_DEFAULT_DEBUG_CHANNEL
(
wave
);
#ifdef
HAVE_JACK_
JACK
_H
#ifdef
SONAME_LIB
JACK
#define MAKE_FUNCPTR(f) static typeof(f) * fp_##f = NULL;
...
...
@@ -2386,7 +2386,7 @@ DWORD WINAPI JACK_widMessage(WORD wDevID, WORD wMsg, DWORD dwUser,
return
MMSYSERR_NOTSUPPORTED
;
}
#else
/* !
HAVE_JACK_
JACK
_H
*/
#else
/* !
SONAME_LIB
JACK */
/**************************************************************************
* widMessage (WINEJACK.6)
...
...
@@ -2408,4 +2408,4 @@ DWORD WINAPI JACK_wodMessage(WORD wDevID, WORD wMsg, DWORD dwUser,
return
MMSYSERR_NOTENABLED
;
}
#endif
/*
HAVE_JACK_
JACK
_H
*/
#endif
/*
SONAME_LIB
JACK */
This diff is collapsed.
Click to expand it.
dlls/winejack.drv/jack.c
+
3
−
7
View file @
34200c35
...
...
@@ -37,11 +37,7 @@
WINE_DEFAULT_DEBUG_CHANNEL
(
jack
);
#ifdef HAVE_JACK_JACK_H
#ifndef SONAME_LIBJACK
#define SONAME_LIBJACK "libjack" SONAME_EXT
#endif
#ifdef SONAME_LIBJACK
void
*
jackhandle
=
NULL
;
...
...
@@ -114,7 +110,7 @@ static LRESULT JACK_drvClose(DWORD_PTR dwDevID)
TRACE
(
"(%08lx)
\n
"
,
dwDevID
);
return
1
;
}
#endif
/* #ifdef
HAVE_JACK_
JACK
_H
*/
#endif
/* #ifdef
SONAME_LIB
JACK */
/**************************************************************************
...
...
@@ -137,7 +133,7 @@ LRESULT CALLBACK JACK_DriverProc(DWORD_PTR dwDevID, HDRVR hDriv, UINT wMsg,
wMsg
,
dwParam1
,
dwParam2
);
switch
(
wMsg
)
{
#ifdef
HAVE_JACK_
JACK
_H
#ifdef
SONAME_LIB
JACK
case
DRV_LOAD
:
return
JACK_drvLoad
();
case
DRV_FREE
:
return
JACK_drvFree
();
case
DRV_OPEN
:
return
JACK_drvOpen
((
LPSTR
)
dwParam1
);
...
...
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