[Autotools] Don't destroy unresolved refs

1 files changed, 9 insertions, 3 deletions

diff --git a/main/src/addins/MonoDevelop.Autotools/MakefileData.cs b/main/src/addins/MonoDevelop.Autotools/MakefileData.cs
index ccd1516f4f..0e776bf98e 100644
--- a/main/src/addins/MonoDevelop.Autotools/MakefileData.cs
+++ b/main/src/addins/MonoDevelop.Autotools/MakefileData.cs
@@ -782,9 +782,12 @@ namespace MonoDevelop.Autotools
 					//Required when UpdateProject gets called by ui
 					if (ownerProject.ParentSolution != null)
 						ResolveProjectReferences (ownerProject.ParentSolution.RootFolder, monitor);
-
-					foreach (ProjectReference pr in existingGacRefs.Values)
-						dotnetProject.References.Remove (pr);
+					
+					//only remove unmatched existing refs if everything resolved without errors
+					if (SaveReferences) {
+						foreach (ProjectReference pr in existingGacRefs.Values)
+							dotnetProject.References.Remove (pr);
+					}
 
 					existingGacRefs.Clear ();
 					newGacRefs.Clear ();
@@ -1000,6 +1003,7 @@ namespace MonoDevelop.Autotools
 					 LoggingService.LogWarning  ("Package named '{0}' not found in configure.in. Ignoring reference to '{1}'.",
 						pkgVarName, rname);
 					refVar.Extra.Add (reference);
+					SaveReferences = false;
 					return;
 				}
 
@@ -1108,6 +1112,8 @@ namespace MonoDevelop.Autotools
 			
 			if (pkg == null) {
 				LoggingService.LogWarning ("No package named '{0}' found. Ignoring.", pkgName);
+				//don't sync the unresolved refs from the project back to the makefile or things go horribly wrong
+				SaveReferences = false;
 				return false;
 			}