Skip to content

Commit

Permalink
Win32 build: Increase verbosity on check for installed gnome.
Browse files Browse the repository at this point in the history
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@22863 57a11ea4-9604-0410-9ed3-97b8803252fd
  • Loading branch information
cstim committed Apr 2, 2013
1 parent 814947c commit ca1435d
Showing 1 changed file with 8 additions and 7 deletions.
15 changes: 8 additions & 7 deletions packaging/win32/install-impl.sh
Expand Up @@ -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
Expand Down Expand Up @@ -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
}
Expand Down

0 comments on commit ca1435d

Please sign in to comment.