configure: Add an option to disable QuickTime support.
Signed-off-by: Gijs Vermeulen <gijsvrm@gmail.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
parent
7bf6a0b5fe
commit
b99ec04f55
|
@ -878,6 +878,7 @@ with_pcap
|
|||
with_png
|
||||
with_pthread
|
||||
with_pulse
|
||||
with_quicktime
|
||||
with_sane
|
||||
with_sdl
|
||||
with_tiff
|
||||
|
@ -2608,6 +2609,7 @@ Optional Packages:
|
|||
--without-png do not use PNG
|
||||
--without-pthread do not use the pthread library
|
||||
--without-pulse do not use PulseAudio sound support
|
||||
--without-quicktime do not use QuickTime support
|
||||
--without-sane do not use SANE (scanner support)
|
||||
--without-sdl do not use SDL
|
||||
--without-tiff do not use TIFF
|
||||
|
@ -4114,6 +4116,12 @@ if test "${with_pulse+set}" = set; then :
|
|||
fi
|
||||
|
||||
|
||||
# Check whether --with-quicktime was given.
|
||||
if test "${with_quicktime+set}" = set; then :
|
||||
withval=$with_quicktime;
|
||||
fi
|
||||
|
||||
|
||||
# Check whether --with-sane was given.
|
||||
if test "${with_sane+set}" = set; then :
|
||||
withval=$with_sane;
|
||||
|
@ -8977,6 +8985,9 @@ done
|
|||
|
||||
LIBS="$ac_save_LIBS"
|
||||
fi
|
||||
|
||||
if test "x$with_quicktime" != "xno"
|
||||
then
|
||||
if test "$ac_cv_header_QuickTime_ImageCompression_h" = "yes"
|
||||
then
|
||||
ac_save_LIBS="$LIBS"
|
||||
|
@ -9009,10 +9020,17 @@ rm -f core conftest.err conftest.$ac_objext \
|
|||
conftest$ac_exeext conftest.$ac_ext
|
||||
LIBS="$ac_save_LIBS"
|
||||
fi
|
||||
if test "$ac_cv_header_QuickTime_ImageCompression_h" != "yes"
|
||||
then
|
||||
as_fn_append wine_notices "|QuickTime ${notice_platform}development files not found, video decoding won't be supported."
|
||||
fi
|
||||
if test "$ac_cv_header_QuickTime_ImageCompression_h" != "yes"; then :
|
||||
case "x$with_quicktime" in
|
||||
x) as_fn_append wine_notices "|QuickTime ${notice_platform}development files not found, video decoding won't be supported." ;;
|
||||
xno) ;;
|
||||
*) as_fn_error $? "QuickTime ${notice_platform}development files not found, video decoding won't be supported.
|
||||
This is an error since --with-quicktime was requested." "$LINENO" 5 ;;
|
||||
esac
|
||||
|
||||
fi
|
||||
|
||||
if test "$ac_cv_header_Carbon_Carbon_h" = "yes"
|
||||
then
|
||||
CARBON_LIBS="-framework Carbon"
|
||||
|
|
11
configure.ac
11
configure.ac
|
@ -79,6 +79,7 @@ AC_ARG_WITH(png, AS_HELP_STRING([--without-png],[do not use PNG]))
|
|||
AC_ARG_WITH(pthread, AS_HELP_STRING([--without-pthread],[do not use the pthread library]),
|
||||
[if test "x$withval" = "xno"; then ac_cv_header_pthread_h=no; fi])
|
||||
AC_ARG_WITH(pulse, AS_HELP_STRING([--without-pulse],[do not use PulseAudio sound support]))
|
||||
AC_ARG_WITH(quicktime, AS_HELP_STRING([--without-quicktime],[do not use QuickTime support]))
|
||||
AC_ARG_WITH(sane, AS_HELP_STRING([--without-sane],[do not use SANE (scanner support)]))
|
||||
AC_ARG_WITH(sdl, AS_HELP_STRING([--without-sdl],[do not use SDL]))
|
||||
AC_ARG_WITH(tiff, AS_HELP_STRING([--without-tiff],[do not use TIFF]))
|
||||
|
@ -830,6 +831,10 @@ case $host_os in
|
|||
AC_CHECK_FUNCS(IOHIDManagerCreate)
|
||||
LIBS="$ac_save_LIBS"
|
||||
fi
|
||||
|
||||
dnl *** Check for QuickTime ***
|
||||
if test "x$with_quicktime" != "xno"
|
||||
then
|
||||
if test "$ac_cv_header_QuickTime_ImageCompression_h" = "yes"
|
||||
then
|
||||
dnl Make sure we can actually use the QuickTime framework
|
||||
|
@ -844,10 +849,10 @@ case $host_os in
|
|||
ac_cv_header_QuickTime_ImageCompression_h=no])
|
||||
LIBS="$ac_save_LIBS"
|
||||
fi
|
||||
if test "$ac_cv_header_QuickTime_ImageCompression_h" != "yes"
|
||||
then
|
||||
WINE_NOTICE([QuickTime ${notice_platform}development files not found, video decoding won't be supported.])
|
||||
fi
|
||||
WINE_NOTICE_WITH(quicktime,[test "$ac_cv_header_QuickTime_ImageCompression_h" != "yes"],
|
||||
[QuickTime ${notice_platform}development files not found, video decoding won't be supported.])
|
||||
|
||||
if test "$ac_cv_header_Carbon_Carbon_h" = "yes"
|
||||
then
|
||||
AC_SUBST(CARBON_LIBS,"-framework Carbon")
|
||||
|
|
Loading…
Reference in New Issue