[Monodevelop-patches-list] r2008 - trunk/MonoDevelop/Core

[commit-watcher at mono-cvs.ximian.com]

Author: tberman
Date: 2004-10-29 17:23:31 -0400 (Fri, 29 Oct 2004)
New Revision: 2008

Modified:
   trunk/MonoDevelop/Core/configure.in
Log:
require gtk-sharp-2.0

If you have beef with this. Suck it and die.


Modified: trunk/MonoDevelop/Core/configure.in
===================================================================
--- trunk/MonoDevelop/Core/configure.in	2004-10-29 03:35:46 UTC (rev 2007)
+++ trunk/MonoDevelop/Core/configure.in	2004-10-29 21:23:31 UTC (rev 2008)
@@ -66,32 +66,18 @@
 fi
 
 
-GTK_SHARP_2_0=no
-
-AC_ARG_WITH(gtk-sharp-2-0, [  --with-gtk-sharp-2-0=yes,no
-        If you want to build with gtk-sharp-2.0 default=no],[
-	if test x$with_gtk_sharp_2_0 = xyes; then
-		GTK_SHARP_2_0=yes
-	fi
-])
-
 dnl hard dependencies
 GTKSHARP_REQUIRED_VERSION=1.0
 GTKSOURCEVIEWSHARP_REQUIRED_VERSION=0.5
 GECKOSHARP_REQUIRED_VERSION=0.5
 MONODOC_REQUIRED_VERSION=1.0
 
-if test x$GTK_SHARP_2_0 = xyes; then
-	PKG_CHECK_MODULES(BASE_DEPENDENCIES, gnome-sharp-2.0 >= $GTKSHARP_REQUIRED_VERSION glade-sharp-2.0 >= $GTKSHARP_REQUIRED_VERSION gconf-sharp-2.0 >= $GTKSHARP_REQUIRED_VERSION gtkhtml-sharp-2.0 >= $GTKSHARP_REQUIRED_VERSION)
-	PKG_CHECK_MODULES(EXTRA_CRAP, gtksourceview-sharp >= $GTKSOURCEVIEWSHARP_REQUIRED_VERSION gecko-sharp >= $GECKOSHARP_REQUIRED_VERSION monodoc >= $MONODOC_REQUIRED_VERSION)
-	BASE_DEPENDENCIES_LIBS=${BASE_DEPENDENCIES_LIBS}${EXTRA_CRAP_LIBS}	
-	AC_SUBST(BASE_DEPENDENCIES_LIBS)
-else
-	PKG_CHECK_MODULES(BASE_DEPENDENCIES, gtk-sharp >= $GTKSHARP_REQUIRED_VERSION glade-sharp >= $GTKSHARP_REQUIRED_VERSION gconf-sharp >= $GTKSHARP_REQUIRED_VERSION gnome-sharp >= $GTKSHARP_REQUIRED_VERSION gtkhtml-sharp >= $GTKSHARP_REQUIRED_VERSION gtksourceview-sharp >= $GTKSOURCEVIEWSHARP_REQUIRED_VERSION gecko-sharp >= $GECKOSHARP_REQUIRED_VERSION monodoc >= $MONODOC_REQUIRED_VERSION)
-	AC_SUBST(BASE_DEPENDENCIES_LIBS)
-fi
+PKG_CHECK_MODULES(BASE_DEPENDENCIES, gnome-sharp-2.0 >= $GTKSHARP_REQUIRED_VERSION glade-sharp-2.0 >= $GTKSHARP_REQUIRED_VERSION gconf-sharp-2.0 >= $GTKSHARP_REQUIRED_VERSION gtkhtml-sharp-2.0 >= $GTKSHARP_REQUIRED_VERSION)
+PKG_CHECK_MODULES(EXTRA_CRAP, gtksourceview-sharp >= $GTKSOURCEVIEWSHARP_REQUIRED_VERSION gecko-sharp >= $GECKOSHARP_REQUIRED_VERSION monodoc >= $MONODOC_REQUIRED_VERSION)
+BASE_DEPENDENCIES_LIBS=${BASE_DEPENDENCIES_LIBS}${EXTRA_CRAP_LIBS}	
+AC_SUBST(BASE_DEPENDENCIES_LIBS)
 
-gtksharp_prefix=`pkg-config --variable=prefix gtk-sharp`
+gtksharp_prefix=`pkg-config --variable=prefix gtk-sharp-2.0`
 AC_SUBST(gtksharp_prefix)
 
 dnl GdlDock requirements and configuration