[svn-commits] jpeeler: branch 1.0 r467 - in /branches/1.0: menuselect.c menuselect.h

[SVN commits to the Digium repositories]

Author: jpeeler
Date: Mon Feb  2 11:41:22 2009
New Revision: 467

URL: http://svn.digium.com/svn-view/menuselect?view=rev&rev=467
Log:
Fix incorrect assumption about saved menuselect options being project specific
in r465.

I did not realize that DAHDI also supports saved options, so checking
specifically for an asterisk.makeopts file doesn't fix the issue entirely. This
commit removes any filename checking for the existing_config flag to be set.
Any valid file passed in will now work.

(related to issue #14137)


Modified:
    branches/1.0/menuselect.c
    branches/1.0/menuselect.h

Modified: branches/1.0/menuselect.c
URL: http://svn.digium.com/svn-view/menuselect/branches/1.0/menuselect.c?view=diff&rev=467&r1=466&r2=467
==============================================================================
--- branches/1.0/menuselect.c (original)
+++ branches/1.0/menuselect.c Mon Feb  2 11:41:22 2009
@@ -1237,7 +1237,7 @@
 			check_deps = 1;
 		else {
 			res = parse_existing_config(argv[x]);
-			if (!res && (!strcasecmp(argv[x], OUTPUT_MAKEOPTS_DEFAULT) || strstr(argv[x], SAVED_MAKEOPTS))) {
+			if (!res) {
 				existing_config = 1;
 			}
 			res = 0;

Modified: branches/1.0/menuselect.h
URL: http://svn.digium.com/svn-view/menuselect/branches/1.0/menuselect.h?view=diff&rev=467&r1=466&r2=467
==============================================================================
--- branches/1.0/menuselect.h (original)
+++ branches/1.0/menuselect.h Mon Feb  2 11:41:22 2009
@@ -30,7 +30,6 @@
 
 #define OUTPUT_MAKEOPTS_DEFAULT "menuselect.makeopts"
 #define OUTPUT_MAKEDEPS_DEFAULT "menuselect.makedeps"
-#define SAVED_MAKEOPTS          "asterisk.makeopts"
 #define MENUSELECT_DEPS         "build_tools/menuselect-deps"
 
 struct member;