[Xfce4-commits] [xfce/libxfce4ui] 01/01: Fix gladeui2 path detection (Bug #13944)

[noreply at xfce.org]

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

e   r   i   c       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 05a90bd605c663afa66ec9610f955ff98bca7fd4
Author: Eric Koegel <eric.koegel at gmail.com>
Date:   Mon Oct 23 07:11:31 2017 +0300

    Fix gladeui2 path detection (Bug #13944)
    
    Allow glade gtk3 path to be overriden and fix the moduledir path.
    Patch by Unit193.
---
 configure.ac.in | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/configure.ac.in b/configure.ac.in
index e10019a..7b42590 100644
--- a/configure.ac.in
+++ b/configure.ac.in
@@ -239,6 +239,18 @@ AC_SUBST([GLADEUI_CATALOGDIR])
 AC_SUBST([GLADEUI_MODULEDIR])
 AC_SUBST([GLADEUI_PIXMAPDIR])
 
+AC_ARG_WITH([gladeui2-catalogdir],
+            [AC_HELP_STRING([--with-gladeui2-catalogdir=PATH],
+                            [Specify where to install glade 3.0 designer catalog files (default=autodetect)])],
+            [gladeui2_catalogdir="$withval"])
+AC_ARG_WITH([gladeui2-moduledir],
+            [AC_HELP_STRING([--with-gladeui2-moduledir=PATH],
+                            [Specify where to install glade 3.0 designer modules (default=autodetect)])],
+            [gladeui2_moduledir="$withval"])
+AC_ARG_WITH([gladeui2-pixmapdir],
+            [AC_HELP_STRING([--with-gladeui2-pixmapdir=PATH],
+                            [Specify where to install glade 3.0 designer pixmaps (default=autodetect)])],
+            [gladeui2_pixmapdir="$withval"])
 if test x"$GLADEUI2_FOUND" = x"yes"; then
   if test x"$gladeui2_catalogdir" = x""; then
     GLADEUI2_CATALOGDIR="${datarootdir}/glade/catalogs"
@@ -246,7 +258,7 @@ if test x"$GLADEUI2_FOUND" = x"yes"; then
     GLADEUI2_CATALOGDIR="$gladeui_catalogdir"
   fi
   if test x"$gladeui2_moduledir" = x""; then
-    GLADEUI2_MODULEDIR="${datarootdir}/glade/modules"
+    GLADEUI2_MODULEDIR="${libdir}/glade/modules"
   else
     GLADEUI2_MODULEDIR="$gladeui_moduledir"
   fi

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