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

[asterisk-commits at lists.digium.com]

Author: russell
Date: Thu Mar  9 17:37:40 2006
New Revision: 12485

URL: http://svn.digium.com/view/asterisk?rev=12485&view=rev
Log: (empty)

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=12485&r1=12484&r2=12485&view=diff
==============================================================================
--- team/group/autoconf_and_menuselect/build_tools/menuselect.c (original)
+++ team/group/autoconf_and_menuselect/build_tools/menuselect.c Thu Mar  9 17:37:40 2006
@@ -835,13 +835,8 @@
 	 * modules that have dependencies that have not been met.  If this
 	 * is not the case, an informative message will be printed to the
 	 * user and the build will fail. */
-	if (argc == 2 && !strcmp(argv[1], "--check-deps")) {
+	if (argc == 2 && !strcmp(argv[1], "--check-deps"))
 		check_deps = 1;
-		/* Set to greater than 0 so that we won't run the menu
-		   or write out a new file, but we will still exit with
-		   a return code of 0 */
-		res = 1;
-	}
 
 	/* Process module dependencies */
 	res = process_deps();
@@ -852,7 +847,7 @@
 #endif
 
 	/* Run the menu to let the user enable/disable options */
-	if (!check_deps)
+	if (!check_deps && !res)
 		res = run_menu();
 
 	/* Write out the menuselect.makeopts file if
@@ -860,15 +855,12 @@
 	 * 2) menuselect was executed with --check-deps but menuselect.makeopts
 	 *    did not already exist.
 	 */
-	if ((!check_deps || !existing_config) && res >= 0)
+	if ((!check_deps || !existing_config) && !res)
 		res = generate_makeopts_file();
 	
 	/* free everything we allocated */
 	free_trees();
 	free_member_list();
 
-	if (res > 0)
-		res = 0;
-
 	exit(res);
 }