[svn-commits] jpeeler: trunk r468 - in /trunk: ./ menuselect.c menuselect.h

[SVN commits to the Digium repositories]

Author: jpeeler
Date: Mon Feb  2 11:46:26 2009
New Revision: 468

URL: http://svn.digium.com/svn-view/menuselect?view=rev&rev=468
Log:
Merged revisions 467 via svnmerge from 
https://origsvn.digium.com/svn/menuselect/branches/1.0

........
  r467 | jpeeler | 2009-02-02 11:41:22 -0600 (Mon, 02 Feb 2009) | 11 lines
  
  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:
    trunk/   (props changed)
    trunk/menuselect.c
    trunk/menuselect.h

Propchange: trunk/
------------------------------------------------------------------------------
--- branch-1.0-merged (original)
+++ branch-1.0-merged Mon Feb  2 11:46:26 2009
@@ -1,1 +1,1 @@
-/branches/1.0:1-316,383,437,465
+/branches/1.0:1-316,383,437,465,467

Modified: trunk/menuselect.c
URL: http://svn.digium.com/svn-view/menuselect/trunk/menuselect.c?view=diff&rev=468&r1=467&r2=468
==============================================================================
--- trunk/menuselect.c (original)
+++ trunk/menuselect.c Mon Feb  2 11:46:26 2009
@@ -1443,7 +1443,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: trunk/menuselect.h
URL: http://svn.digium.com/svn-view/menuselect/trunk/menuselect.h?view=diff&rev=468&r1=467&r2=468
==============================================================================
--- trunk/menuselect.h (original)
+++ trunk/menuselect.h Mon Feb  2 11:46:26 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;