This is an automated email from the git hooks/post-receive script. s k u n n y k 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 9b5703ac1ab4a24e8c30c885218456ea240ead3e Author: Romain B <[email protected]> Date: Sun Sep 9 23:05:39 2018 +0200 Fixes for gladeui2 detection - Use the same method for gladeui and gladeui2 - Also disable gladeui2 in distcheck --- Makefile.am | 3 ++- configure.ac.in | 6 +++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/Makefile.am b/Makefile.am index 62abdd4..5de3597 100644 --- a/Makefile.am +++ b/Makefile.am @@ -41,7 +41,8 @@ DISTCLEANFILES = \ DISTCHECK_CONFIGURE_FLAGS = \ --enable-gtk-doc \ --disable-gladeui \ + --disable-gladeui2 \ --enable-introspection \ - --enable-vala=no + --disable-vala # vi:set ts=8 sw=8 noet ai nocindent syntax=automake: diff --git a/configure.ac.in b/configure.ac.in index 6035bfe..12e60a2 100644 --- a/configure.ac.in +++ b/configure.ac.in @@ -253,17 +253,17 @@ AC_ARG_WITH([gladeui2-pixmapdir], [gladeui2_pixmapdir="$withval"]) if test x"$GLADEUI2_FOUND" = x"yes"; then if test x"$gladeui2_catalogdir" = x""; then - GLADEUI2_CATALOGDIR="${datarootdir}/glade/catalogs" + GLADEUI2_CATALOGDIR=`$PKG_CONFIG "--variable=catalogdir" "gladeui-2.0"` else GLADEUI2_CATALOGDIR="$gladeui2_catalogdir" fi if test x"$gladeui2_moduledir" = x""; then - GLADEUI2_MODULEDIR="${libdir}/glade/modules" + GLADEUI2_MODULEDIR=`$PKG_CONFIG "--variable=moduledir" "gladeui-2.0"` else GLADEUI2_MODULEDIR="$gladeui2_moduledir" fi if test x"$gladeui2_pixmapdir" = x""; then - GLADEUI2_PIXMAPDIR="${datarootdir}/glade/pixmaps" + GLADEUI2_PIXMAPDIR=`$PKG_CONFIG "--variable=pixmapdir" "gladeui-2.0"` else GLADEUI2_PIXMAPDIR="$gladeui2_pixmapdir" fi -- To stop receiving notification emails like this one, please contact the administrator of this repository. _______________________________________________ Xfce4-commits mailing list [email protected] https://mail.xfce.org/mailman/listinfo/xfce4-commits
