--- configure.in.old	2005-05-15 06:07:35.000000000 +0000
+++ configure.in	2005-05-20 12:13:35.000000000 +0000
@@ -17,8 +17,8 @@
 GNOME_PRINT_UI_REQUIRED=2.4.0
 GNOME_VFS_REQUIRED=2.6.0
 GCONF_REQUIRED=2.6.0
-BONOBO_REQUIRED=2.6.0
-BONOBO_UI_REQUIRED=2.6.0
+dnl BONOBO_REQUIRED=2.6.0
+dnl BONOBO_UI_REQUIRED=2.6.0
 VTE_REQUIRED=0.7.0
 VTE_NEW_REQUIRED=0.9.0
 LIBXML_REQUIRED=2.4.23
@@ -44,8 +44,8 @@
 AC_SUBST(GNOME_PRINT_UI_REQUIRED)
 AC_SUBST(GNOME_VFS_REQUIRED)
 AC_SUBST(GCONF_REQUIRED)
-AC_SUBST(BONOBO_REQUIRED)
-AC_SUBST(BONOBO_UI_REQUIRED)
+dnl AC_SUBST(BONOBO_REQUIRED)
+dnl AC_SUBST(BONOBO_UI_REQUIRED)
 AC_SUBST(VTE_REQUIRED)
 AC_SUBST(LIBXML_REQUIRED)
 AC_SUBST(PANGO_REQUIRED)
@@ -65,6 +65,7 @@
 CFLAGS_DISABLE_CHECKS="-DG_DISABLE_CHECKS -DG_DISABLE_CAST_CHECKS"
 CFLAGS_OPTIMIZE="-Os -s"
 CXXFLAGS_OPTIMIZE="-Os -s -fno-exceptions -fno-check-new"
+
 if test "x$GCC" = xyes; then
     CFLAGS_WARNINGS=""
     CFLAGS_OPTIMIZE=""
@@ -99,11 +100,30 @@
       CFLAGS="$CFLAGS -DNDEBUG ${CFLAGS_OPTIMIZE} ${CFLAGS_DISABLE_CHECKS}"
       CXXFLAGS="$CXXFLAGS -DNDEBUG ${CXXFLAGS_OPTIMIZE} ${CFLAGS_DISABLE_CHECKS}")
 
+dnl Enable Glade UI Plugin
+AC_ARG_ENABLE(glade-ui,
+	  [  --with-glade-plugin		Build the Glade Plugin],
+	  [ enable_glade_plugin=$enableval ],
+	  [ enable_glade_plugin="no" ])
+
+dnl Enable the Class Inheritance through Graphviz
+AC_ARG_ENABLE(class-inheritance,
+	  [  --enable-class-inheritance	Build support for the class inheritance plugin],
+	  [ enable_class_inheritance=$enableval ],
+	  [ enable_class_inheritance="no" ])
+
+dnl Enable the subversion plugin
+AC_ARG_ENABLE(subversion,
+	  [  --enable-subversion		Build support for the subversion plugin],
+	  [ enable_subversion=$enableval ],
+	  [ enable_subversion="no" ])
+
 dnl Enable versioned user preferences directory
 AC_ARG_WITH(pref-suffix,
       [  --with-pref-suffix=VALUE       	Suffix to add to user preferences dir.],
       PREF_SUFFIX="$withval")
 
