[Monodevelop-patches-list] r1738 - in trunk/MonoDevelop: . src/Main/Base src/Main/Base/Services

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

Author: tberman
Date: 2004-06-11 08:30:13 -0400 (Fri, 11 Jun 2004)
New Revision: 1738

Modified:
   trunk/MonoDevelop/ChangeLog
   trunk/MonoDevelop/configure.in
   trunk/MonoDevelop/monodevelop.in
   trunk/MonoDevelop/src/Main/Base/ChangeLog
   trunk/MonoDevelop/src/Main/Base/Services/SystemAssemblyService.cs
Log:
mmmm, early morning fixes


Modified: trunk/MonoDevelop/ChangeLog
===================================================================
--- trunk/MonoDevelop/ChangeLog	2004-06-11 05:08:32 UTC (rev 1737)
+++ trunk/MonoDevelop/ChangeLog	2004-06-11 12:30:13 UTC (rev 1738)
@@ -1,3 +1,9 @@
+2004-06-11  Todd Berman  <tberman at sevenl.net>
+
+	* configure.in: grab gtk-sharp prefix.
+	* monodevelop.in: add the gtk-sharp prefix for assembly ref issues.
+	attempt to be smart, etc.
+
 2004-06-10 John Bouantoun (jba-mono at optusnet.com.au)
 	* Numerous *.prjx in MonoDevelop solution: Changed them to not
 	search folders for new files on load.

Modified: trunk/MonoDevelop/configure.in
===================================================================
--- trunk/MonoDevelop/configure.in	2004-06-11 05:08:32 UTC (rev 1737)
+++ trunk/MonoDevelop/configure.in	2004-06-11 12:30:13 UTC (rev 1738)
@@ -84,6 +84,8 @@
 gnome_prefix="`$PKG_CONFIG --variable=prefix libgnome-2.0`"
 AC_SUBST(gnome_prefix)
 
+gtksharp_prefix="`$PKG_CONFIG --variable=prefix gtk-sharp`"
+
 if test "x$XDGMIME" = "xno" ; then
 enable_xdgmime="no"
 else

Modified: trunk/MonoDevelop/monodevelop.in
===================================================================
--- trunk/MonoDevelop/monodevelop.in	2004-06-11 05:08:32 UTC (rev 1737)
+++ trunk/MonoDevelop/monodevelop.in	2004-06-11 12:30:13 UTC (rev 1738)
@@ -35,6 +35,12 @@
 	export LD_LIBRARY_PATH=$MOZILLA_HOME:$MD_BIN_PATH
 fi
 
+if [ -n $PKG_CONFIG_PATH]; then
+	export PKG_CONFIG_PATH=$PKG_CONFIG_PATH:@gtksharp_prefix@
+else
+	export PKG_CONFIG_PATH=@gtksharp_prefix@
+fi
+
 export MOZILLA_FIVE_HOME=$MOZILLA_HOME
 
 ARGS=`reWrite "$@"`

Modified: trunk/MonoDevelop/src/Main/Base/ChangeLog
===================================================================
--- trunk/MonoDevelop/src/Main/Base/ChangeLog	2004-06-11 05:08:32 UTC (rev 1737)
+++ trunk/MonoDevelop/src/Main/Base/ChangeLog	2004-06-11 12:30:13 UTC (rev 1738)
@@ -1,3 +1,7 @@
+2004-06-11  Todd Berman  <tberman at sevenl.net>
+
+	* Services/SystemAssemblyService.cs: Dont scan the same path twice.
+
 2004-06-10  Lluis Sanchez Gual  <lluis at ximian.com>
 
 	* Commands/ProjectBrowserCommands/FolderNodeCommands.cs: Set the project of

Modified: trunk/MonoDevelop/src/Main/Base/Services/SystemAssemblyService.cs
===================================================================
--- trunk/MonoDevelop/src/Main/Base/Services/SystemAssemblyService.cs	2004-06-11 05:08:32 UTC (rev 1737)
+++ trunk/MonoDevelop/src/Main/Base/Services/SystemAssemblyService.cs	2004-06-11 12:30:13 UTC (rev 1738)
@@ -54,7 +54,12 @@
 			}
 			search_dirs += ":" + libpath;
 			if (search_dirs != null && search_dirs.Length > 0) {
-				foreach (string pcdir in search_dirs.Split (':')) {
+				ArrayList scanDirs = new ArrayList ();
+				foreach (string potentialDir in search_dirs.Split (':')) {
+					if (!scanDirs.Contains (potentialDir))
+						scanDirs.Add (potentialDir);
+				}
+				foreach (string pcdir in scanDirs) {
 					if (pcdir == null)
 						continue;