[Xfce4-commits] [xfce/exo] 01/01: Bug #15199: Really allow libexo-1 to be disabled

[noreply at xfce.org]

This is an automated email from the git hooks/post-receive script.

s   k   u   n   n   y   k       p   u   s   h   e   d       a       c   o   m   m   i   t       t   o       b   r   a   n   c   h       m   a   s   t   e   r   
   in repository xfce/exo.

commit 4bbf138fd9aeb819848c145518ced45a180b59a0
Author: Romain Bouvier <skunnyk at alteroot.org>
Date:   Thu Apr 18 23:30:16 2019 +0200

    Bug #15199: Really allow libexo-1 to be disabled
    
    - Be able to build exo without gtk2 support
    - Update some autohell macros to 2019
    - For now, we can't build the doc without gtk2 support
---
 autogen.sh                 |  4 ++--
 configure.ac.in            | 12 +++---------
 docs/reference/Makefile.am |  8 +++++---
 3 files changed, 10 insertions(+), 14 deletions(-)

diff --git a/autogen.sh b/autogen.sh
index 0cbb93c..f5afa69 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (c) 2002-2009
+# Copyright (c) 2002-2019
 #         The Xfce development team. All rights reserved.
 #
 # This program is free software; you can redistribute it and/or modify
@@ -27,7 +27,7 @@ autogen.sh: You don't seem to have the Xfce development tools (at least
             version $XDT_REQURED_VERSION) installed on your system, which
             are required to build this software.
             Please install the xfce4-dev-tools package first; it is available
-            from https://xfce.org/.
+            from https://www.xfce.org/.
 EOF
   exit 1
 }
diff --git a/configure.ac.in b/configure.ac.in
index 33c601d..eaf2a56 100644
--- a/configure.ac.in
+++ b/configure.ac.in
@@ -1,5 +1,6 @@
 dnl
 dnl Copyright (c) 2004-2009 os-cillation.
+dnl Copyright (c) 2009-2019 Xfce Development Team <xfce4-dev at xfce.org>
 dnl All rights reserved.
 dnl
 dnl Written by Benedikt Meurer <benny at xfce.org>.
@@ -33,7 +34,7 @@ dnl ***************************
 dnl *** Initialize autoconf ***
 dnl ***************************
 AC_COPYRIGHT([Copyright (c) 2004-2010 os-cillation.
-Copyright (c) 2004-2018 Xfce Development Team])
+Copyright (c) 2004-2019 Xfce Development Team])
 AC_INIT([exo], [libexo_version], [https://bugzilla.xfce.org/])
 AC_PREREQ([2.60])
 AC_CONFIG_MACRO_DIR([m4])
@@ -46,7 +47,7 @@ dnl ***************************
 AM_INIT_AUTOMAKE([1.11 dist-bzip2 tar-ustar no-dist-gzip])
 AC_CONFIG_HEADERS([config.h])
 AM_MAINTAINER_MODE()
-m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
+AM_SILENT_RULES([yes])
 
 dnl **************************
 dnl *** Libtool versioning ***
@@ -171,7 +172,6 @@ XDT_CHECK_PACKAGE([GIO], [gio-2.0], [2.42.0])
 XDT_CHECK_PACKAGE([GTK3], [gtk+-3.0], [3.22.0])
 XDT_CHECK_PACKAGE([GTHREAD], [gthread-2.0], [2.42.0])
 XDT_CHECK_PACKAGE([LIBXFCE4UTIL], [libxfce4util-1.0], [4.12.0])
-XDT_CHECK_PACKAGE([LIBXFCE4UI], [libxfce4ui-1], [4.12.0])
 XDT_CHECK_PACKAGE([LIBXFCE4UI2], [libxfce4ui-2], [4.12.0])
 XDT_CHECK_OPTIONAL_PACKAGE([GIO_UNIX], [gio-unix-2.0], [2.42.0], [gio-unix], [GIO-Unix features])
 
@@ -238,12 +238,6 @@ fi
 AM_CONDITIONAL([HAVE_GNUC_VISIBILITY], [test x"$have_gnuc_visibility" = x"yes"])
 
 dnl *************************************
-dnl *** Compensate for broken gtk-doc ***
-dnl *************************************
-XDT_SUPPORTED_FLAGS([GTK_DOC_EXTRA_CFLAGS], [-Wno-sign-compare])
-AC_SUBST([GTK_DOC_EXTRA_CFLAGS])
-
-dnl *************************************
 dnl *** Use GSEAL if possible         ***
 dnl *************************************
 XDT_SUPPORTED_FLAGS([CFLAGS], [-DGSEAL_ENABLE])
diff --git a/docs/reference/Makefile.am b/docs/reference/Makefile.am
index 561caaf..6781710 100644
--- a/docs/reference/Makefile.am
+++ b/docs/reference/Makefile.am
@@ -48,12 +48,14 @@ content_files = 							\
 
 # CFLAGS and LDFLAGS for compiling scan program. Only needed
 # if $(DOC_MODULE).types is non-empty.
-AM_CPPFLAGS =	 							\
+# We need to use GTK2 exo flags because the GTK3 version does not have
+# all symbols (exo_toolbars etc)
+# We can't build the doc with --disable-gtk2 for now
+GTKDOC_CFLAGS =	 							\
 	-I$(top_srcdir) 						\
 	-I$(top_builddir) 						\
 	$(GTK2_CFLAGS)							\
-	$(LIBXFCE4UTIL_CFLAGS)						\
-	$(GTK_DOC_EXTRA_CFLAGS)
+	$(LIBXFCE4UTIL_CFLAGS)
 
 GTKDOC_LIBS =  								\
 	$(top_builddir)/exo/libexo-$(LIBEXO_VERSION_API).la \

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.