[asterisk-commits] trunk r25686 - in /trunk: Makefile indications.c

[asterisk-commits at lists.digium.com]

Author: russell
Date: Mon May  8 16:00:16 2006
New Revision: 25686

URL: http://svn.digium.com/view/asterisk?rev=25686&view=rev
Log:
make sure that the MOD_SUBDIR_CFLAGS and OTHER_SUBDIR_FLAGS come before
ASTCFLAGS so that -Iinclude comes before any system include path

Modified:
    trunk/Makefile
    trunk/indications.c

Modified: trunk/Makefile
URL: http://svn.digium.com/view/asterisk/trunk/Makefile?rev=25686&r1=25685&r2=25686&view=diff
==============================================================================
--- trunk/Makefile (original)
+++ trunk/Makefile Mon May  8 16:00:16 2006
@@ -528,7 +528,7 @@
 	rm -f $@.tmp
 
 stdtime/libtime.a:
-	CFLAGS="$(ASTCFLAGS) $(MOD_SUBDIR_CFLAGS)" $(MAKE) -C stdtime libtime.a
+	CFLAGS="$(MOD_SUBDIR_CFLAGS) $(ASTCFLAGS)" $(MAKE) -C stdtime libtime.a
 
 asterisk: editline/libedit.a db1-ast/libdb1.a stdtime/libtime.a $(OBJS)
 	build_tools/make_build_h > include/asterisk/build.h.tmp
@@ -543,9 +543,9 @@
 	$(CC) $(AUDIO_LIBS) -o muted muted.o
 
 subdirs: 
-	@for x in $(MOD_SUBDIRS); do CFLAGS="$(ASTCFLAGS) $(MOD_SUBDIR_CFLAGS)" $(MAKE) -C $$x || exit 1 ; done
-	@CFLAGS="$(ASTCFLAGS) $(OTHER_SUBDIR_CFLAGS)" $(MAKE) -C utils
-	@CFLAGS="$(ASTCFLAGS) $(OTHER_SUBDIR_CFLAGS)" $(MAKE) -C agi
+	@for x in $(MOD_SUBDIRS); do CFLAGS="$(MOD_SUBDIR_CFLAGS) $(ASTCFLAGS)" $(MAKE) -C $$x || exit 1 ; done
+	@CFLAGS="$(OTHER_SUBDIR_CFLAGS) $(ASTCFLAGS)" $(MAKE) -C utils
+	@CFLAGS="$(OTHER_SUBDIR_CFLAGS) $(ASTCFLAGS)" $(MAKE) -C agi
 
 clean-depend:
 	@for x in $(SUBDIRS); do $(MAKE) -C $$x clean-depend || exit 1 ; done

Modified: trunk/indications.c
URL: http://svn.digium.com/view/asterisk/trunk/indications.c?rev=25686&r1=25685&r2=25686&view=diff
==============================================================================
--- trunk/indications.c (original)
+++ trunk/indications.c Mon May  8 16:00:16 2006
@@ -412,12 +412,13 @@
 	struct tone_zone_sound *ts;
 
 	/* we need some tonezone, pick the first */
-	if (zone == NULL && current_tonezone)
-		zone = current_tonezone;	/* default country? */
-	if (zone == NULL && tone_zones)
-		zone = tone_zones;		/* any country? */
-	if (zone == NULL)
-		return 0;	/* not a single country insight */
+	if (!zone) {
+		if (current_tonezone)
+			return current_tonezone; /* default country? */
+		if (tone_zones)
+			return tone_zones; /* any country? */
+		return 0; /* not a single country insight */
+	}
 
 	if (ast_mutex_lock(&tzlock)) {
 		ast_log(LOG_WARNING, "Unable to lock tone_zones list\n");