Module: wine Branch: master Commit: cfb88194f260b7ada7cc55d216ed2fd8f970cc46 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cfb88194f260b7ada7cc55d216...
Author: Alexandre Julliard julliard@winehq.org Date: Thu Jan 21 17:01:13 2016 +0900
configure: Don't check for gst/gstpad.h that we don't use.
Signed-off-by: Alexandre Julliard julliard@winehq.org
---
configure | 13 +++---------- configure.ac | 16 +++++++--------- 2 files changed, 10 insertions(+), 19 deletions(-)
diff --git a/configure b/configure index d0a7266..e422437 100755 --- a/configure +++ b/configure @@ -12634,13 +12634,11 @@ ac_gst_incl="" done GSTREAMER_CFLAGS=$ac_gst_incl CPPFLAGS="$ac_save_CPPFLAGS $GSTREAMER_CFLAGS" - ac_fn_c_check_header_mongrel "$LINENO" "gst/gstpad.h" "ac_cv_header_gst_gstpad_h" "$ac_includes_default" -if test "x$ac_cv_header_gst_gstpad_h" = xyes; then : - ac_fn_c_check_header_mongrel "$LINENO" "gst/gst.h" "ac_cv_header_gst_gst_h" "$ac_includes_default" + ac_fn_c_check_header_mongrel "$LINENO" "gst/gst.h" "ac_cv_header_gst_gst_h" "$ac_includes_default" if test "x$ac_cv_header_gst_gst_h" = xyes; then : { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether gint64 defined by gst/gst.h is indeed 64-bit" >&5 $as_echo_n "checking whether gint64 defined by gst/gst.h is indeed 64-bit... " >&6; } - cat confdefs.h - <<_ACEOF >conftest.$ac_ext + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include <gst/gst.h> int @@ -12654,7 +12652,7 @@ _ACEOF if ac_fn_c_try_compile "$LINENO"; then : { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gst_pad_new in -lgstreamer-1.0" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gst_pad_new in -lgstreamer-1.0" >&5 $as_echo_n "checking for gst_pad_new in -lgstreamer-1.0... " >&6; } if ${ac_cv_lib_gstreamer_1_0_gst_pad_new+:} false; then : $as_echo_n "(cached) " >&6 @@ -12702,11 +12700,6 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi
-else - GSTREAMER_CFLAGS="" -fi - - CPPFLAGS=$ac_save_CPPFLAGS test -z "$GSTREAMER_CFLAGS" || GSTREAMER_CFLAGS=`echo " $GSTREAMER_CFLAGS" | sed 's/ -I([^/])/ -I$(top_builddir)/\1/g'` test -z "$GSTREAMER_LIBS" || GSTREAMER_LIBS=`echo " $GSTREAMER_LIBS" | sed 's/ -L([^/])/ -L$(top_builddir)/\1/g'` diff --git a/configure.ac b/configure.ac index d20791a..6db503c 100644 --- a/configure.ac +++ b/configure.ac @@ -1472,15 +1472,13 @@ then done GSTREAMER_CFLAGS=$ac_gst_incl CPPFLAGS="$ac_save_CPPFLAGS $GSTREAMER_CFLAGS" - AC_CHECK_HEADER([gst/gstpad.h], - [AC_CHECK_HEADER([gst/gst.h], - [AC_MSG_CHECKING([whether gint64 defined by gst/gst.h is indeed 64-bit]) - AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <gst/gst.h>]], - [[static int a[sizeof(gint64) > 4 ? 1 : -1]; if (a[0]) return 0;]])], - [AC_MSG_RESULT([yes]) - AC_CHECK_LIB(gstreamer-1.0,gst_pad_new,[:],,[$GSTREAMER_LIBS])], - [AC_MSG_RESULT([no])])])], - [GSTREAMER_CFLAGS=""])]) + AC_CHECK_HEADER([gst/gst.h], + [AC_MSG_CHECKING([whether gint64 defined by gst/gst.h is indeed 64-bit]) + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <gst/gst.h>]], + [[static int a[sizeof(gint64) > 4 ? 1 : -1]; if (a[0]) return 0;]])], + [AC_MSG_RESULT([yes]) + AC_CHECK_LIB(gstreamer-1.0,gst_pad_new,[:],,[$GSTREAMER_LIBS])], + [AC_MSG_RESULT([no])])])]) fi WINE_NOTICE_WITH(gstreamer,[test "x$ac_cv_lib_gstreamer_1_0_gst_pad_new" != xyes -a "x$ac_cv_header_QuickTime_ImageCompression_h" != xyes], [gstreamer-1.0 base plugins ${notice_platform}development files not found, gstreamer support disabled])