[Commits] [SCM] claws branch, master, updated. 3.14.1-212-ge8c7874

[claws at claws-mail.org]

The branch, master has been updated
       via  e8c787412d2b6cecc7464431d4fbd9f1eb4614f4 (commit)
      from  a8e50abd1506794e2f314a0277bd6f44b97ab3d9 (commit)

Summary of changes:
 configure.ac |    7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)


- Log -----------------------------------------------------------------
commit e8c787412d2b6cecc7464431d4fbd9f1eb4614f4
Author: Paul <paul at claws-mail.org>
Date:   Thu Mar 2 14:54:34 2017 +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 at aepfle.de>

diff --git a/configure.ac b/configure.ac
index e94641e..51246fb 100644
--- 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)
 

-----------------------------------------------------------------------


hooks/post-receive
-- 
Claws Mail