GTK+2 panel 

GTK+2 panel Commit Details

Date:2012-05-27 12:24:23 (8 years 5 months ago)
Author:Nicola Fontana
Branch:master
Commit:e0dc0a71ef997695ee86c3eb5c4fcca70e6dce7f
Parents: b4e7a102fdc2da996e56901343b5b7b05298a292
Message:[build] Added proper glade support

Added proper support for gladeui-1.0 and the possibility to explicitely
specify the catalog directory. This is a backporting and adaptation of
the same feature included by the ADG project:
http://dev.entidi.com/p/adg/source/commit/419c630cf0cc7272ca0b5c0d7ab199cdd16c1ada/

Closes issue #69.
Changes:
Mconfigure.ac (2 diffs)

File differences

configure.ac
5252
5353
5454
55
56
57
58
59
60
61
62
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
6391
64
65
66
67
68
69
70
71
72
7392
7493
7594
......
110129
111130
112131
113
114132
133
115134
PKG_CHECK_MODULES([GTK],[gtk+-2.0 >= 2.16.0])
##################################################
# Check for optional glade support (enable panel editing throught glade)
##################################################
AC_ARG_ENABLE([glade],
[AS_HELP_STRING([--enable-glade],
[Enable glade support @<:@default=check@:>@])],
[],[enable_glade=check])
dnl Glade catalog dir. Valid values include:
dnl - check: try to figure out the correct path at configure time
dnl - yes: figure out the correct path at configure time or fail
dnl - no: glade support disabled
dnl - ...: explicit path to glade catalogs (check for gladeui disabled)
AC_ARG_WITH(glade_catalogdir,
[AC_HELP_STRING([--with-glade-catalogdir@<:@=DIR@:>@],
[where to install the glade catalogs @<:@default=check@:>@])],
[],[with_glade_catalogdir=check])
# Both "check" and "yes" require gladeui detection but "yes" fails on gladeui not found.
# gtk2panel is GTK+2 based, so only gladeui-1.0 is checked.
AS_IF([test "x${with_glade_catalogdir}" = "xcheck" -o "x${with_glade_catalogdir}" = "xyes"],
[catalogdir=$($PKG_CONFIG --define-variable=prefix='${prefix}' \
--define-variable=exec_prefix='${exec_prefix}' --define-variable=libdir='${libdir}' \
--define-variable=bindir='${bindir}' --define-variable=datarootdir='${datarootdir}' \
--define-variable=datadir='${datadir}' --define-variable=includedir='${includedir}' \
--variable=catalogdir gladeui-1.0)
AS_IF([test "x${catalogdir}" != "x"], [with_glade_catalogdir="${catalogdir}"])])
# Handle "yes" failure
AS_IF([test "x${with_glade_catalogdir}" = "xyes"],
[AC_MSG_ERROR([Glade support explicitely required but gladeui-1.0 not found])])
# Handle "check" graceful degradation
AS_IF([test "x${with_glade_catalogdir}" = "xcheck"],
[with_glade_catalogdir=no])
AM_CONDITIONAL([HAVE_GLADE],[test "x${with_glade_catalogdir}" != "xno"])
AM_COND_IF([HAVE_GLADE],
[enable_glade=yes
report_glade_catalogdir="
Glade catalog dir: ${with_glade_catalogdir}"],
[enable_glade=no
report_glade_catalogdir=""])
AC_SUBST([GLADE_CATALOGDIR],${with_glade_catalogdir})
AS_IF([test "x$enable_glade" != "xno"],
[PKG_CHECK_MODULES([GLADE],[gladeui-1.0],
[enable_glade=yes
AC_SUBST([GLADE_CATALOGDIR],[$(pkg-config --variable=catalogdir gladeui-1.0)])
AC_SUBST([GLADE_PIXMAPDIR],[$(pkg-config --variable=pixmapdir gladeui-1.0)])],
[AS_IF([test "x$enable_glade" = "xyes"],
[AC_MSG_ERROR([$GLADE_PKG_ERRORS but glade support requested])],
[enable_glade=no])])])
AM_CONDITIONAL([HAVE_GLADE],[test "x$enable_glade" = "xyes"])
##################################################
The following features will be enabled:
Glade support: $enable_glade
libwnck-based widgets: $enable_libwnck
Install glade catalogs: $enable_glade$report_glade_catalogdir
])

Archive Download the corresponding diff file

Branches

Tags