[svn-commits] russell: branch 1.0 r472 - /branches/1.0/menuselect.c

[SVN commits to the Digium repositories]

Author: russell
Date: Thu Feb 12 09:58:51 2009
New Revision: 472

URL: http://svn.digium.com/svn-view/menuselect?view=rev&rev=472
Log:
Revert rev 468.  This caused a regression.

This change assumed that the makeopts files in /etc/or ~/ were full makeopts files.
For example, if you had a makeopts file in ~/ that only had one line to ensure
that you always built with DEBUG_THREADS enabled, it would no longer work, because
the menuselect sanity check would freak out.
------------------------------------------------------------------------

Modified:
    branches/1.0/menuselect.c

Modified: branches/1.0/menuselect.c
URL: http://svn.digium.com/svn-view/menuselect/branches/1.0/menuselect.c?view=diff&rev=472&r1=471&r2=472
==============================================================================
--- branches/1.0/menuselect.c (original)
+++ branches/1.0/menuselect.c Thu Feb 12 09:58:51 2009
@@ -1237,7 +1237,7 @@
 			check_deps = 1;
 		else {
 			res = parse_existing_config(argv[x]);
-			if (!res) {
+			if (!res && !strcasecmp(argv[x], OUTPUT_MAKEOPTS_DEFAULT)) {
 				existing_config = 1;
 			}
 			res = 0;