diff options
author | wiz <wiz> | 2005-07-23 21:50:06 +0000 |
---|---|---|
committer | wiz <wiz> | 2005-07-23 21:50:06 +0000 |
commit | 25739255d0cf9b80d4b20f7439f6f0a202eff548 (patch) | |
tree | c36fb65a7e9f4d603919a4b626dd5797c8e8d69a /devel | |
parent | 24729060366295590ae5dfe24d7e66a330a581f0 (diff) | |
download | pkgsrc-25739255d0cf9b80d4b20f7439f6f0a202eff548.tar.gz |
Remove devel/bonobo-conf -- its last dependency (evolution12) was removed.
Diffstat (limited to 'devel')
-rw-r--r-- | devel/bonobo-conf/DESCR | 13 | ||||
-rw-r--r-- | devel/bonobo-conf/Makefile | 33 | ||||
-rw-r--r-- | devel/bonobo-conf/PLIST | 39 | ||||
-rw-r--r-- | devel/bonobo-conf/buildlink3.mk | 25 | ||||
-rw-r--r-- | devel/bonobo-conf/distinfo | 8 | ||||
-rw-r--r-- | devel/bonobo-conf/patches/patch-aa | 23 | ||||
-rw-r--r-- | devel/bonobo-conf/patches/patch-ab | 175 | ||||
-rw-r--r-- | devel/bonobo-conf/patches/patch-ac | 280 |
8 files changed, 0 insertions, 596 deletions
diff --git a/devel/bonobo-conf/DESCR b/devel/bonobo-conf/DESCR deleted file mode 100644 index b290483281a..00000000000 --- a/devel/bonobo-conf/DESCR +++ /dev/null @@ -1,13 +0,0 @@ - The Bonobo Configuration System (BCS) consists of several parts. An -API to access configuration data, a database to store configuration values -in XML format and a system to visualise and edit configuration data. The -whole system is built on top of bonobo and ORBit (CORBA). - - There are several APIs to access the configuration data, and the API can -be chosen through the bonobo moniker system. It is up to the programmer -to decide which interface is best for a given application. The -configuration system allows you to store the data with various backends. -Although BCS is shipped with its own XML based backend, it is also -possible to use GConf, or LDAP as backend. The configuration database -architecture is a reimplementation of the GConf architecture developed by -Havoc Pennington using Bonobo-native idioms. diff --git a/devel/bonobo-conf/Makefile b/devel/bonobo-conf/Makefile deleted file mode 100644 index ccd6652f38b..00000000000 --- a/devel/bonobo-conf/Makefile +++ /dev/null @@ -1,33 +0,0 @@ -# $NetBSD: Makefile,v 1.26 2005/05/22 20:07:49 jlam Exp $ - -DISTNAME= bonobo-conf-0.14 -PKGREVISION= 11 -CATEGORIES= devel gnome -MASTER_SITES= ${MASTER_SITE_GNOME:=sources/bonobo-conf/0.14/} - -MAINTAINER= tech-pkg@NetBSD.org -HOMEPAGE= http://www.gnome.org/ -COMMENT= Bonobo configuration system - -BUILD_USES_MSGFMT= YES - -USE_PKGLOCALEDIR= YES -USE_LIBTOOL= YES -USE_X11BASE= YES -USE_TOOLS+= gmake -GNU_CONFIGURE= YES - -post-install: - ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/bonobo-conf -.for doc in bonobo-conf.pdf bonobo-conf.sgml - ${INSTALL_DATA} ${WRKSRC}/doc/${doc} ${PREFIX}/share/doc/bonobo-conf -.endfor - -.include "../../devel/gettext-lib/buildlink3.mk" -.include "../../devel/bonobo/buildlink3.mk" -.include "../../devel/GConf/buildlink3.mk" -.include "../../devel/popt/buildlink3.mk" -.include "../../devel/oaf/buildlink3.mk" -.include "../../graphics/gdk-pixbuf/buildlink3.mk" - -.include "../../mk/bsd.pkg.mk" diff --git a/devel/bonobo-conf/PLIST b/devel/bonobo-conf/PLIST deleted file mode 100644 index 6f8e909faea..00000000000 --- a/devel/bonobo-conf/PLIST +++ /dev/null @@ -1,39 +0,0 @@ -@comment $NetBSD: PLIST,v 1.7 2004/09/22 08:09:24 jlam Exp $ -bin/bonobo-moniker-xmldb -bin/cedit -include/bonobo-conf/Bonobo_Config.h -include/bonobo-conf/bonobo-config-control.h -include/bonobo-conf/bonobo-config-database.h -include/bonobo-conf/bonobo-config-subdir.h -include/bonobo-conf/bonobo-config-utils.h -include/bonobo-conf/bonobo-preferences.h -include/bonobo-conf/bonobo-property-bag-proxy.h -include/bonobo-conf/bonobo-property-editor.h -include/bonobo-conf/bonobo-property-frame.h -lib/bonobo/monikers/libmoniker_config.la -lib/bonobo/monikers/libmoniker_gconf.la -lib/bonobo_confConf.sh -lib/libbonobo_conf.la -share/doc/bonobo-conf/bonobo-conf.pdf -share/doc/bonobo-conf/bonobo-conf.sgml -share/idl/Bonobo_Config.idl -${PKGLOCALEDIR}/locale/da/LC_MESSAGES/bonobo-conf.mo -${PKGLOCALEDIR}/locale/de/LC_MESSAGES/bonobo-conf.mo -${PKGLOCALEDIR}/locale/es/LC_MESSAGES/bonobo-conf.mo -${PKGLOCALEDIR}/locale/fr/LC_MESSAGES/bonobo-conf.mo -${PKGLOCALEDIR}/locale/it/LC_MESSAGES/bonobo-conf.mo -${PKGLOCALEDIR}/locale/nn/LC_MESSAGES/bonobo-conf.mo -${PKGLOCALEDIR}/locale/no/LC_MESSAGES/bonobo-conf.mo -${PKGLOCALEDIR}/locale/pl/LC_MESSAGES/bonobo-conf.mo -${PKGLOCALEDIR}/locale/sv/LC_MESSAGES/bonobo-conf.mo -${PKGLOCALEDIR}/locale/tr/LC_MESSAGES/bonobo-conf.mo -${PKGLOCALEDIR}/locale/zh_TW/LC_MESSAGES/bonobo-conf.mo -share/oaf/Bonobo_Moniker_config.oaf -share/oaf/Bonobo_Moniker_gconf.oaf -share/oaf/Bonobo_Moniker_xmldb.oaf -@dirrm share/doc/bonobo-conf -@exec ${MKDIR} %D/share/bonobo-conf/html/bonobo-conf -@dirrm share/bonobo-conf/html/bonobo-conf -@dirrm share/bonobo-conf/html -@dirrm share/bonobo-conf -@dirrm include/bonobo-conf diff --git a/devel/bonobo-conf/buildlink3.mk b/devel/bonobo-conf/buildlink3.mk deleted file mode 100644 index 4afa36670a3..00000000000 --- a/devel/bonobo-conf/buildlink3.mk +++ /dev/null @@ -1,25 +0,0 @@ -# $NetBSD: buildlink3.mk,v 1.4 2004/12/28 23:18:15 reed Exp $ - -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -BONOBO_CONF_BUILDLINK3_MK:= ${BONOBO_CONF_BUILDLINK3_MK}+ - -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= bonobo-conf -.endif - -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nbonobo-conf} -BUILDLINK_PACKAGES+= bonobo-conf - -.if !empty(BONOBO_CONF_BUILDLINK3_MK:M+) -BUILDLINK_DEPENDS.bonobo-conf+= bonobo-conf>=0.14nb10 -BUILDLINK_RECOMMENDED.bonobo-conf+= bonobo-conf>=0.14nb11 -BUILDLINK_PKGSRCDIR.bonobo-conf?= ../../devel/bonobo-conf -.endif # BONOBO_CONF_BUILDLINK3_MK - -.include "../../devel/gettext-lib/buildlink3.mk" -.include "../../devel/bonobo/buildlink3.mk" -.include "../../devel/GConf/buildlink3.mk" -.include "../../devel/popt/buildlink3.mk" -.include "../../devel/oaf/buildlink3.mk" - -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} diff --git a/devel/bonobo-conf/distinfo b/devel/bonobo-conf/distinfo deleted file mode 100644 index a9df8cbe5af..00000000000 --- a/devel/bonobo-conf/distinfo +++ /dev/null @@ -1,8 +0,0 @@ -$NetBSD: distinfo,v 1.8 2005/02/23 22:24:10 agc Exp $ - -SHA1 (bonobo-conf-0.14.tar.gz) = 9e33ec9eb7553cca90e4e1f9e018e2a7f2740d7a -RMD160 (bonobo-conf-0.14.tar.gz) = 6516fad7e95b41908c9ae4847347d7b7f2c1d1ac -Size (bonobo-conf-0.14.tar.gz) = 438259 bytes -SHA1 (patch-aa) = fa5da87fed8b39b0969ea82695fae5bba1420ed9 -SHA1 (patch-ab) = e95a62dfeb787187275cc5e75bf7316bb1745704 -SHA1 (patch-ac) = 82d91fd7e7edc6fe90d5c7e2edb871b8c0f59ee0 diff --git a/devel/bonobo-conf/patches/patch-aa b/devel/bonobo-conf/patches/patch-aa deleted file mode 100644 index 722432f335a..00000000000 --- a/devel/bonobo-conf/patches/patch-aa +++ /dev/null @@ -1,23 +0,0 @@ -$NetBSD: patch-aa,v 1.2 2002/10/02 21:21:47 wiz Exp $ - ---- configure.in.orig Thu Nov 1 12:12:01 2001 -+++ configure.in Tue May 14 18:35:04 2002 -@@ -24,6 +24,7 @@ - AM_PATH_GLIB(1.2.0,,AC_MSG_ERROR(glib not found or too old),gmodule) - AM_PATH_OAF(0.6.2,,AC_MSG_ERROR([OAF not found or too old])) - AM_PATH_GTK(1.2.0,,AC_MSG_ERROR([gtk not found or too old])) -+AM_PATH_GDK_PIXBUF(0.17.0,,AC_MSG_ERROR([gdk-pixbuf not found or too old])) - - AC_ARG_WITH(html-dir, [ --with-html-dir=PATH path to installed docs ]) - if test "x$with_html_dir" = "x" ; then -@@ -65,8 +66,8 @@ - AC_MSG_ERROR([bonobo >= 1.0.14 not found]) - fi - --BONOBO_LIBS="`gnome-config --libs oaf bonobox gnome`" --BONOBO_CFLAGS="`gnome-config --cflags oaf bonobox gnome`" -+BONOBO_LIBS="`gnome-config --libs oaf bonobox gnome` $GDK_PIXBUF_LIBS" -+BONOBO_CFLAGS="`gnome-config --cflags oaf bonobox gnome` $GDK_PIXBUF_CFLAGS" - - BONOBO_CONF_LIBS="-lbonobo_conf $BONOBO_LIBS" - BONOBO_CONF_CFLAGS="$BONOBO_CFLAGS" diff --git a/devel/bonobo-conf/patches/patch-ab b/devel/bonobo-conf/patches/patch-ab deleted file mode 100644 index e3f885be941..00000000000 --- a/devel/bonobo-conf/patches/patch-ab +++ /dev/null @@ -1,175 +0,0 @@ -$NetBSD: patch-ab,v 1.2 2002/10/02 21:21:47 wiz Exp $ - ---- aclocal.m4.orig Tue May 14 18:26:28 2002 -+++ aclocal.m4 Tue May 14 18:27:19 2002 -@@ -4944,3 +4944,170 @@ - fi - fi]) - -+# Configure paths for gdk-pixbuf -+# Elliot Lee 2000-01-10 -+# stolen from Raph Levien 98-11-18 -+# stolen from Manish Singh 98-9-30 -+# stolen back from Frank Belew -+# stolen from Manish Singh -+# Shamelessly stolen from Owen Taylor -+ -+dnl AM_PATH_GDK_PIXBUF([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]]) -+dnl Test for GDK_PIXBUF, and define GDK_PIXBUF_CFLAGS and GDK_PIXBUF_LIBS -+dnl -+AC_DEFUN(AM_PATH_GDK_PIXBUF, -+[dnl -+dnl Get the cflags and libraries from the gdk-pixbuf-config script -+dnl -+AC_ARG_WITH(gdk-pixbuf-prefix,[ --with-gdk-pixbuf-prefix=PFX Prefix where GDK_PIXBUF is installed (optional)], -+ gdk_pixbuf_prefix="$withval", gdk_pixbuf_prefix="") -+AC_ARG_WITH(gdk-pixbuf-exec-prefix,[ --with-gdk-pixbuf-exec-prefix=PFX Exec prefix where GDK_PIXBUF is installed (optional)], -+ gdk_pixbuf_exec_prefix="$withval", gdk_pixbuf_exec_prefix="") -+AC_ARG_ENABLE(gdk_pixbuftest, [ --disable-gdk_pixbuftest Do not try to compile and run a test GDK_PIXBUF program], -+ , enable_gdk_pixbuftest=yes) -+ -+ if test x$gdk_pixbuf_exec_prefix != x ; then -+ gdk_pixbuf_args="$gdk_pixbuf_args --exec-prefix=$gdk_pixbuf_exec_prefix" -+ if test x${GDK_PIXBUF_CONFIG+set} = xset ; then -+ GDK_PIXBUF_CONFIG=$gdk_pixbuf_exec_prefix/gdk-pixbuf-config -+ fi -+ fi -+ if test x$gdk_pixbuf_prefix != x ; then -+ gdk_pixbuf_args="$gdk_pixbuf_args --prefix=$gdk_pixbuf_prefix" -+ if test x${GDK_PIXBUF_CONFIG+set} = xset ; then -+ GDK_PIXBUF_CONFIG=$gdk_pixbuf_prefix/bin/gdk-pixbuf-config -+ fi -+ fi -+ -+ AC_PATH_PROG(GDK_PIXBUF_CONFIG, gdk-pixbuf-config, no) -+ min_gdk_pixbuf_version=ifelse([$1], ,0.2.5,$1) -+ AC_MSG_CHECKING(for GDK_PIXBUF - version >= $min_gdk_pixbuf_version) -+ no_gdk_pixbuf="" -+ if test "$GDK_PIXBUF_CONFIG" = "no" ; then -+ no_gdk_pixbuf=yes -+ else -+ GDK_PIXBUF_CFLAGS=`$GDK_PIXBUF_CONFIG $gdk_pixbufconf_args --cflags` -+ GDK_PIXBUF_LIBS=`$GDK_PIXBUF_CONFIG $gdk_pixbufconf_args --libs` -+ -+ gdk_pixbuf_major_version=`$GDK_PIXBUF_CONFIG $gdk_pixbuf_args --version | \ -+ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'` -+ gdk_pixbuf_minor_version=`$GDK_PIXBUF_CONFIG $gdk_pixbuf_args --version | \ -+ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'` -+ gdk_pixbuf_micro_version=`$GDK_PIXBUF_CONFIG $gdk_pixbuf_config_args --version | \ -+ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'` -+ if test "x$enable_gdk_pixbuftest" = "xyes" ; then -+ ac_save_CFLAGS="$CFLAGS" -+ ac_save_LIBS="$LIBS" -+ CFLAGS="$CFLAGS $GDK_PIXBUF_CFLAGS" -+ LIBS="$LIBS $GDK_PIXBUF_LIBS" -+dnl -+dnl Now check if the installed GDK_PIXBUF is sufficiently new. (Also sanity -+dnl checks the results of gdk-pixbuf-config to some extent -+dnl -+ rm -f conf.gdk_pixbuftest -+ AC_TRY_RUN([ -+#include <stdio.h> -+#include <stdlib.h> -+#include <string.h> -+#include <gdk-pixbuf/gdk-pixbuf.h> -+ -+char* -+my_strdup (char *str) -+{ -+ char *new_str; -+ -+ if (str) -+ { -+ new_str = malloc ((strlen (str) + 1) * sizeof(char)); -+ strcpy (new_str, str); -+ } -+ else -+ new_str = NULL; -+ -+ return new_str; -+} -+ -+int main () -+{ -+ int major, minor, micro; -+ char *tmp_version; -+ -+ system ("touch conf.gdk_pixbuftest"); -+ -+ /* HP/UX 9 (%@#!) writes to sscanf strings */ -+ tmp_version = my_strdup("$min_gdk_pixbuf_version"); -+ if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, µ) != 3) { -+ printf("%s, bad version string\n", "$min_gdk_pixbuf_version"); -+ exit(1); -+ } -+ -+ if (($gdk_pixbuf_major_version > major) || -+ (($gdk_pixbuf_major_version == major) && ($gdk_pixbuf_minor_version > minor)) || -+ (($gdk_pixbuf_major_version == major) && ($gdk_pixbuf_minor_version == minor) && ($gdk_pixbuf_micro_version >= micro))) -+ { -+ return 0; -+ } -+ else -+ { -+ printf("\n*** 'gdk-pixbuf-config --version' returned %d.%d.%d, but the minimum version\n", $gdk_pixbuf_major_version, $gdk_pixbuf_minor_version, $gdk_pixbuf_micro_version); -+ printf("*** of GDK_PIXBUF required is %d.%d.%d. If gdk-pixbuf-config is correct, then it is\n", major, minor, micro); -+ printf("*** best to upgrade to the required version.\n"); -+ printf("*** If gdk-pixbuf-config was wrong, set the environment variable GDK_PIXBUF_CONFIG\n"); -+ printf("*** to point to the correct copy of gdk-pixbuf-config, and remove the file\n"); -+ printf("*** config.cache before re-running configure\n"); -+ return 1; -+ } -+} -+ -+],, no_gdk_pixbuf=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"]) -+ CFLAGS="$ac_save_CFLAGS" -+ LIBS="$ac_save_LIBS" -+ fi -+ fi -+ if test "x$no_gdk_pixbuf" = x ; then -+ AC_MSG_RESULT(yes) -+ ifelse([$2], , :, [$2]) -+ else -+ AC_MSG_RESULT(no) -+ if test "$GDK_PIXBUF_CONFIG" = "no" ; then -+ echo "*** The gdk-pixbuf-config script installed by GDK_PIXBUF could not be found" -+ echo "*** If GDK_PIXBUF was installed in PREFIX, make sure PREFIX/bin is in" -+ echo "*** your path, or set the GDK_PIXBUF_CONFIG environment variable to the" -+ echo "*** full path to gdk-pixbuf-config." -+ else -+ if test -f conf.gdk_pixbuftest ; then -+ : -+ else -+ echo "*** Could not run GDK_PIXBUF test program, checking why..." -+ CFLAGS="$CFLAGS $GDK_PIXBUF_CFLAGS" -+ LIBS="$LIBS $GDK_PIXBUF_LIBS" -+ AC_TRY_LINK([ -+#include <stdio.h> -+#include <gdk-pixbuf/gdk-pixbuf.h> -+], [ return 0; ], -+ [ echo "*** The test program compiled, but did not run. This usually means" -+ echo "*** that the run-time linker is not finding GDK_PIXBUF or finding the wrong" -+ echo "*** version of GDK_PIXBUF. If it is not finding GDK_PIXBUF, you'll need to set your" -+ echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point" -+ echo "*** to the installed location Also, make sure you have run ldconfig if that" -+ echo "*** is required on your system" -+ echo "***" -+ echo "*** If you have an old version installed, it is best to remove it, although" -+ echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH"], -+ [ echo "*** The test program failed to compile or link. See the file config.log for the" -+ echo "*** exact error that occured. This usually means GDK_PIXBUF was incorrectly installed" -+ echo "*** or that you have moved GDK_PIXBUF since it was installed. In the latter case, you" -+ echo "*** may want to edit the gdk-pixbuf-config script: $GDK_PIXBUF_CONFIG" ]) -+ CFLAGS="$ac_save_CFLAGS" -+ LIBS="$ac_save_LIBS" -+ fi -+ fi -+ GDK_PIXBUF_CFLAGS="" -+ GDK_PIXBUF_LIBS="" -+ ifelse([$3], , :, [$3]) -+ fi -+ AC_SUBST(GDK_PIXBUF_CFLAGS) -+ AC_SUBST(GDK_PIXBUF_LIBS) -+ rm -f conf.gdk_pixbuftest -+]) -+ diff --git a/devel/bonobo-conf/patches/patch-ac b/devel/bonobo-conf/patches/patch-ac deleted file mode 100644 index 069c5cfbfed..00000000000 --- a/devel/bonobo-conf/patches/patch-ac +++ /dev/null @@ -1,280 +0,0 @@ -$NetBSD: patch-ac,v 1.1 2002/10/02 23:46:08 wiz Exp $ - ---- configure.orig Thu Nov 1 12:25:50 2001 -+++ configure -@@ -209,6 +209,12 @@ ac_help="$ac_help - ac_help="$ac_help - --disable-gtktest Do not try to compile and run a test GTK program" - ac_help="$ac_help -+ --with-gdk-pixbuf-prefix=PFX Prefix where GDK_PIXBUF is installed (optional)" -+ac_help="$ac_help -+ --with-gdk-pixbuf-exec-prefix=PFX Exec prefix where GDK_PIXBUF is installed (optional)" -+ac_help="$ac_help -+ --disable-gdk_pixbuftest Do not try to compile and run a test GDK_PIXBUF program" -+ac_help="$ac_help - --with-html-dir=PATH path to installed docs " - ac_help="$ac_help - --with-libiconv-prefix=DIR search for libiconv in DIR/include and DIR/lib" -@@ -6534,6 +6540,241 @@ rm -f conftest* - - rm -f conf.gtktest - -+# Check whether --with-gdk-pixbuf-prefix or --without-gdk-pixbuf-prefix was given. -+if test "${with_gdk_pixbuf_prefix+set}" = set; then -+ withval="$with_gdk_pixbuf_prefix" -+ gdk_pixbuf_prefix="$withval" -+else -+ gdk_pixbuf_prefix="" -+fi -+ -+# Check whether --with-gdk-pixbuf-exec-prefix or --without-gdk-pixbuf-exec-prefix was given. -+if test "${with_gdk_pixbuf_exec_prefix+set}" = set; then -+ withval="$with_gdk_pixbuf_exec_prefix" -+ gdk_pixbuf_exec_prefix="$withval" -+else -+ gdk_pixbuf_exec_prefix="" -+fi -+ -+# Check whether --enable-gdk_pixbuftest or --disable-gdk_pixbuftest was given. -+if test "${enable_gdk_pixbuftest+set}" = set; then -+ enableval="$enable_gdk_pixbuftest" -+ : -+else -+ enable_gdk_pixbuftest=yes -+fi -+ -+ -+ if test x$gdk_pixbuf_exec_prefix != x ; then -+ gdk_pixbuf_args="$gdk_pixbuf_args --exec-prefix=$gdk_pixbuf_exec_prefix" -+ if test x${GDK_PIXBUF_CONFIG+set} = xset ; then -+ GDK_PIXBUF_CONFIG=$gdk_pixbuf_exec_prefix/gdk-pixbuf-config -+ fi -+ fi -+ if test x$gdk_pixbuf_prefix != x ; then -+ gdk_pixbuf_args="$gdk_pixbuf_args --prefix=$gdk_pixbuf_prefix" -+ if test x${GDK_PIXBUF_CONFIG+set} = xset ; then -+ GDK_PIXBUF_CONFIG=$gdk_pixbuf_prefix/bin/gdk-pixbuf-config -+ fi -+ fi -+ -+ # Extract the first word of "gdk-pixbuf-config", so it can be a program name with args. -+set dummy gdk-pixbuf-config; ac_word=$2 -+echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -+echo "configure:6585: checking for $ac_word" >&5 -+if eval "test \"`echo '$''{'ac_cv_path_GDK_PIXBUF_CONFIG'+set}'`\" = set"; then -+ echo $ac_n "(cached) $ac_c" 1>&6 -+else -+ case "$GDK_PIXBUF_CONFIG" in -+ /*) -+ ac_cv_path_GDK_PIXBUF_CONFIG="$GDK_PIXBUF_CONFIG" # Let the user override the test with a path. -+ ;; -+ ?:/*) -+ ac_cv_path_GDK_PIXBUF_CONFIG="$GDK_PIXBUF_CONFIG" # Let the user override the test with a dos path. -+ ;; -+ *) -+ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" -+ ac_dummy="$PATH" -+ for ac_dir in $ac_dummy; do -+ test -z "$ac_dir" && ac_dir=. -+ if test -f $ac_dir/$ac_word; then -+ ac_cv_path_GDK_PIXBUF_CONFIG="$ac_dir/$ac_word" -+ break -+ fi -+ done -+ IFS="$ac_save_ifs" -+ test -z "$ac_cv_path_GDK_PIXBUF_CONFIG" && ac_cv_path_GDK_PIXBUF_CONFIG="no" -+ ;; -+esac -+fi -+GDK_PIXBUF_CONFIG="$ac_cv_path_GDK_PIXBUF_CONFIG" -+if test -n "$GDK_PIXBUF_CONFIG"; then -+ echo "$ac_t""$GDK_PIXBUF_CONFIG" 1>&6 -+else -+ echo "$ac_t""no" 1>&6 -+fi -+ -+ min_gdk_pixbuf_version=0.17.0 -+ echo $ac_n "checking for GDK_PIXBUF - version >= $min_gdk_pixbuf_version""... $ac_c" 1>&6 -+echo "configure:6620: checking for GDK_PIXBUF - version >= $min_gdk_pixbuf_version" >&5 -+ no_gdk_pixbuf="" -+ if test "$GDK_PIXBUF_CONFIG" = "no" ; then -+ no_gdk_pixbuf=yes -+ else -+ GDK_PIXBUF_CFLAGS=`$GDK_PIXBUF_CONFIG $gdk_pixbufconf_args --cflags` -+ GDK_PIXBUF_LIBS=`$GDK_PIXBUF_CONFIG $gdk_pixbufconf_args --libs` -+ -+ gdk_pixbuf_major_version=`$GDK_PIXBUF_CONFIG $gdk_pixbuf_args --version | \ -+ sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\1/'` -+ gdk_pixbuf_minor_version=`$GDK_PIXBUF_CONFIG $gdk_pixbuf_args --version | \ -+ sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\2/'` -+ gdk_pixbuf_micro_version=`$GDK_PIXBUF_CONFIG $gdk_pixbuf_config_args --version | \ -+ sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\3/'` -+ if test "x$enable_gdk_pixbuftest" = "xyes" ; then -+ ac_save_CFLAGS="$CFLAGS" -+ ac_save_LIBS="$LIBS" -+ CFLAGS="$CFLAGS $GDK_PIXBUF_CFLAGS" -+ LIBS="$LIBS $GDK_PIXBUF_LIBS" -+ rm -f conf.gdk_pixbuftest -+ if test "$cross_compiling" = yes; then -+ echo $ac_n "cross compiling; assumed OK... $ac_c" -+else -+ cat > conftest.$ac_ext <<EOF -+#line 6644 "configure" -+#include "confdefs.h" -+ -+#include <stdio.h> -+#include <stdlib.h> -+#include <string.h> -+#include <gdk-pixbuf/gdk-pixbuf.h> -+ -+char* -+my_strdup (char *str) -+{ -+ char *new_str; -+ -+ if (str) -+ { -+ new_str = malloc ((strlen (str) + 1) * sizeof(char)); -+ strcpy (new_str, str); -+ } -+ else -+ new_str = NULL; -+ -+ return new_str; -+} -+ -+int main () -+{ -+ int major, minor, micro; -+ char *tmp_version; -+ -+ system ("touch conf.gdk_pixbuftest"); -+ -+ /* HP/UX 9 (%@#!) writes to sscanf strings */ -+ tmp_version = my_strdup("$min_gdk_pixbuf_version"); -+ if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, µ) != 3) { -+ printf("%s, bad version string\n", "$min_gdk_pixbuf_version"); -+ exit(1); -+ } -+ -+ if (($gdk_pixbuf_major_version > major) || -+ (($gdk_pixbuf_major_version == major) && ($gdk_pixbuf_minor_version > minor)) || -+ (($gdk_pixbuf_major_version == major) && ($gdk_pixbuf_minor_version == minor) && ($gdk_pixbuf_micro_version >= micro))) -+ { -+ return 0; -+ } -+ else -+ { -+ printf("\n*** 'gdk-pixbuf-config --version' returned %d.%d.%d, but the minimum version\n", $gdk_pixbuf_major_version, $gdk_pixbuf_minor_version, $gdk_pixbuf_micro_version); -+ printf("*** of GDK_PIXBUF required is %d.%d.%d. If gdk-pixbuf-config is correct, then it is\n", major, minor, micro); -+ printf("*** best to upgrade to the required version.\n"); -+ printf("*** If gdk-pixbuf-config was wrong, set the environment variable GDK_PIXBUF_CONFIG\n"); -+ printf("*** to point to the correct copy of gdk-pixbuf-config, and remove the file\n"); -+ printf("*** config.cache before re-running configure\n"); -+ return 1; -+ } -+} -+ -+ -+EOF -+if { (eval echo configure:6702: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+then -+ : -+else -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ rm -fr conftest* -+ no_gdk_pixbuf=yes -+fi -+rm -fr conftest* -+fi -+ -+ CFLAGS="$ac_save_CFLAGS" -+ LIBS="$ac_save_LIBS" -+ fi -+ fi -+ if test "x$no_gdk_pixbuf" = x ; then -+ echo "$ac_t""yes" 1>&6 -+ : -+ else -+ echo "$ac_t""no" 1>&6 -+ if test "$GDK_PIXBUF_CONFIG" = "no" ; then -+ echo "*** The gdk-pixbuf-config script installed by GDK_PIXBUF could not be found" -+ echo "*** If GDK_PIXBUF was installed in PREFIX, make sure PREFIX/bin is in" -+ echo "*** your path, or set the GDK_PIXBUF_CONFIG environment variable to the" -+ echo "*** full path to gdk-pixbuf-config." -+ else -+ if test -f conf.gdk_pixbuftest ; then -+ : -+ else -+ echo "*** Could not run GDK_PIXBUF test program, checking why..." -+ CFLAGS="$CFLAGS $GDK_PIXBUF_CFLAGS" -+ LIBS="$LIBS $GDK_PIXBUF_LIBS" -+ cat > conftest.$ac_ext <<EOF -+#line 6736 "configure" -+#include "confdefs.h" -+ -+#include <stdio.h> -+#include <gdk-pixbuf/gdk-pixbuf.h> -+ -+int main() { -+ return 0; -+; return 0; } -+EOF -+if { (eval echo configure:6746: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+ rm -rf conftest* -+ echo "*** The test program compiled, but did not run. This usually means" -+ echo "*** that the run-time linker is not finding GDK_PIXBUF or finding the wrong" -+ echo "*** version of GDK_PIXBUF. If it is not finding GDK_PIXBUF, you'll need to set your" -+ echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point" -+ echo "*** to the installed location Also, make sure you have run ldconfig if that" -+ echo "*** is required on your system" -+ echo "***" -+ echo "*** If you have an old version installed, it is best to remove it, although" -+ echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH" -+else -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ rm -rf conftest* -+ echo "*** The test program failed to compile or link. See the file config.log for the" -+ echo "*** exact error that occured. This usually means GDK_PIXBUF was incorrectly installed" -+ echo "*** or that you have moved GDK_PIXBUF since it was installed. In the latter case, you" -+ echo "*** may want to edit the gdk-pixbuf-config script: $GDK_PIXBUF_CONFIG" -+fi -+rm -f conftest* -+ CFLAGS="$ac_save_CFLAGS" -+ LIBS="$ac_save_LIBS" -+ fi -+ fi -+ GDK_PIXBUF_CFLAGS="" -+ GDK_PIXBUF_LIBS="" -+ { echo "configure: error: gdk-pixbuf not found or too old" 1>&2; exit 1; } -+ fi -+ -+ -+ rm -f conf.gdk_pixbuftest -+ - - # Check whether --with-html-dir or --without-html-dir was given. - if test "${with_html_dir+set}" = set; then -@@ -6588,8 +6829,8 @@ else - { echo "configure: error: bonobo >= 1.0.14 not found" 1>&2; exit 1; } - fi - --BONOBO_LIBS="`gnome-config --libs oaf bonobox gnome`" --BONOBO_CFLAGS="`gnome-config --cflags oaf bonobox gnome`" -+BONOBO_LIBS="`gnome-config --libs oaf bonobox gnome` $GDK_PIXBUF_LIBS" -+BONOBO_CFLAGS="`gnome-config --cflags oaf bonobox gnome` $GDK_PIXBUF_CFLAGS" - - BONOBO_CONF_LIBS="-lbonobo_conf $BONOBO_LIBS" - BONOBO_CONF_CFLAGS="$BONOBO_CFLAGS" -@@ -9222,6 +9463,9 @@ s%@OAF_LIBS@%$OAF_LIBS%g - s%@GTK_CONFIG@%$GTK_CONFIG%g - s%@GTK_CFLAGS@%$GTK_CFLAGS%g - s%@GTK_LIBS@%$GTK_LIBS%g -+s%@GDK_PIXBUF_CONFIG@%$GDK_PIXBUF_CONFIG%g -+s%@GDK_PIXBUF_CFLAGS@%$GDK_PIXBUF_CFLAGS%g -+s%@GDK_PIXBUF_LIBS@%$GDK_PIXBUF_LIBS%g - s%@HTML_DIR@%$HTML_DIR%g - s%@GCONF_LIBS@%$GCONF_LIBS%g - s%@GCONF_CFLAGS@%$GCONF_CFLAGS%g |