Author: kelnos
Date: 2008-06-23 21:11:20 +0000 (Mon, 23 Jun 2008)
New Revision: 27142
Modified:
libxfcegui4/trunk/Makefile.am
libxfcegui4/trunk/configure.in.in
libxfcegui4/trunk/glade/16x16/Makefile.am
libxfcegui4/trunk/glade/22x22/Makefile.am
libxfcegui4/trunk/glade/Makefile.am
Log:
fix glade stuff: hard dep on libglade, soft dep on libgladeui
Modified: libxfcegui4/trunk/Makefile.am
===================================================================
--- libxfcegui4/trunk/Makefile.am 2008-06-22 22:32:00 UTC (rev 27141)
+++ libxfcegui4/trunk/Makefile.am 2008-06-23 21:11:20 UTC (rev 27142)
@@ -1,15 +1,11 @@
# $Id$
-if HAVE_GLADE
-glade_dir = glade
-endif
-
SUBDIRS = \
icons \
libxfcegui4 \
docs \
po
\
- $(glade_dir)
+ glade
AUTOMAKE_OPTIONS = \
1.8 \
Modified: libxfcegui4/trunk/configure.in.in
===================================================================
--- libxfcegui4/trunk/configure.in.in 2008-06-22 22:32:00 UTC (rev 27141)
+++ libxfcegui4/trunk/configure.in.in 2008-06-23 21:11:20 UTC (rev 27142)
@@ -108,37 +108,39 @@
[0.5], [startup-notification],
[startup notification library])
-dnl glade/libglade integration
-XDT_CHECK_OPTIONAL_PACKAGE([GLADEUI], [gladeui-1.0], [3.0.0], [glade],
- [glade/libglade integration])
-XDT_CHECK_OPTIONAL_PACKAGE([LIBGLADE], [libglade-2.0], [2.0.0], [libglade],
- [glade/libglade integration])
-if test "x$GLADEUI_FOUND" = "xyes" -a "x$LIBGLADE_FOUND" = "xyes"; then
- GLADE_CATALOG_DIR="`$PKG_CONFIG gladeui-1.0 --variable=catalogdir`"
- GLADE_PIXMAP_DIR="`$PKG_CONFIG gladeui-1.0 --variable=pixmapdir`"
- GLADE_MODULE_DIR="`$PKG_CONFIG gladeui-1.0 --variable=moduledir`"
+
+dnl glade/libglade integration -- libglade is required, as the xfce
+dnl settings dialogs use glade to create XfceTitledDialogs. libgladeui
+dnl is for developers, and adds the widgets to the glade editor, and
+dnl so is optional
+
+XDT_CHECK_PACKAGE([LIBGLADE], [libglade-2.0], [2.0.0])
+LIBGLADE_MODULE_DIR="`$PKG_CONFIG libglade-2.0 --variable=moduledir`"
+AC_SUBST([LIBGLADE_MODULE_DIR])
+
+XDT_CHECK_OPTIONAL_PACKAGE([GLADEUI], [gladeui-1.0], [3.0.0], [gladeui],
+ [glade interface designer integration])
+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`"
- LIBGLADE_MODULE_DIR="`$PKG_CONFIG libglade-2.0 --variable=moduledir`"
-
dnl this is retarded. glade 3.4.0 changed the pixmap dir layout
GLADEUI_MAJOR="`echo $GLADEUI_VERSION | cut -d. -f1`"
GLADEUI_MINOR="`echo $GLADEUI_VERSION | cut -d. -f2`"
if test $GLADEUI_MAJOR -gt 3 || test $GLADEUI_MAJOR -eq 3 -a
$GLADEUI_MINOR -ge 4; then
- have_glade_pixmap_themes=yes
+ have_gladeui_pixmap_themes=yes
fi
else
- GLADE_CATALOG_DIR=
- GLADE_PIXMAP_DIR=
- GLADE_MODULE_DIR=
-
- LIBGLADE_MODULE_DIR=
+ GLADEUI_CATALOG_DIR=
+ GLADEUI_PIXMAP_DIR=
+ GLADEUI_MODULE_DIR=
fi
-AC_SUBST(GLADE_CATALOG_DIR)
-AC_SUBST(GLADE_PIXMAP_DIR)
-AC_SUBST(GLADE_MODULE_DIR)
-AC_SUBST(LIBGLADE_MODULE_DIR)
-AM_CONDITIONAL([HAVE_GLADE], [test "x$GLADEUI_FOUND" = "xyes" -a
"x$LIBGLADE_FOUND" = "xyes"])
-AM_CONDITIONAL([HAVE_GLADE_PIXMAP_THEMES], [test "x$have_glade_pixmap_themes"
= "xyes"])
+AC_SUBST(GLADEUI_CATALOG_DIR)
+AC_SUBST(GLADEUI_PIXMAP_DIR)
+AC_SUBST(GLADEUI_MODULE_DIR)
+AM_CONDITIONAL([HAVE_GLADEUI], [test "x$GLADEUI_FOUND" = "xyes"])
+AM_CONDITIONAL([HAVE_GLADEUI_PIXMAP_THEMES], [test
"x$have_gladeui_pixmap_themes" = "xyes"])
dnl *************************
dnl *** Check for gtk-doc ***
Modified: libxfcegui4/trunk/glade/16x16/Makefile.am
===================================================================
--- libxfcegui4/trunk/glade/16x16/Makefile.am 2008-06-22 22:32:00 UTC (rev
27141)
+++ libxfcegui4/trunk/glade/16x16/Makefile.am 2008-06-23 21:11:20 UTC (rev
27142)
@@ -5,8 +5,10 @@
xfce-scaled-image.png \
xfce-titled-dialog.png
-if HAVE_GLADE_PIXMAP_THEMES
-gladepixmapdir = $(GLADE_PIXMAP_DIR)/hicolor/16x16/actions
+if HAVE_GLADEUI
+
+if HAVE_GLADEUI_PIXMAP_THEMES
+gladepixmapdir = $(GLADEUI_PIXMAP_DIR)/hicolor/16x16/actions
gladepixmap_DATA = $(addprefix widget-xfce4-,$(glade_pixmaps))
widget-xfce4-%.png: $(srcdir)/%.png
@@ -19,5 +21,7 @@
gladepixmap_DATA = $(glade_pixmaps)
endif
+endif
+
EXTRA_DIST = $(glade_pixmaps)
Modified: libxfcegui4/trunk/glade/22x22/Makefile.am
===================================================================
--- libxfcegui4/trunk/glade/22x22/Makefile.am 2008-06-22 22:32:00 UTC (rev
27141)
+++ libxfcegui4/trunk/glade/22x22/Makefile.am 2008-06-23 21:11:20 UTC (rev
27142)
@@ -5,8 +5,10 @@
xfce-scaled-image.png \
xfce-titled-dialog.png
-if HAVE_GLADE_PIXMAP_THEMES
-gladepixmapdir = $(GLADE_PIXMAP_DIR)/hicolor/22x22/actions
+if HAVE_GLADEUI
+
+if HAVE_GLADEUI_PIXMAP_THEMES
+gladepixmapdir = $(GLADEUI_PIXMAP_DIR)/hicolor/22x22/actions
gladepixmap_DATA = $(addprefix widget-xfce4-,$(glade_pixmaps))
widget-xfce4-%.png: $(srcdir)/%.png
@@ -15,9 +17,11 @@
DISTCLEANFILES = $(gladepixmap_DATA)
else
-gladepixmapdir = $(GLADE_PIXMAP_DIR)/22x22
+gladepixmapdir = $(GLADEUI_PIXMAP_DIR)/22x22
gladepixmap_DATA = $(glade_pixmaps)
endif
+endif
+
EXTRA_DIST = $(glade_pixmaps)
Modified: libxfcegui4/trunk/glade/Makefile.am
===================================================================
--- libxfcegui4/trunk/glade/Makefile.am 2008-06-22 22:32:00 UTC (rev 27141)
+++ libxfcegui4/trunk/glade/Makefile.am 2008-06-23 21:11:20 UTC (rev 27142)
@@ -5,11 +5,13 @@
INCLUDES = \
$(PLATFORM_CPPFLAGS)
+if HAVE_GLADEUI
+
#
# stuff for the glade GUI
#
-glademoduledir = $(GLADE_MODULE_DIR)
+glademoduledir = $(GLADEUI_MODULE_DIR)
glademodule_LTLIBRARIES = libgladexfce4.la
@@ -36,10 +38,11 @@
$(top_builddir)/libxfcegui4/libxfcegui4.la
-gladecatalogdir = $(GLADE_CATALOG_DIR)
+gladecatalogdir = $(GLADEUI_CATALOG_DIR)
gladecatalog_DATA = xfce4.xml xfce4.xml.in
@INTLTOOL_XML_NOMERGE_RULE@
+endif
#
# stuff for libglade
@@ -75,4 +78,4 @@
CLEANFILES = xfce4.xml
-EXTRA_DIST = $(gladecatalog_DATA)
+EXTRA_DIST = xfce4.xml.in
_______________________________________________
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
