Commit 6116ccf0354ae0c027341b2734fd2942f8635f5a
2020-12-29T21:20:28
fix configure warnings when checking dbus/dbus.h and ibus-1.0/ibus.h .. by adding DBUS_CFLAGS and IBUS_CFLAGS to CPPFLAGS: configure: WARNING: dbus/dbus.h: accepted by the compiler, rejected by the preprocessor! configure: WARNING: dbus/dbus.h: proceeding with the compiler's result configure: WARNING: ibus-1.0/ibus.h: accepted by the compiler, rejected by the preprocessor! configure: WARNING: ibus-1.0/ibus.h: proceeding with the compiler's result
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93
diff --git a/configure b/configure
index 4f97b16..61c2b28 100755
--- a/configure
+++ b/configure
@@ -23031,7 +23031,9 @@ else
$as_echo "yes" >&6; }
have_dbus=yes
fi
+ save_CPPFLAGS="$CPPFLAGS"
save_CFLAGS="$CFLAGS"
+ CPPFLAGS="$save_CPPFLAGS $DBUS_CFLAGS"
CFLAGS="$save_CFLAGS $DBUS_CFLAGS"
ac_fn_c_check_header_mongrel "$LINENO" "dbus/dbus.h" "ac_cv_header_dbus_dbus_h" "$ac_includes_default"
if test "x$ac_cv_header_dbus_dbus_h" = xyes; then :
@@ -23041,6 +23043,7 @@ else
fi
+ CPPFLAGS="$save_CPPFLAGS"
CFLAGS="$save_CFLAGS"
if test x$have_dbus_dbus_h_hdr = xyes; then
@@ -23204,7 +23207,9 @@ else
$as_echo "yes" >&6; }
have_ibus=yes
fi
+ save_CPPFLAGS="$CPPFLAGS"
save_CFLAGS="$CFLAGS"
+ CPPFLAGS="$save_CPPFLAGS $IBUS_CFLAGS"
CFLAGS="$save_CFLAGS $IBUS_CFLAGS"
ac_fn_c_check_header_mongrel "$LINENO" "ibus-1.0/ibus.h" "ac_cv_header_ibus_1_0_ibus_h" "$ac_includes_default"
if test "x$ac_cv_header_ibus_1_0_ibus_h" = xyes; then :
@@ -23214,6 +23219,7 @@ else
fi
+ CPPFLAGS="$save_CPPFLAGS"
CFLAGS="$save_CFLAGS"
if test x$have_ibus_ibus_h_hdr = xyes; then
if test x$enable_ime != xyes; then
@@ -25205,7 +25211,8 @@ $as_echo "#define SDL_FILESYSTEM_WINDOWS 1" >>confdefs.h
fi
# Set up files for the thread library
if test x$enable_threads = xyes; then
- $as_echo "#define SDL_THREAD_GENERIC_COND_SUFFIX 1" >>confdefs.h
+
+$as_echo "#define SDL_THREAD_GENERIC_COND_SUFFIX 1" >>confdefs.h
$as_echo "#define SDL_THREAD_WINDOWS 1" >>confdefs.h
diff --git a/configure.ac b/configure.ac
index 79e7835..6d11977 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2714,11 +2714,14 @@ AS_HELP_STRING([--enable-dbus], [enable D-Bus support [[default=yes]]]),
, enable_dbus=yes)
if test x$enable_dbus = xyes; then
PKG_CHECK_MODULES([DBUS], [dbus-1], have_dbus=yes, have_dbus=no)
+ save_CPPFLAGS="$CPPFLAGS"
save_CFLAGS="$CFLAGS"
+ CPPFLAGS="$save_CPPFLAGS $DBUS_CFLAGS"
CFLAGS="$save_CFLAGS $DBUS_CFLAGS"
AC_CHECK_HEADER(dbus/dbus.h,
have_dbus_dbus_h_hdr=yes,
have_dbus_dbus_h_hdr=no)
+ CPPFLAGS="$save_CPPFLAGS"
CFLAGS="$save_CFLAGS"
if test x$have_dbus_dbus_h_hdr = xyes; then
AC_DEFINE(HAVE_DBUS_DBUS_H, 1, [ ])
@@ -2770,11 +2773,14 @@ AS_HELP_STRING([--enable-ibus], [enable IBus support [[default=yes]]]),
, enable_ibus=yes)
if test x$enable_ibus = xyes; then
PKG_CHECK_MODULES([IBUS], [ibus-1.0], have_ibus=yes, have_ibus=no)
+ save_CPPFLAGS="$CPPFLAGS"
save_CFLAGS="$CFLAGS"
+ CPPFLAGS="$save_CPPFLAGS $IBUS_CFLAGS"
CFLAGS="$save_CFLAGS $IBUS_CFLAGS"
AC_CHECK_HEADER(ibus-1.0/ibus.h,
have_ibus_ibus_h_hdr=yes,
have_ibus_ibus_h_hdr=no)
+ CPPFLAGS="$save_CPPFLAGS"
CFLAGS="$save_CFLAGS"
if test x$have_ibus_ibus_h_hdr = xyes; then
if test x$enable_ime != xyes; then
@@ -3869,7 +3875,7 @@ AS_HELP_STRING([--enable-render-d3d], [enable the Direct3D render driver [[defau
fi
# Set up files for the thread library
if test x$enable_threads = xyes; then
- AC_DEFINE(SDL_THREAD_GENERIC_COND_SUFFIX, 1, [])
+ AC_DEFINE(SDL_THREAD_GENERIC_COND_SUFFIX, 1, [ ])
AC_DEFINE(SDL_THREAD_WINDOWS, 1, [ ])
SOURCES="$SOURCES $srcdir/src/thread/windows/*.c"
SOURCES="$SOURCES $srcdir/src/thread/generic/SDL_syscond.c"