+
 AC_SUBST(PREF_SUFFIX)
 AC_DEFINE_UNQUOTED(PREF_SUFFIX,
       "${PREF_SUFFIX}",
@@ -222,7 +242,8 @@
 
 dnl Check for autogen
 dnl -----------------
-AC_PATH_PROG(AUTOGEN_PATH, autogen,no)
+AC_PATH_PROG(AUTOGEN_PATH, autogen, no)
+
 if test x$AUTOGEN_PATH = xno; then
    AC_MSG_ERROR([Couldn't find autogen, please install the autogen package. You can get it from http://autogen.sourceforge.net/])
 fi
@@ -247,7 +268,13 @@
 
 dnl Check for Glade3
 dnl ---------------------
-PKG_CHECK_MODULES(PLUGIN_GLADE, [libgladeui-1.0 >= $LIBGLADEUI_REQUIRED], [libgladeui_found="yes"], [libgladeui_found="no"])
+
+if test x$enable_glade_plugin = xyes ; then
+	PKG_CHECK_MODULES(PLUGIN_GLADE, [libgladeui-1.0 >= $LIBGLADEUI_REQUIRED], [libgladeui_found="yes"], [libgladeui_found="no"])
+else
+	libgladeui_found="no"
+fi
+
 AM_CONDITIONAL(HAVE_PLUGIN_GLADE, [test x$libgladeui_found = xyes])
 AC_SUBST(PLUGIN_GLADE_CFLAGS)
 AC_SUBST(PLUGIN_GLADE_LIBS)
@@ -261,8 +288,14 @@
 dnl /usr/local/lib/pkgconfig paths. If graphviz is installed in other prefix
 dnl (other than /usr or /usr/local), following pkgconfig check will fail.
 dnl ----------------------------------------------
-PKG_CONFIG_PATH="/usr/local/lib/graphviz/pkgconfig:/usr/lib/graphviz/pkgconfig:$PKG_CONFIG_PATH"
-PKG_CHECK_MODULES(PLUGIN_CLASS_INHERITANCE, [libdotneato >= $LIBGRAPHVIZ_REQUIRED libdotgen >= $LIBGRAPHVIZ_REQUIRED], [libgraphviz_found="yes"], [libgraphviz_found="no"])
+
+if test x$enable_class_inheritance = xyes ; then
+   PKG_CONFIG_PATH="/usr/local/lib/graphviz/pkgconfig:/usr/lib/graphviz/pkgconfig:$PKG_CONFIG_PATH"
+   PKG_CHECK_MODULES(PLUGIN_CLASS_INHERITANCE, [libdotneato >= $LIBGRAPHVIZ_REQUIRED libdotgen >= $LIBGRAPHVIZ_REQUIRED], [libgraphviz_found="yes"], [libgraphviz_found="no"])
+else
+   libgraphviz_found="no"
+fi
+
 AM_CONDITIONAL(HAVE_PLUGIN_CLASS_INHERITANCE, [test x$libgraphviz_found = xyes])
 AC_SUBST(PLUGIN_CLASS_INHERITANCE_CFLAGS)
 AC_SUBST(PLUGIN_CLASS_INHERITANCE_LIBS)
@@ -334,6 +367,7 @@
   AC_MSG_RESULT(no)
   GTKDOC=false
 fi
+
 dnl Let people disable the gtk-doc stuff.
 AC_ARG_ENABLE(gtk-doc, [  --enable-gtk-doc  Use gtk-doc to build documentation [default=auto]], enable_gtk_doc="$enableval", enable_gtk_doc=auto)
 if test x$enable_gtk_doc = xauto ; then
@@ -597,169 +631,173 @@
 dnl  (stolen from kdevelop ;-)
 dnl  **********************************************************
 
-AC_MSG_CHECKING(for svn libraries)
+if test x$enable_subversion = xno ; then
+	SVN_INCLUDE=""
+else
+	AC_MSG_CHECKING(for svn libraries)
 
-APR_CONFIGS="apr-config /usr/local/apr/bin/apr-config"
-SVN_SUBDIR="svn"
-AC_ARG_WITH(apr-config,
-[[  --with-apr-config=FILE    Use the given path to apr-config when determining
-							APR configuration; defaults to "apr-config"]],
-[
-if test "$withval" != "yes" -a "$withval" != ""; then
-APR_CONFIGS=$withval
+	APR_CONFIGS="apr-config /usr/local/apr/bin/apr-config"
+	SVN_SUBDIR="svn"
+	AC_ARG_WITH(apr-config,
+	[[  --with-apr-config=FILE    Use the given path to apr-config when determining
+								APR configuration; defaults to "apr-config"]],
+	[
+	if test "$withval" != "yes" -a "$withval" != ""; then
+	APR_CONFIGS=$withval
+		fi
+	])
+	AC_MSG_CHECKING([for APR])
+	APR_CONFIG=""
+	for VALUE in $APR_CONFIGS ; do
+			if $VALUE --cflags > /dev/null; then
+					APR_CONFIG=$VALUE
+					break
+			fi
+	done
+	test $VALUE && APR_CONFIG=$VALUE
+	if test $APR_CONFIG ; then
+		AC_MSG_RESULT([found])
+	else
+		AC_MSG_RESULT([not found])
+			SVN_SUBDIR=
+	dnl    AC_MSG_ERROR([APR is required. Try --with-apr-config.])
 	fi
-])
-AC_MSG_CHECKING([for APR])
-APR_CONFIG=""
-for VALUE in $APR_CONFIGS ; do
-		if $VALUE --cflags > /dev/null; then
-				APR_CONFIG=$VALUE
-				break
+			
+	APR_CFLAGS="`$APR_CONFIG --cflags`"
+	APR_INCLUDE="`$APR_CONFIG --includes`"
+	APR_LIBS="`$APR_CONFIG --link-ld --libs`"
+
+	dnl
+	dnl APR util
+	dnl
+
+	APU_CONFIGS="apu-config /usr/local/apr/bin/apu-config"
+	AC_ARG_WITH(apu-config,
+	[[  --with-apu-config=FILE    Use the given path to apu-config when determining
+								APR util configuration; defaults to "apu-config"]],
+	[
+		if test "$withval" != "yes" -a "$withval" != ""; then
+			APU_CONFIGS=$withval
 		fi
-done
-test $VALUE && APR_CONFIG=$VALUE
-if test $APR_CONFIG ; then
-	AC_MSG_RESULT([found])
-else
-	AC_MSG_RESULT([not found])
-		SVN_SUBDIR=
-dnl    AC_MSG_ERROR([APR is required. Try --with-apr-config.])
-fi
-		
-APR_CFLAGS="`$APR_CONFIG --cflags`"
-APR_INCLUDE="`$APR_CONFIG --includes`"
-APR_LIBS="`$APR_CONFIG --link-ld --libs`"
-
-dnl
-dnl APR util
-dnl
+	])
+	AC_MSG_CHECKING([for APR util])
+	APU_CONFIG=""
+	for VALUE in $APU_CONFIGS ; do
+			if $VALUE --includes > /dev/null; then
+					APU_CONFIG=$VALUE
+					break
+			fi
+	done
+	if test $APU_CONFIG ; then
+		AC_MSG_RESULT([found])
+	else
+		AC_MSG_RESULT([not found])
+			SVN_SUBDIR=
+	fi
+	APR_INCLUDE="$APR_INCLUDE `$APU_CONFIG --includes`"
+	APR_LIBS="$APR_LIBS `$APU_CONFIG --link-ld --libs`"
 
-APU_CONFIGS="apu-config /usr/local/apr/bin/apu-config"
-AC_ARG_WITH(apu-config,
-[[  --with-apu-config=FILE    Use the given path to apu-config when determining
-							APR util configuration; defaults to "apu-config"]],
-[
-	if test "$withval" != "yes" -a "$withval" != ""; then
-		APU_CONFIGS=$withval
+	AC_MSG_CHECKING(for Subversion svn-config)
+	AC_ARG_WITH(subversion-dir,
+			[  --with-subversion-dir=DIR           where Subversion is installed ],
+			[
+					SVNCONFIG="$withval/bin/svn-config"
+			])
+
+	if test -z "$SVNCONFIG"; then
+			_SVNCONFIG="`svn-config --prefix 2> /dev/null`"
+			if test -n "$_SVNCONFIG"; then
+					SVNCONFIG="$_SVNCONFIG/bin/svn-config"
+			fi
 	fi
-])
-AC_MSG_CHECKING([for APR util])
-APU_CONFIG=""
-for VALUE in $APU_CONFIGS ; do
-		if $VALUE --includes > /dev/null; then
-				APU_CONFIG=$VALUE
-				break
-		fi
-done
-if test $APU_CONFIG ; then
-	AC_MSG_RESULT([found])
-else
-	AC_MSG_RESULT([not found])
-		SVN_SUBDIR=
-fi
-APR_INCLUDE="$APR_INCLUDE `$APU_CONFIG --includes`"
-APR_LIBS="$APR_LIBS `$APU_CONFIG --link-ld --libs`"
-
-AC_MSG_CHECKING(for Subversion svn-config)
-AC_ARG_WITH(subversion-dir,
-		[  --with-subversion-dir=DIR           where Subversion is installed ],
-		[
-				SVNCONFIG="$withval/bin/svn-config"
-		])
-
-if test -z "$SVNCONFIG"; then
-		_SVNCONFIG="`svn-config --prefix 2> /dev/null`"
-		if test -n "$_SVNCONFIG"; then
-				SVNCONFIG="$_SVNCONFIG/bin/svn-config"
-		fi
-fi
 
-AC_SUBST(SVNCONFIG)
-if test -x "$SVNCONFIG"; then
-		SVNLD="`$SVNCONFIG --ldflags`"
-		SVN_LIB="`$SVNCONFIG --libs --cflags` -lsvn_client-1"
-		dnl ugly hack for subversion svn-config problems in 0.14.x, to be removed when svn-config is fixed
-		SVN_INCLUDE="`$SVNCONFIG --includes` -I$_SVNCONFIG/include/subversion-1/"
-		AC_MSG_RESULT(yes)
-else
-		AC_MSG_RESULT(not found)
-		dnl just a fallback to debian's config so that it works for me :)
-		AC_ARG_WITH(svn-include,
-								[[  --with-svn-include=DIR   Use the given path to the subversion headers.]],
-								[
+	AC_SUBST(SVNCONFIG)
+	if test -x "$SVNCONFIG"; then
+			SVNLD="`$SVNCONFIG --ldflags`"
+			SVN_LIB="`$SVNCONFIG --libs --cflags` -lsvn_client-1"
+			dnl ugly hack for subversion svn-config problems in 0.14.x, to be removed when svn-config is fixed
+			SVN_INCLUDE="`$SVNCONFIG --includes` -I$_SVNCONFIG/include/subversion-1/"
+			AC_MSG_RESULT(yes)
+	else
+			AC_MSG_RESULT(not found)
+			dnl just a fallback to debian's config so that it works for me :)
+			AC_ARG_WITH(svn-include,
+									[[  --with-svn-include=DIR   Use the given path to the subversion headers.]],
+									[
+									if test "$withval" != "yes" -a "$withval" != ""; then
+											SVN_INCLUDES=$withval
+									fi
+									])
+			if test -z "$SVN_INCLUDES"; then
+				SVN_INCLUDES="/usr/local/include /usr/include"
+			fi
+			AC_MSG_CHECKING([for Subversion headers])
+			SVN_INCLUDE=""
+			for VALUE in $SVN_INCLUDES ; do
+					if test -f $VALUE/subversion-1/svn_types.h ; then
+							SVN_INCLUDE=$VALUE
+							break
+					fi
+			done
+			if test $SVN_INCLUDE ; then
+					AC_MSG_RESULT([found])
+			else
+					AC_MSG_RESULT([not found])
+					SVN_SUBDIR=
+			fi
+			SVN_LIBS="/usr/local/lib /usr/lib"
+			AC_ARG_WITH(svn-lib,
+							[[  --with-svn-lib=DIR  Use the given path to the subversion libraries.]],
+							[
 								if test "$withval" != "yes" -a "$withval" != ""; then
-										SVN_INCLUDES=$withval
+									SVN_LIBS=$withval
 								fi
-								])
-		if test -z "$SVN_INCLUDES"; then
-			SVN_INCLUDES="/usr/local/include /usr/include"
-		fi
-		AC_MSG_CHECKING([for Subversion headers])
-		SVN_INCLUDE=""
-		for VALUE in $SVN_INCLUDES ; do
-				if test -f $VALUE/subversion-1/svn_types.h ; then
-						SVN_INCLUDE=$VALUE
-						break
-				fi
-		done
-		if test $SVN_INCLUDE ; then
-				AC_MSG_RESULT([found])
-		else
-				AC_MSG_RESULT([not found])
-				SVN_SUBDIR=
-		fi
-		SVN_LIBS="/usr/local/lib /usr/lib"
-		AC_ARG_WITH(svn-lib,
-						[[  --with-svn-lib=DIR  Use the given path to the subversion libraries.]],
-						[
-							if test "$withval" != "yes" -a "$withval" != ""; then
-								SVN_LIBS=$withval
-							fi
-						])
-		AC_MSG_CHECKING([for Subversion libraries])
-		SVN_LIB=""
-		for VALUE in $SVN_LIBS ; do
-				if ls $VALUE/libsvn_client-1.* 1>/dev/null 2>1; then
-						SVN_LIB=$VALUE
-						break
-				fi
-		done
-		if test $SVN_LIB ; then
-				AC_MSG_RESULT([found])
-		else
-				AC_MSG_RESULT([not found])
-				SVN_SUBDIR=
-		fi
-fi
+							])
+			AC_MSG_CHECKING([for Subversion libraries])
+			SVN_LIB=""
+			for VALUE in $SVN_LIBS ; do
+					if ls $VALUE/libsvn_client-1.* 1>/dev/null 2>1; then
+							SVN_LIB=$VALUE
+							break
+					fi
+			done
+			if test $SVN_LIB ; then
+					AC_MSG_RESULT([found])
+			else
+					AC_MSG_RESULT([not found])
+					SVN_SUBDIR=
+			fi
+	fi
 
 
-NEON_CONFIGS="neon-config"
-AC_ARG_WITH(neon-config,
-[[  --with-neon-config=FILE    Use the given path to neon-config when determining
-							Neon configuration; defaults to "neon-config"]],
-[
-	if test "$withval" != "yes" -a "$withval" != ""; then
-		NEON_CONFIGS=$withval
-	fi
-])
-AC_MSG_CHECKING([for Neon])
-NEON_CONFIG=""
-for VALUE in $NEON_CONFIGS ; do
-		if $VALUE --cflags > /dev/null; then
-				NEON_CONFIG=$VALUE
-				break
+	NEON_CONFIGS="neon-config"
+	AC_ARG_WITH(neon-config,
+	[[  --with-neon-config=FILE    Use the given path to neon-config when determining
+								Neon configuration; defaults to "neon-config"]],
+	[
+		if test "$withval" != "yes" -a "$withval" != ""; then
+			NEON_CONFIGS=$withval
 		fi
-done
-if test $NEON_CONFIG ; then
-	AC_MSG_RESULT([found])
-else
-	AC_MSG_RESULT([not found])
-		SVN_SUBDIR=
-fi
+	])
+	AC_MSG_CHECKING([for Neon])
+	NEON_CONFIG=""
+	for VALUE in $NEON_CONFIGS ; do
+			if $VALUE --cflags > /dev/null; then
+					NEON_CONFIG=$VALUE
+					break
+			fi
+	done
+	if test $NEON_CONFIG ; then
+		AC_MSG_RESULT([found])
+	else
+		AC_MSG_RESULT([not found])
+			SVN_SUBDIR=
+	fi
 
-SVN_LIB="-L$SVN_LIB $APR_LIBS -lsvn_client-1"
-SVN_INCLUDE="-I$SVN_INCLUDE $APR_INCLUDE"
-SVN_CFLAGS="$APR_CFLAGS"
+	SVN_LIB="-L$SVN_LIB $APR_LIBS -lsvn_client-1"
+	SVN_INCLUDE="-I$SVN_INCLUDE $APR_INCLUDE"
+	SVN_CFLAGS="$APR_CFLAGS"
+fi
 
 AM_CONDITIONAL(BUILD_SVN, [test -n "$SVN_INCLUDE"])