[Xfce4-commits] [xfce/libxfce4ui] 01/03: Fix build error when using --disable-gtk2 and have gladeui1

[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/libxfce4ui.

commit 1d7311e780a47070df00b7da7c5f8d2ca33b4b13
Author: Romain Bouvier <skunnyk at alteroot.org>
Date:   Thu May 16 23:04:35 2019 +0200

    Fix build error when using --disable-gtk2 and have gladeui1
    
    - Do not try to build gladeui (gtk2) file when we ask for --disable-gtk2
---
 configure.ac.in | 75 +++++++++++++++++++++++++++++++--------------------------
 1 file changed, 41 insertions(+), 34 deletions(-)

diff --git a/configure.ac.in b/configure.ac.in
index 3cf344d..47aadb9 100644
--- a/configure.ac.in
+++ b/configure.ac.in
@@ -202,42 +202,49 @@ AC_MSG_RESULT([$with_manual_website])
 dnl *********************************************************
 dnl *** Optional support for the Glade Interface Designer ***
 dnl *********************************************************
-XDT_CHECK_OPTIONAL_PACKAGE([GLADEUI], [gladeui-1.0],
-                           [3.5.0], [gladeui], [glade interface designer])
+dnl Do not try to build gladeui when gtk2 is disabled
+if test "x$GTK2_FOUND" = "xyes"; then
+    XDT_CHECK_OPTIONAL_PACKAGE([GLADEUI], [gladeui-1.0],
+                            [3.5.0], [gladeui], [glade interface designer])
+    AC_ARG_WITH([gladeui-catalogdir],
+                [AC_HELP_STRING([--with-gladeui-catalogdir=PATH],
+                                [Specify where to install glade designer catalog files (default=autodetect)])],
+                [gladeui_catalogdir="$withval"])
+    AC_ARG_WITH([gladeui-moduledir],
+                [AC_HELP_STRING([--with-gladeui-moduledir=PATH],
+                                [Specify where to install glade designer modules (default=autodetect)])],
+                [gladeui_moduledir="$withval"])
+    AC_ARG_WITH([gladeui-pixmapdir],
+                [AC_HELP_STRING([--with-gladeui-pixmapdir=PATH],
+                                [Specify where to install glade designer pixmaps (default=autodetect)])],
+                [gladeui_pixmapdir="$withval"])
+    if test x"$GLADEUI_FOUND" = x"yes"; then
+    if test x"$gladeui_catalogdir" = x""; then
+        GLADEUI_CATALOGDIR=`$PKG_CONFIG "--variable=catalogdir" "gladeui-1.0"`
+    else
+        GLADEUI_CATALOGDIR="$gladeui_catalogdir"
+    fi
+    if test x"$gladeui_moduledir" = x""; then
+        GLADEUI_MODULEDIR=`$PKG_CONFIG "--variable=moduledir" "gladeui-1.0"`
+    else
+        GLADEUI_MODULEDIR="$gladeui_moduledir"
+    fi
+    if test x"$gladeui_pixmapdir" = x""; then
+        GLADEUI_PIXMAPDIR=`$PKG_CONFIG "--variable=pixmapdir" "gladeui-1.0"`
+    else
+        GLADEUI_PIXMAPDIR="$gladeui_pixmapdir"
+    fi
+    fi
+    AC_SUBST([GLADEUI_CATALOGDIR])
+    AC_SUBST([GLADEUI_MODULEDIR])
+    AC_SUBST([GLADEUI_PIXMAPDIR])
+else
+    dnl Hacky way to declare HAVE_GLADEUI false with --disable-gtk2
+    AM_CONDITIONAL([HAVE_GLADEUI], false)
+fi
+
 XDT_CHECK_OPTIONAL_PACKAGE([GLADEUI2], [gladeui-2.0],
                            [3.5.0], [gladeui2], [glade interface designer])
-AC_ARG_WITH([gladeui-catalogdir],
-            [AC_HELP_STRING([--with-gladeui-catalogdir=PATH],
-                            [Specify where to install glade designer catalog files (default=autodetect)])],
-            [gladeui_catalogdir="$withval"])
-AC_ARG_WITH([gladeui-moduledir],
-            [AC_HELP_STRING([--with-gladeui-moduledir=PATH],
-                            [Specify where to install glade designer modules (default=autodetect)])],
-            [gladeui_moduledir="$withval"])
-AC_ARG_WITH([gladeui-pixmapdir],
-            [AC_HELP_STRING([--with-gladeui-pixmapdir=PATH],
-                            [Specify where to install glade designer pixmaps (default=autodetect)])],
-            [gladeui_pixmapdir="$withval"])
-if test x"$GLADEUI_FOUND" = x"yes"; then
-  if test x"$gladeui_catalogdir" = x""; then
-    GLADEUI_CATALOGDIR=`$PKG_CONFIG "--variable=catalogdir" "gladeui-1.0"`
-  else
-    GLADEUI_CATALOGDIR="$gladeui_catalogdir"
-  fi
-  if test x"$gladeui_moduledir" = x""; then
-    GLADEUI_MODULEDIR=`$PKG_CONFIG "--variable=moduledir" "gladeui-1.0"`
-  else
-    GLADEUI_MODULEDIR="$gladeui_moduledir"
-  fi
-  if test x"$gladeui_pixmapdir" = x""; then
-    GLADEUI_PIXMAPDIR=`$PKG_CONFIG "--variable=pixmapdir" "gladeui-1.0"`
-  else
-    GLADEUI_PIXMAPDIR="$gladeui_pixmapdir"
-  fi
-fi
-AC_SUBST([GLADEUI_CATALOGDIR])
-AC_SUBST([GLADEUI_MODULEDIR])
-AC_SUBST([GLADEUI_PIXMAPDIR])
 
 AC_ARG_WITH([gladeui2-catalogdir],
             [AC_HELP_STRING([--with-gladeui2-catalogdir=PATH],

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