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

[SVN commits to the Digium repositories]

Author: jpeeler
Date: Fri Jan 30 17:52:23 2009
New Revision: 466

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

........
  r465 | jpeeler | 2009-01-30 17:37:29 -0600 (Fri, 30 Jan 2009) | 6 lines
  
  (closes issue #14137)
  Reported by: jnemeth
  
  Add the string "asterisk.makeopts" to search for valid makeopts configuration files in the arguments provided to menuselect. Previously, the existing_config flag was not getting set causing the defaults to load when a menuselect.makeopts file was not present, even though a valid /etc/asterisk.makeopts or ~/.asterisk.makeopts file existed. Technically the use of strstr is going to allow any valid file with the string "asterisk.makeopts" in it to work. I believe this is best though since it avoids any hardcoded paths and the encouraged method of invoking menuselect is through use of the menuselect makefile targets.
........

Modified:
    trunk/   (props changed)
    trunk/menuselect.c
    trunk/menuselect.h

Propchange: trunk/
------------------------------------------------------------------------------
--- branch-1.0-merged (original)
+++ branch-1.0-merged Fri Jan 30 17:52:23 2009
@@ -1,1 +1,1 @@
-/branches/1.0:1-316,383,437
+/branches/1.0:1-316,383,437,465

Modified: trunk/menuselect.c
URL: http://svn.digium.com/svn-view/menuselect/trunk/menuselect.c?view=diff&rev=466&r1=465&r2=466
==============================================================================
--- trunk/menuselect.c (original)
+++ trunk/menuselect.c Fri Jan 30 17:52:23 2009
@@ -1443,8 +1443,9 @@
 			check_deps = 1;
 		else {
 			res = parse_existing_config(argv[x]);
-			if (!res && !strcasecmp(argv[x], OUTPUT_MAKEOPTS_DEFAULT))
+			if (!res && (!strcasecmp(argv[x], OUTPUT_MAKEOPTS_DEFAULT) || strstr(argv[x], SAVED_MAKEOPTS))) {
 				existing_config = 1;
+			}
 			res = 0;
 		}
 	}

Modified: trunk/menuselect.h
URL: http://svn.digium.com/svn-view/menuselect/trunk/menuselect.h?view=diff&rev=466&r1=465&r2=466
==============================================================================
--- trunk/menuselect.h (original)
+++ trunk/menuselect.h Fri Jan 30 17:52:23 2009
@@ -30,6 +30,7 @@
 
 #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;