@ -506,7 +506,6 @@ 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
@ -598,25 +597,6 @@ EOF
rm -rf $TMP_UDIR /gtk-doc-*
qpopd
if quiet ${ PKG_CONFIG } --exact-version= ${ PIXMAN_VERSION } pixman-1 ; then
echo "Pixman already compiled+installed"
else
wget_unpacked $PIXMAN_URL $DOWNLOAD_DIR $TMP_DIR
assert_one_dir $TMP_UDIR /pixman-*
qpushd $TMP_UDIR /pixman-*
GLIB_CPPFLAGS = ` ${ PKG_CONFIG } --cflags glib-2.0`
GTK_CPPFLAGS = " -I ${ _GNOME_UDIR } /include/gtk-2.0 "
./configure ${ HOST_XCOMPILE } \
--prefix= $_GNOME_UDIR \
--disable-static \
CPPFLAGS = " ${ GLIB_CPPFLAGS } ${ GTK_CPPFLAGS } "
make
make install
qpopd
rm -rf $TMP_UDIR /pixman-*
fi
quiet ${ PKG_CONFIG } --exact-version= ${ PIXMAN_VERSION } pixman-1 || die "pixman not installed correctly"
if quiet ${ PKG_CONFIG } --exact-version= ${ LIBXML2_VERSION } libxml-2.0 ; then
echo "Libxml2 already compiled + installed"
else