From ca1435df60329056d7b7ea7e2be8ec9d30d88196 Mon Sep 17 00:00:00 2001 From: Christian Stimming Date: Tue, 2 Apr 2013 06:59:08 +0000 Subject: [PATCH] Win32 build: Increase verbosity on check for installed gnome. git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@22863 57a11ea4-9604-0410-9ed3-97b8803252fd --- packaging/win32/install-impl.sh | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/packaging/win32/install-impl.sh b/packaging/win32/install-impl.sh index 97d27ec9e3..1d12aa2312 100644 --- a/packaging/win32/install-impl.sh +++ b/packaging/win32/install-impl.sh @@ -506,6 +506,7 @@ function inst_gnome() { quiet ${PKG_CONFIG} --atleast-version=${GCONF_VERSION} gconf-2.0 && quiet ${PKG_CONFIG} --atleast-version=${GTK_VERSION} gtk+-2.0 && quiet ${PKG_CONFIG} --atleast-version=${CAIRO_VERSION} cairo && + quiet ${PKG_CONFIG} --atleast-version=${PIXMAN_VERSION} pixman-1 && quiet ${PKG_CONFIG} --exact-version=${LIBXML2_VERSION} libxml-2.0 && quiet intltoolize --version then @@ -620,13 +621,13 @@ EOF #perl -pi.bak -e's!^Libs: !Libs: -L\${prefix}/bin !' *.pc qpopd - quiet gconftool-2 --version && - quiet ${PKG_CONFIG} --atleast-version=${GCONF_VERSION} gconf-2.0 && - quiet ${PKG_CONFIG} --atleast-version=${GTK_VERSION} gtk+-2.0 && - quiet ${PKG_CONFIG} --atleast-version=${CAIRO_VERSION} cairo && - quiet ${PKG_CONFIG} --atleast-version=${PIXMAN_VERSION} pixman-1 && - quiet ${PKG_CONFIG} --exact-version=${LIBXML2_VERSION} libxml-2.0 && - quiet intltoolize --version || die "gnome not installed correctly" + quiet gconftool-2 --version || die "gnome not installed correctly" + quiet ${PKG_CONFIG} --atleast-version=${GCONF_VERSION} gconf-2.0 || die "gnome not installed correctly: no gconf-2.0 with atleast-version=${GCONF_VERSION}" + quiet ${PKG_CONFIG} --atleast-version=${GTK_VERSION} gtk+-2.0 || die "gnome not installed correctly: no gtk+-2.0 with atleast-version=${GTK_VERSION}" + quiet ${PKG_CONFIG} --atleast-version=${CAIRO_VERSION} cairo || die "gnome not installed correctly: no cairo with atleast-version=${CAIRO_VERSION}" + quiet ${PKG_CONFIG} --atleast-version=${PIXMAN_VERSION} pixman-1 || die "gnome not installed correctly: no pixman-1 with atleast-version=${PIXMAN_VERSION}" + quiet ${PKG_CONFIG} --exact-version=${LIBXML2_VERSION} libxml-2.0 || die "gnome not installed correctly: no libxml-2.0 with exact-version=${LIBXML2_VERSION}" + quiet intltoolize --version || die "gnome not installed correctly: no intltoolize" fi [ ! -d $_GNOME_UDIR/share/aclocal ] || add_to_env "-I $_GNOME_UDIR/share/aclocal" ACLOCAL_FLAGS }