[libgsf] compilation: drop support for bonobo

[Morten Welinder <mortenw src gnome org>]

commit bb188da63a8805575fa38a20db980b242d921792
Author: Morten Welinder <terra gnome org>
Date:   Wed Dec 7 14:26:43 2011 -0500

    compilation: drop support for bonobo
    
    At this point it is a bit silly to claim bonobo support.  It probably
    hasn't been used for a decade.

 configure.in                         |   36 +----
 gsf-gnome/Makefile.am                |   12 +--
 gsf-gnome/gsf-input-bonobo.c         |  294 ----------------------------------
 gsf-gnome/gsf-input-bonobo.h         |   41 -----
 gsf-gnome/gsf-output-bonobo.c        |  164 -------------------
 gsf-gnome/gsf-output-bonobo.h        |   41 -----
 gsf-gnome/gsf-shared-bonobo-stream.c |   72 --------
 gsf-gnome/gsf-shared-bonobo-stream.h |   47 ------
 libgsf-gnome-1.pc.in                 |    2 +-
 libgsf-gnome-1.spec.in               |    2 +-
 10 files changed, 4 insertions(+), 707 deletions(-)
---
diff --git a/configure.in b/configure.in
index 577d545..cda9653 100644
--- a/configure.in
+++ b/configure.in
@@ -430,39 +430,6 @@ if test $want_gnome_vfs = yes; then
 fi
 AC_SUBST(GNOMEVFS_REQ)
 
-want_bonobo=no
-dnl check for bonobo
-AC_ARG_WITH(bonobo,
-    AC_HELP_STRING([--without-bonobo],[disable the use of bonobo]),
-    [case "${withval}" in
-    yes) want_bonobo=yes ;;
-    no) want_bonobo=no ;;
-    *) AC_MSG_ERROR(bad value ${withval} for --with-bonobo) ;;
-    esac],
-    [want_bonobo=auto]) dnl Default value
-
-BONOBO_REQ="libbonobo-2.0 >= 2.0.0"
-have_bonobo=no
-if test $want_bonobo = no ; then 
-    AC_MSG_WARN([Bonobo support disabled, as requested (Use --with-bonobo to enable)])
-else
-    PKG_CHECK_MODULES(LIBGSF_BONOBO, $BONOBO_REQ,
-	[have_bonobo=yes],
-	[if test $want_bonobo = yes; then
-	    AC_MSG_ERROR([Bonobo support requested, but not available.])
-	 else
-	    AC_MSG_WARN([Bonobo support disabled, unable to find required version])
-	 fi])
-fi
-
-if test $have_bonobo = yes; then
-    libgsf_gnome_reqs="$libgsf_gnome_reqs $BONOBO_REQ"   
-    want_gnome=yes
-else
-    BONOBO_REQ=
-fi
-AC_SUBST(BONOBO_REQ)
-
 want_gdk_pixbuf=no
 dnl check for gdk_pixbuf
 AC_ARG_WITH(gdk_pixbuf,
@@ -488,7 +455,7 @@ fi
 
 have_gnome=no
 if test $want_gnome = no ; then 
-    AC_MSG_WARN([GNOME support disabled, as requested (Use --with-gnome-vfs and/or --with-bonobo to enable)])
+    AC_MSG_WARN([GNOME support disabled, as requested (Use --with-gnome-vfs to enable)])
 else
     PKG_CHECK_MODULES(LIBGSF_GNOME, $libgsf_gnome_reqs,
 	[have_gnome=yes],
@@ -496,7 +463,6 @@ else
 fi
 AM_CONDITIONAL(WITH_LIBGSF_GNOME, test $have_gnome = yes)
 AM_CONDITIONAL(WITH_LIBGSF_GNOMEVFS, test $want_gnome_vfs = yes)
-AM_CONDITIONAL(WITH_LIBGSF_BONOBO, test $have_bonobo = yes)
 
 # ===================
 # GConf configuration
diff --git a/gsf-gnome/Makefile.am b/gsf-gnome/Makefile.am
index 778948c..9fcf73b 100644
--- a/gsf-gnome/Makefile.am
+++ b/gsf-gnome/Makefile.am
@@ -16,20 +16,10 @@ libgsf_gnome_1_la_SOURCES +=	\
 	gsf-output-gnomevfs.c
 endif
 
-if WITH_LIBGSF_BONOBO
-libgsf_gnome_1_la_SOURCES +=	\
-	gsf-input-bonobo.c	\
-	gsf-output-bonobo.c	\
-	gsf-shared-bonobo-stream.c
-endif
-
 endif
 
 ## But headers are installed always:
 libgsf_gnome_1_includedir = $(includedir)/libgsf-1/gsf-gnome
 libgsf_gnome_1_include_HEADERS =  \
 	gsf-input-gnomevfs.h	\
-	gsf-output-gnomevfs.h	\
-	gsf-input-bonobo.h 	\
-	gsf-output-bonobo.h	\
-	gsf-shared-bonobo-stream.h
+	gsf-output-gnomevfs.h
diff --git a/libgsf-gnome-1.pc.in b/libgsf-gnome-1.pc.in
index 91efeb1..2b92aad 100644
--- a/libgsf-gnome-1.pc.in
+++ b/libgsf-gnome-1.pc.in
@@ -6,6 +6,6 @@ includedir= includedir@
 Name: libgsf-gnome-1
 Description: GNOME specific extensions to libgsf
 Version: @VERSION@
-Requires: libgsf-1 @BONOBO_REQ@ @GNOMEVFS_REQ@
+Requires: libgsf-1 @GNOMEVFS_REQ@
 Libs: -L${libdir} -lgsf-gnome-1
 Cflags:
diff --git a/libgsf-gnome-1.spec.in b/libgsf-gnome-1.spec.in
index b7813ed..2eaafd0 100644
--- a/libgsf-gnome-1.spec.in
+++ b/libgsf-gnome-1.spec.in
@@ -18,7 +18,7 @@ URL: http://www.gnumeric.org
 Requires: libgsf-1 >= 1.3.0 gnome-vfs >= 2.0.0
 
 %description
-GNOME specific extensions to support bonobo and gnome-vfs
+GNOME specific extensions to support gnome-vfs
 
 %package devel
 Summary: Support files necessary to compile applications with libgsf-gnome.