anjuta r4413 - in trunk: . plugins/devhelp

[naba svn gnome org]

Author: naba
Date: Sun Nov 30 12:53:07 2008
New Revision: 4413
URL: http://svn.gnome.org/viewvc/anjuta?rev=4413&view=rev

Log:
	* configure.in,
	* plugins/devhelp/plugin.c (devhelp_dispose): Fixed devhelp version
	check in configure and fixed devhelp plugin build for non-embedded
	mode.



Modified:
   trunk/ChangeLog
   trunk/configure.in
   trunk/plugins/devhelp/plugin.c

Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in	(original)
+++ trunk/configure.in	Sun Nov 30 12:53:07 2008
@@ -195,32 +195,14 @@
 	devhelp_enabled="no"
 else
 	AC_MSG_RESULT(no)
-	devhelp_old=yes
 	PKG_CHECK_MODULES(PLUGIN_DEVHELP, 
 				[libdevhelp-1.0 >= $LIBDEVHELP_REQUIRED webkit-1.0],
-					 [
-					    devhelp_old=no
-						devhelp_enabled=yes
-					 ], [
-						   AC_MSG_RESULT([version >= 0.11 not found])
-						   devhelp_old=yes
-						   devhelp_enabled=no
-					 ])
-	if test x$devhelp_old = xyes; then
-	  PKG_CHECK_MODULES(PLUGIN_DEVHELP, [libdevhelp-1.0 >= 0.9], [devhelp_enabled=yes], [devhelp_enabled=no])
-		if test x$devhelp_enabled = xyes; then
-	      AC_DEFINE(HAVE_OLD_DEVHELP, 1, [If old devhelp (>= 0.9 < 0.11) is installed])
-		fi
-	fi
-fi
-
-if test x$devhelp_enabled = xyes; then
-	GECKO_HOME=`$PKGCONFIG_CONFIG --variable=gecko_home libdevhelp-1.0`
-	if test x$GECKO_HOME != x; then
-		ANJUTA_LDFLAGS="$ANJUTA_LDFLAGS -R$GECKO_HOME"
-	fi
+				[
+				    devhelp_enabled=yes
+				], [
+				    devhelp_enabled=no
+				])
 fi
-AC_SUBST(ANJUTA_LDFLAGS)
 
 AM_CONDITIONAL(HAVE_PLUGIN_DEVHELP, [test x$devhelp_enabled = xyes])
 
@@ -1092,7 +1074,7 @@
        echo "Building devhelp plugin: ...............................YES"
 else
        echo "Building devhelp plugin: ...............................NO"
-       echo "        Requires devhelp"
+       echo "        Requires devhelp >= 0.22"
 fi
 
 if [ test x$libgraphviz_found = xyes ]; then

Modified: trunk/plugins/devhelp/plugin.c
==============================================================================
--- trunk/plugins/devhelp/plugin.c	(original)
+++ trunk/plugins/devhelp/plugin.c	Sun Nov 30 12:53:07 2008
@@ -454,15 +454,17 @@
 static void
 devhelp_dispose (GObject *obj)
 {
-	AnjutaDevhelp* devhelp = ANJUTA_PLUGIN_DEVHELP (obj);
-	
 	DEBUG_PRINT ("%s", "Disposing Devhelp plugin");
 	
+#ifndef DISABLE_EMBEDDED_DEVHELP
+	AnjutaDevhelp* devhelp = ANJUTA_PLUGIN_DEVHELP (obj);
+	
 	if (devhelp->base)
 	{
 		g_object_unref(G_OBJECT(devhelp->base));
 		devhelp->base = NULL;
 	}
+#endif /* DISABLE_EMBEDDED_DEVHELP */
 
 	/* Disposition codes */
 	G_OBJECT_CLASS (parent_class)->dispose (obj);