makefiles: Only allow includes and defines in pkg-config flags.
Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50811 Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
parent
f126809ec0
commit
4f04994ef4
|
@ -14620,16 +14620,7 @@ $as_echo "$as_me:${as_lineno-$LINENO}: gstreamer-1.0 gstreamer-video-1.0 gstream
|
||||||
$as_echo "$as_me:${as_lineno-$LINENO}: gstreamer-1.0 gstreamer-video-1.0 gstreamer-audio-1.0 libs: $GSTREAMER_LIBS" >&5
|
$as_echo "$as_me:${as_lineno-$LINENO}: gstreamer-1.0 gstreamer-video-1.0 gstreamer-audio-1.0 libs: $GSTREAMER_LIBS" >&5
|
||||||
ac_save_CPPFLAGS=$CPPFLAGS
|
ac_save_CPPFLAGS=$CPPFLAGS
|
||||||
CPPFLAGS="$CPPFLAGS $GSTREAMER_CFLAGS"
|
CPPFLAGS="$CPPFLAGS $GSTREAMER_CFLAGS"
|
||||||
ac_gst_incl=""
|
ac_fn_c_check_header_mongrel "$LINENO" "gst/gst.h" "ac_cv_header_gst_gst_h" "$ac_includes_default"
|
||||||
for i in $GSTREAMER_CFLAGS
|
|
||||||
do
|
|
||||||
case "$i" in
|
|
||||||
-I*) ac_gst_incl="$ac_gst_incl $i";;
|
|
||||||
esac
|
|
||||||
done
|
|
||||||
GSTREAMER_CFLAGS=$ac_gst_incl
|
|
||||||
CPPFLAGS="$ac_save_CPPFLAGS $GSTREAMER_CFLAGS"
|
|
||||||
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 :
|
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 "$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; }
|
$as_echo_n "checking whether gint64 defined by gst/gst.h is indeed 64-bit... " >&6; }
|
||||||
|
|
11
configure.ac
11
configure.ac
|
@ -1608,16 +1608,7 @@ dnl **** Check for gstreamer ****
|
||||||
if test "x$with_gstreamer" != "xno"
|
if test "x$with_gstreamer" != "xno"
|
||||||
then
|
then
|
||||||
WINE_PACKAGE_FLAGS(GSTREAMER,[gstreamer-1.0 gstreamer-video-1.0 gstreamer-audio-1.0],,,,
|
WINE_PACKAGE_FLAGS(GSTREAMER,[gstreamer-1.0 gstreamer-video-1.0 gstreamer-audio-1.0],,,,
|
||||||
[ac_gst_incl=""
|
[AC_CHECK_HEADER([gst/gst.h],
|
||||||
for i in $GSTREAMER_CFLAGS
|
|
||||||
do
|
|
||||||
case "$i" in
|
|
||||||
-I*) ac_gst_incl="$ac_gst_incl $i";;
|
|
||||||
esac
|
|
||||||
done
|
|
||||||
GSTREAMER_CFLAGS=$ac_gst_incl
|
|
||||||
CPPFLAGS="$ac_save_CPPFLAGS $GSTREAMER_CFLAGS"
|
|
||||||
AC_CHECK_HEADER([gst/gst.h],
|
|
||||||
[AC_MSG_CHECKING([whether gint64 defined by gst/gst.h is indeed 64-bit])
|
[AC_MSG_CHECKING([whether gint64 defined by gst/gst.h is indeed 64-bit])
|
||||||
AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <gst/gst.h>]],
|
AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <gst/gst.h>]],
|
||||||
[[static int a[sizeof(gint64) > 4 ? 1 : -1]; if (a[0]) return 0;]])],
|
[[static int a[sizeof(gint64) > 4 ? 1 : -1]; if (a[0]) return 0;]])],
|
||||||
|
|
|
@ -4263,7 +4263,7 @@ static void load_sources( struct makefile *make )
|
||||||
for (i = 0; i < value.count; i++)
|
for (i = 0; i < value.count; i++)
|
||||||
if (!strncmp( value.str[i], "-I", 2 ))
|
if (!strncmp( value.str[i], "-I", 2 ))
|
||||||
strarray_add_uniq( &make->include_paths, value.str[i] + 2 );
|
strarray_add_uniq( &make->include_paths, value.str[i] + 2 );
|
||||||
else
|
else if (!strncmp( value.str[i], "-D", 2 ) || !strncmp( value.str[i], "-U", 2 ))
|
||||||
strarray_add_uniq( &make->define_args, value.str[i] );
|
strarray_add_uniq( &make->define_args, value.str[i] );
|
||||||
strarray_addall( &make->define_args, get_expanded_make_var_array( make, "EXTRADEFS" ));
|
strarray_addall( &make->define_args, get_expanded_make_var_array( make, "EXTRADEFS" ));
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue