gnumeric r17147 - trunk

[mortenw svn gnome org]

Author: mortenw
Date: Thu Feb 19 15:21:37 2009
New Revision: 17147
URL: http://svn.gnome.org/viewvc/gnumeric?rev=17147&view=rev

Log:
2009-02-19  Morten Welinder  <terra gnome org>

	* configure.in (with_corba): Disable.  Fixes #572356.



Modified:
   trunk/ChangeLog
   trunk/NEWS
   trunk/configure.in

Modified: trunk/NEWS
==============================================================================
--- trunk/NEWS	(original)
+++ trunk/NEWS	Thu Feb 19 15:21:37 2009
@@ -108,6 +108,7 @@
 	* Warn when we drop csv rows.  [#571603]
 	* Fix SERIESSUM.
 	* Fix xls export of SERIESSUM.  [#572127]
+	* Disable non-functional corba plugin.  [#572356]
 
 --------------------------------------------------------------------------
 Gnumeric 1.9.3

Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in	(original)
+++ trunk/configure.in	Thu Feb 19 15:21:37 2009
@@ -332,19 +332,8 @@
 	dnl *************
 	dnl Corba support
 	dnl *************
-	PKG_CHECK_MODULES(CORBA_LIBS,
-		[ORBit-2.0 >= 2.4.2
-		libbonobo-2.0 >= 2.0.0
-		bonobo-activation-2.0 >= 1.0.2],
-		[with_corba=true],
-		[with_corba=false])
-	if test "x$with_corba" = xtrue ; then
-		ORBIT="`$PKG_CONFIG --variable=orbit_idl ORBit-2.0`"
-		BONOBO_IDL_DIR="`$PKG_CONFIG --variable=idldir libbonobo-2.0`"
-		BONOBO_ACTIVATION_IDL_DIR="`$PKG_CONFIG --variable=idldir bonobo-activation-2.0`"
-		ORBIT_IDL="${ORBIT} -I${BONOBO_IDL_DIR} -I${BONOBO_ACTIVATION_IDL_DIR}"
-		AC_SUBST(ORBIT_IDL)
-	fi
+
+	dnl disabled -- hasn't worked for years.
 fi
 AM_CONDITIONAL(WITH_CORBA, $with_corba)