Alexandre Julliard : configure: Add a check for the QuickTime development headers.
Alexandre Julliard
julliard at winehq.org
Fri Jan 14 12:46:33 CST 2011
Module: wine
Branch: master
Commit: fa3ddd838b47b047560a893e4e7b314393e3ce62
URL: http://source.winehq.org/git/wine.git/?a=commit;h=fa3ddd838b47b047560a893e4e7b314393e3ce62
Author: Alexandre Julliard <julliard at winehq.org>
Date: Fri Jan 14 15:59:51 2011 +0100
configure: Add a check for the QuickTime development headers.
---
configure | 16 +++++++++++-----
configure.ac | 12 +++++++++---
include/config.h.in | 3 +++
3 files changed, 23 insertions(+), 8 deletions(-)
diff --git a/configure b/configure
index 1332a69..c68b1d6 100755
--- a/configure
+++ b/configure
@@ -653,13 +653,13 @@ CROSSCC
CROSSTEST_DISABLE
PRELINK
CARBONLIB
+QUICKTIMELIB
LIBOPENCL
FRAMEWORK_OPENAL
COREAUDIO
DISKARBITRATIONLIB
LDEXECFLAGS
APPLICATIONSERVICESLIB
-QUICKTIMELIB
IOKITLIB
COREFOUNDATIONLIB
SECURITYLIB
@@ -5772,6 +5772,7 @@ for ac_header in \
IOKit/hid/IOHIDLib.h \
OpenAL/al.h \
OpenCL/opencl.h \
+ QuickTime/ImageCompression.h \
alias.h \
alsa/asoundlib.h \
arpa/inet.h \
@@ -6513,8 +6514,6 @@ fi
IOKITLIB="-framework IOKit -framework CoreFoundation"
- QUICKTIMELIB="-framework QuickTime -framework ApplicationServices -framework CoreVideo"
-
APPLICATIONSERVICESLIB="-framework ApplicationServices"
LDEXECFLAGS="-image_base 0x7bf00000 -Wl,-segaddr,WINE_DOS,0x00000000,-segaddr,WINE_SHAREDHEAP,0x7f000000"
@@ -6563,11 +6562,18 @@ done
LIBS="$ac_save_LIBS"
fi
- enable_wineqtdecoder=${enable_wineqtdecoder:-yes}
case $host_cpu in
*powerpc*)
LDDLLFLAGS="$LDDLLFLAGS -read_only_relocs warning" ;;
esac
+ if test "$ac_cv_header_QuickTime_ImageCompression_h" = "yes"
+ then
+ QUICKTIMELIB="-framework QuickTime -framework ApplicationServices -framework CoreVideo"
+
+ enable_wineqtdecoder=${enable_wineqtdecoder:-yes}
+ else
+ as_fn_append wine_notices "|QuickTime ${notice_platform}development files not found, video decoding won't be supported."
+ fi
if test "$ac_cv_header_Carbon_Carbon_h" = "yes"
then
CARBONLIB="-framework Carbon"
@@ -10865,7 +10871,7 @@ fi
fi
CPPFLAGS="$ac_save_CPPFLAGS"
fi
-if test "x$ac_cv_lib_gstapp_0_10_gst_app_buffer_new" != xyes; then :
+if test "x$ac_cv_lib_gstapp_0_10_gst_app_buffer_new" != xyes -a "x$ac_cv_header_QuickTime_ImageCompression_h" != xyes; then :
case "x$with_gstreamer" in
x) as_fn_append wine_notices "|gstreamer-0.10 base plugins ${notice_platform}development files not found, gstreamer support disabled" ;;
xno) ;;
diff --git a/configure.ac b/configure.ac
index fee8e88..4d049b6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -379,6 +379,7 @@ AC_CHECK_HEADERS(\
IOKit/hid/IOHIDLib.h \
OpenAL/al.h \
OpenCL/opencl.h \
+ QuickTime/ImageCompression.h \
alias.h \
alsa/asoundlib.h \
arpa/inet.h \
@@ -700,7 +701,6 @@ case $host_os in
AC_SUBST(SECURITYLIB,"-framework Security -framework CoreFoundation")
AC_SUBST(COREFOUNDATIONLIB,"-framework CoreFoundation")
AC_SUBST(IOKITLIB,"-framework IOKit -framework CoreFoundation")
- AC_SUBST(QUICKTIMELIB,"-framework QuickTime -framework ApplicationServices -framework CoreVideo")
AC_SUBST(APPLICATIONSERVICESLIB,"-framework ApplicationServices")
AC_SUBST(LDEXECFLAGS,["-image_base 0x7bf00000 -Wl,-segaddr,WINE_DOS,0x00000000,-segaddr,WINE_SHAREDHEAP,0x7f000000"])
if test "$ac_cv_header_DiskArbitration_DiskArbitration_h" = "yes"
@@ -731,12 +731,18 @@ case $host_os in
AC_CHECK_FUNCS(IOHIDManagerCreate)
LIBS="$ac_save_LIBS"
fi
- enable_wineqtdecoder=${enable_wineqtdecoder:-yes}
case $host_cpu in
*powerpc*)
LDDLLFLAGS="$LDDLLFLAGS -read_only_relocs warning" dnl FIXME
;;
esac
+ if test "$ac_cv_header_QuickTime_ImageCompression_h" = "yes"
+ then
+ AC_SUBST(QUICKTIMELIB,"-framework QuickTime -framework ApplicationServices -framework CoreVideo")
+ enable_wineqtdecoder=${enable_wineqtdecoder:-yes}
+ else
+ WINE_NOTICE([QuickTime ${notice_platform}development files not found, video decoding won't be supported.])
+ fi
dnl Enable quartz driver on Mac OS X
if test "$ac_cv_header_Carbon_Carbon_h" = "yes"
then
@@ -1471,7 +1477,7 @@ then
fi
CPPFLAGS="$ac_save_CPPFLAGS"
fi
-WINE_NOTICE_WITH(gstreamer,[test "x$ac_cv_lib_gstapp_0_10_gst_app_buffer_new" != xyes],
+WINE_NOTICE_WITH(gstreamer,[test "x$ac_cv_lib_gstapp_0_10_gst_app_buffer_new" != xyes -a "x$ac_cv_header_QuickTime_ImageCompression_h" != xyes],
[gstreamer-0.10 base plugins ${notice_platform}development files not found, gstreamer support disabled])
test "x$ac_cv_lib_gstapp_0_10_gst_app_buffer_new" = xyes || enable_winegstreamer=${enable_winegstreamer:-no}
diff --git a/include/config.h.in b/include/config.h.in
index 3af1424..2e4370d 100644
--- a/include/config.h.in
+++ b/include/config.h.in
@@ -659,6 +659,9 @@
/* Define to 1 if you have the `pwrite' function. */
#undef HAVE_PWRITE
+/* Define to 1 if you have the <QuickTime/ImageCompression.h> header file. */
+#undef HAVE_QUICKTIME_IMAGECOMPRESSION_H
+
/* Define to 1 if you have the `readdir' function. */
#undef HAVE_READDIR
More information about the wine-cvs
mailing list