From 3bc9da3286759f895574ecad3234ee3e0973e9df Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Sun, 8 Dec 2013 00:53:49 -0800 Subject: [PATCH] * configure.ac: Simplify supression of GTK deprecation warning. Move -DGDK_DISABLE_DEPRECATION_WARNINGS out of the command line and into config.h, to shorten the command line when doing 'make'. Don't AC_SUBST GTK_CFLAGS, as this is not needed. --- ChangeLog | 5 +++++ configure.ac | 7 ++++--- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 724218c1d35..2b1d363face 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,10 @@ 2013-12-08 Paul Eggert + * configure.ac: Simplify supression of GTK deprecation warning. + Move -DGDK_DISABLE_DEPRECATION_WARNINGS out of the command line + and into config.h, to shorten the command line when doing 'make'. + Don't AC_SUBST GTK_CFLAGS, as this is not needed. + Use libcrypto's checksum implementations if available, for speed. On commonly used platform libcrypto uses architecture-specific assembly code, which is significantly faster than the C code we diff --git a/configure.ac b/configure.ac index 264c339ed6e..5240afac291 100644 --- a/configure.ac +++ b/configure.ac @@ -2185,8 +2185,10 @@ if test "${opsys}" != "mingw32"; then gtk_term_header=gtkutil.h USE_GTK_TOOLKIT="GTK3" if test "x$ac_enable_gtk_deprecation_warnings" = x; then - GTK_CFLAGS="$GTK_CFLAGS -DGDK_DISABLE_DEPRECATION_WARNINGS" - GTK_CFLAGS="$GTK_CFLAGS -DGLIB_DISABLE_DEPRECATION_WARNINGS" + AC_DEFINE([GDK_DISABLE_DEPRECATION_WARNINGS], [1], + [Define to 1 to disable GTK+/GDK deprecation warnings.]) + AC_DEFINE([GLIB_DISABLE_DEPRECATION_WARNINGS], [1], + [Define to 1 to disable Glib deprecation warnings.]) fi else check_gtk2=yes @@ -2212,7 +2214,6 @@ fi if test x"$pkg_check_gtk" = xyes; then - AC_SUBST(GTK_CFLAGS) AC_SUBST(GTK_LIBS) C_SWITCH_X_SITE="$C_SWITCH_X_SITE $GTK_CFLAGS" CFLAGS="$CFLAGS $GTK_CFLAGS" -- 2.39.2