Author: kelnos
Date: 2008-08-17 20:16:50 +0000 (Sun, 17 Aug 2008)
New Revision: 27484
Modified:
libxfcegui4/trunk/Makefile.am
libxfcegui4/trunk/configure.in.in
Log:
fix make distcheck (install glade stuff to /tmp)
Modified: libxfcegui4/trunk/Makefile.am
===================================================================
--- libxfcegui4/trunk/Makefile.am 2008-08-17 20:16:39 UTC (rev 27483)
+++ libxfcegui4/trunk/Makefile.am 2008-08-17 20:16:50 UTC (rev 27484)
@@ -39,6 +39,9 @@
DISTCHECK_CONFIGURE_FLAGS = \
--disable-debug \
- --enable-gtk-doc
+ --enable-gtk-doc \
+ --with-libglade-module-path=/tmp/$(PACKAGE)-distcheck/libglade \
+ --with-gladeui-module-path=/tmp/$(PACKAGE)-distcheck/gladeui-lib \
+ --with-gladeui-data-root=/tmp/$(PACKAGE)-distcheck/gladeui-data
# vi:set ts=8 sw=8 noet ai nocindent syntax=automake:
Modified: libxfcegui4/trunk/configure.in.in
===================================================================
--- libxfcegui4/trunk/configure.in.in 2008-08-17 20:16:39 UTC (rev 27483)
+++ libxfcegui4/trunk/configure.in.in 2008-08-17 20:16:50 UTC (rev 27484)
@@ -124,10 +124,28 @@
XDT_CHECK_OPTIONAL_PACKAGE([GLADEUI], [gladeui-1.0], [3.0.0], [gladeui],
[glade interface designer integration])
+AC_ARG_WITH([gladeui-data-root],
+ [AC_HELP_STRING([--with-gladeui-data-root=PATH],
+ [Specify where to install glade designer data
files (default=autodetect)])],
+ [gladeui_data_root="$withval"])
+AC_ARG_WITH([gladeui-module-path],
+ [AC_HELP_STRING([--with-gladeui-module-path=PATH],
+ [Specify where to install glade designer modules
(default=autodetect)])],
+ [gladeui_module_path="$withval"])
if test "x$GLADEUI_FOUND" = "xyes"; then
- GLADEUI_CATALOG_DIR="`$PKG_CONFIG gladeui-1.0 --variable=catalogdir`"
- GLADEUI_PIXMAP_DIR="`$PKG_CONFIG gladeui-1.0 --variable=pixmapdir`"
- GLADEUI_MODULE_DIR="`$PKG_CONFIG gladeui-1.0 --variable=moduledir`"
+ if test "x$gladeui_data_root" = "x"; then
+ GLADEUI_CATALOG_DIR="`$PKG_CONFIG gladeui-1.0 --variable=catalogdir`"
+ GLADEUI_PIXMAP_DIR="`$PKG_CONFIG gladeui-1.0 --variable=pixmapdir`"
+ else
+ GLADEUI_CATALOG_DIR="$gladeui_data_root/catalogs"
+ GLADEUI_PIXMAP_DIR="$gladeui_data_root/pixmaps"
+ fi
+
+ if test "x$gladeui_module_path" = "x"; then
+ GLADEUI_MODULE_DIR="`$PKG_CONFIG gladeui-1.0 --variable=moduledir`"
+ else
+ GLADEUI_MODULE_DIR="$gladeui_module_path"
+ fi
dnl this is retarded. glade 3.4.0 changed the pixmap dir layout
GLADEUI_MAJOR="`echo $GLADEUI_VERSION | cut -d. -f1`"
_______________________________________________
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
