[asterisk-commits] branch group/autoconf_and_menuselect r12484 - /team/group/autoconf_and_menuse...

[asterisk-commits at lists.digium.com]

Author: russell
Date: Thu Mar  9 15:34:17 2006
New Revision: 12484

URL: http://svn.digium.com/view/asterisk?rev=12484&view=rev
Log:
When executing menuselect with the --check-deps option and menuselect.makeopts
did not already exist, go ahead and create it automatically, building everything
except for what has unmet dependencies.  This way, the only new required step
we will be adding to the build process is running configure.

Modified:
    team/group/autoconf_and_menuselect/build_tools/menuselect.c

Modified: team/group/autoconf_and_menuselect/build_tools/menuselect.c
URL: http://svn.digium.com/view/asterisk/team/group/autoconf_and_menuselect/build_tools/menuselect.c?rev=12484&r1=12483&r2=12484&view=diff
==============================================================================
--- team/group/autoconf_and_menuselect/build_tools/menuselect.c (original)
+++ team/group/autoconf_and_menuselect/build_tools/menuselect.c Thu Mar  9 15:34:17 2006
@@ -852,11 +852,17 @@
 #endif
 
 	/* Run the menu to let the user enable/disable options */
-	if (!check_deps) {
-		if (!(res = run_menu()))
-			res = generate_makeopts_file(); /* If all is good, save the new config */
-	}
-
+	if (!check_deps)
+		res = run_menu();
+
+	/* Write out the menuselect.makeopts file if
+	 * 1) menuselect was not executed with --check-deps
+	 * 2) menuselect was executed with --check-deps but menuselect.makeopts
+	 *    did not already exist.
+	 */
+	if ((!check_deps || !existing_config) && res >= 0)
+		res = generate_makeopts_file();
+	
 	/* free everything we allocated */
 	free_trees();
 	free_member_list();