talons

commit e8c787412d2b6cecc7464431d4fbd9f1eb4614f4
parent a8e50abd1506794e2f314a0277bd6f44b97ab3d9
Author: Paul <paul@claws-mail.org>
Date:   Thu,  2 Mar 2017 14:54:34 +0000

fix using building with --disable-deprecated

If --disable-deprecated is specified it will set GTK_CFLAGS.
Later the pkgconfig check for GTK_CFLAGS will be skipped because the
variable is already set. As a result essential CLFAGS from gtk+-2.0 will
be missing in global CFLAGS and compilation fails.

Solution is to check for the configure flag after pkgconfig.

Thanks to Olaf Hering <olaf@aepfle.de>

Diffstat:
M
configure.ac
 | 
7
+++----

1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/configure.ac b/configure.ac
@@ -294,10 +294,6 @@ AC_ARG_ENABLE(svg,
         [  --disable-svg                   Do not build SVG support],
         [enable_svg=$enableval], [enable_svg=yes])
 
-AC_ARG_ENABLE(deprecated,
-		[  --disable-deprecated            Disable deprecated GTK functions],
-		[GTK_CFLAGS="$GTK_CFLAGS -DG_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED"], [])
-
 manualdir='${docdir}/manual'
 AC_ARG_WITH(manualdir,
 	[  --with-manualdir=DIR    Manual directory],
@@ -579,6 +575,9 @@ if test x"$enable_gtk3" = x"yes"; then
 else
 	PKG_CHECK_MODULES(GTK, gtk+-2.0 >= 2.16)
 fi
+AC_ARG_ENABLE(deprecated,
+		[  --disable-deprecated            Disable deprecated GTK functions],
+		[GTK_CFLAGS="$GTK_CFLAGS -DG_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED"], [])
 AC_SUBST(GTK_CFLAGS)
 AC_SUBST(GTK_LIBS)