* Removed latest fix from TODO.autoconf

* Attempted fix for FS#6100 - "-Spd foo" failure
* Beginning of refactoring from Dan McGee <dpmcgee@gmail.com>

TODO.autoconf

@@ -1,12 +1,5 @@
 TODO for autoconf/automake:
 
-pacman's Makefile.am and configure.in
-=====================================
-
-- find out how can we prevent automake/autoconf to build pacman.static binary, if we
-  are configured using --disable-static flag. Now if builded with this option, then pacman.static
-  compile fails, because there will be no libalpm.a (just .so)
-
 global
 ======
 

lib/libalpm/sync.c

@@ -118,7 +118,10 @@ static int istoonew(pmpkg_t *pkg)
 	return((pkg->date + handle->upgradedelay) > t);
 }
 
-int _alpm_sync_sysupgrade(pmtrans_t *trans, pmdb_t *db_local, pmlist_t *dbs_sync)
+/* Find recommended replacements for packages during a sync.
+ * (refactored from _alpm_sync_prepare)
+ */
+static int find_replacements(pmtrans_t *trans, pmdb_t *db_local, pmlist_t *dbs_sync)
 {
 	pmlist_t *i, *j, *k;
 
@@ -178,7 +181,18 @@ int _alpm_sync_sysupgrade(pmtrans_t *trans, pmdb_t *db_local, pmlist_t *dbs_sync
 			}
 		}
 	}
+	return(0);
+error:
+	return(-1);
+}
 
+int _alpm_sync_sysupgrade(pmtrans_t *trans, pmdb_t *db_local, pmlist_t *dbs_sync)
+{
+	pmlist_t *i, *j;
+
+	/* check for "recommended" package replacements */
+	_alpm_log(PM_LOG_FLOW1, _("checking for package replacements"));
+	if( find_replacements(trans, db_local, dbs_sync) == 0 ) {
 		/* match installed packages with the sync dbs and compare versions */
 		_alpm_log(PM_LOG_FLOW1, _("checking for package upgrades"));
 		for(i = _alpm_db_get_pkgcache(db_local, INFRQ_NONE); i; i = i->next) {
@@ -250,8 +264,8 @@ int _alpm_sync_sysupgrade(pmtrans_t *trans, pmdb_t *db_local, pmlist_t *dbs_sync
 		}
 
 		return(0);
-
-error:
+	}
+	/* if we're here, it's an error */
 	return(-1);
 }
 

src/pacman/sync.c

@@ -664,7 +664,6 @@ int pacman_sync(list_t *targets)
 		if(!confirm) {
 			goto cleanup;
 		}
-	}
 
 		/* Step 3: actually perform the installation
 		*/
@@ -704,6 +703,7 @@ int pacman_sync(list_t *targets)
 			retval = 1;
 			goto cleanup;
 		}
+	}/* else 'print uris' requested.  We're done at this point */
 
 	/* Step 4: release transaction resources
 	 */