[Xfce4-commits] <libxfce4ui:master> Add configure flags for custom gladeui paths (catalog, pixmap, module).

Jannis Pohlmann noreply at xfce.org
Fri Sep 18 15:04:01 CEST 2009


Updating branch refs/heads/master
         to a0e71230452f819583213c6f812b9cdf68aab0b8 (commit)
       from 85d2709efc2c9165b1ba0d38c467d01dc94618da (commit)

commit a0e71230452f819583213c6f812b9cdf68aab0b8
Author: Jannis Pohlmann <jannis at xfce.org>
Date:   Fri Sep 18 15:01:42 2009 +0200

    Add configure flags for custom gladeui paths (catalog, pixmap, module).
    
    It's untested but we need had something similar in libxfcegui4 before
    and really need to support custom paths for people installing to exotic
    locations. Buildbot relies on this too.

 configure.in.in |   30 +++++++++++++++++++++++++++---
 1 files changed, 27 insertions(+), 3 deletions(-)

diff --git a/configure.in.in b/configure.in.in
index 3e75d93..ab9cbed 100644
--- a/configure.in.in
+++ b/configure.in.in
@@ -175,10 +175,34 @@ dnl *** Optional support for the Glade Interface Designer ***
 dnl *********************************************************
 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
-  GLADEUI_CATALOGDIR=`$PKG_CONFIG "--variable=catalogdir" "gladeui-1.0"`
-  GLADEUI_MODULEDIR=`$PKG_CONFIG "--variable=moduledir" "gladeui-1.0"`
-  GLADEUI_PIXMAPDIR=`$PKG_CONFIG "--variable=pixmapdir" "gladeui-1.0"`
+  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])



More information about the Xfce4-commits mailing list