[asterisk-commits] tilghman: branch 1.6.0 r242524 - in /branches/1.6.0: ./ include/asterisk/ pbx...

SVN commits to the Asterisk project asterisk-commits at lists.digium.com
Sun Jan 24 00:42:46 CST 2010 

Author: tilghman
Date: Sun Jan 24 00:42:42 2010
New Revision: 242524

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=242524
Log:
Merged revisions 242521 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

................
  r242521 | tilghman | 2010-01-24 00:40:31 -0600 (Sun, 24 Jan 2010) | 15 lines
  
  Merged revisions 242520 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r242520 | tilghman | 2010-01-24 00:33:01 -0600 (Sun, 24 Jan 2010) | 8 lines
    
    Only rebuild bison and flex source files on demand, if bison and flex are detected by the configure script.
    
    Changed after discussion on the -dev list about possible unnecessary build
    failures, due to checkouts/untars causing these special source files to
    possibly be newer than their resulting C files.  This should additionally
    ensure that nobody need learn about extra Makefile arguments to ensure the
    proper files get rebuilt when changes are made to these special source files.
  ........
................

Modified:
    branches/1.6.0/   (props changed)
    branches/1.6.0/configure
    branches/1.6.0/configure.ac
    branches/1.6.0/include/asterisk/autoconfig.h.in
    branches/1.6.0/makeopts.in
    branches/1.6.0/pbx/Makefile
    branches/1.6.0/res/Makefile

Propchange: branches/1.6.0/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.0/configure.ac
URL: http://svnview.digium.com/svn/asterisk/branches/1.6.0/configure.ac?view=diff&rev=242524&r1=242523&r2=242524
==============================================================================
--- branches/1.6.0/configure.ac (original)
+++ branches/1.6.0/configure.ac Sun Jan 24 00:42:42 2010
@@ -171,6 +171,8 @@
 fi
 AC_SUBST(GNU_LD)
 
+AC_PATH_PROG([BISON], [bison], :)
+AC_PATH_PROG([FLEX], [flex], :)
 AC_PATH_PROG([GREP], [grep], :)
 AC_PATH_PROG([FIND], [find], :)
 AC_PATH_PROG([COMPRESS], [compress], :)

Modified: branches/1.6.0/include/asterisk/autoconfig.h.in
URL: http://svnview.digium.com/svn/asterisk/branches/1.6.0/include/asterisk/autoconfig.h.in?view=diff&rev=242524&r1=242523&r2=242524
==============================================================================
--- branches/1.6.0/include/asterisk/autoconfig.h.in (original)
+++ branches/1.6.0/include/asterisk/autoconfig.h.in Sun Jan 24 00:42:42 2010
@@ -815,7 +815,7 @@
 /* Define to 1 if you have the `strtoq' function. */
 #undef HAVE_STRTOQ
 
-/* Define to 1 if `struct stat' is a member of `st_blksize'. */
+/* Define to 1 if `st_blksize' is member of `struct stat'. */
 #undef HAVE_STRUCT_STAT_ST_BLKSIZE
 
 /* Define to 1 if you have the mISDN Supplemental Services library. */
@@ -1065,11 +1065,11 @@
 /* Define to the one symbol short name of this package. */
 #undef PACKAGE_TARNAME
 
-/* Define to the home page for this package. */
-#undef PACKAGE_URL
-
 /* Define to the version of this package. */
 #undef PACKAGE_VERSION
+
+/* Define to 1 if the C compiler supports function prototypes. */
+#undef PROTOTYPES
 
 /* Define to necessary symbol if this constant uses a non-standard name on
    your system. */
@@ -1089,6 +1089,11 @@
 
 /* Define to the type of arg 5 for `select'. */
 #undef SELECT_TYPE_ARG5
+
+/* Define to 1 if the `setvbuf' function takes the buffering type as its
+   second argument and the buffer pointer as the third, as on System V before
+   release 3. */
+#undef SETVBUF_REVERSED
 
 /* The size of `int', as computed by sizeof. */
 #undef SIZEOF_INT
@@ -1110,46 +1115,50 @@
 /* Define to 1 if your <sys/time.h> declares `struct tm'. */
 #undef TM_IN_SYS_TIME
 
-/* Enable extensions on AIX 3, Interix.  */
+/* Define to 1 if on AIX 3.
+   System headers sometimes define this.
+   We just want to avoid a redefinition error message.  */
 #ifndef _ALL_SOURCE
 # undef _ALL_SOURCE
 #endif
+
+/* Number of bits in a file offset, on hosts where this is settable. */
+#undef _FILE_OFFSET_BITS
+
 /* Enable GNU extensions on systems that have them.  */
 #ifndef _GNU_SOURCE
 # undef _GNU_SOURCE
 #endif
-/* Enable threading extensions on Solaris.  */
+
+/* Define to 1 to make fseeko visible on some hosts (e.g. glibc 2.2). */
+#undef _LARGEFILE_SOURCE
+
+/* Define for large files, on AIX-style hosts. */
+#undef _LARGE_FILES
+
+/* Define to 1 if on MINIX. */
+#undef _MINIX
+
+/* Define to 2 if the system does not provide POSIX.1 features except with
+   this defined. */
+#undef _POSIX_1_SOURCE
+
+/* Define to 1 if you need to in order for `stat' and other things to work. */
+#undef _POSIX_SOURCE
+
+/* Enable extensions on Solaris.  */
+#ifndef __EXTENSIONS__
+# undef __EXTENSIONS__
+#endif
 #ifndef _POSIX_PTHREAD_SEMANTICS
 # undef _POSIX_PTHREAD_SEMANTICS
 #endif
-/* Enable extensions on HP NonStop.  */
 #ifndef _TANDEM_SOURCE
 # undef _TANDEM_SOURCE
 #endif
-/* Enable general extensions on Solaris.  */
-#ifndef __EXTENSIONS__
-# undef __EXTENSIONS__
-#endif
-
-
-/* Number of bits in a file offset, on hosts where this is settable. */
-#undef _FILE_OFFSET_BITS
-
-/* Define to 1 to make fseeko visible on some hosts (e.g. glibc 2.2). */
-#undef _LARGEFILE_SOURCE
-
-/* Define for large files, on AIX-style hosts. */
-#undef _LARGE_FILES
-
-/* Define to 1 if on MINIX. */
-#undef _MINIX
-
-/* Define to 2 if the system does not provide POSIX.1 features except with
-   this defined. */
-#undef _POSIX_1_SOURCE
-
-/* Define to 1 if you need to in order for `stat' and other things to work. */
-#undef _POSIX_SOURCE
+
+/* Define like PROTOTYPES; this can be used by system headers. */
+#undef __PROTOTYPES
 
 /* Define to empty if `const' does not conform to ANSI C. */
 #undef const

Modified: branches/1.6.0/makeopts.in
URL: http://svnview.digium.com/svn/asterisk/branches/1.6.0/makeopts.in?view=diff&rev=242524&r1=242523&r2=242524
==============================================================================
--- branches/1.6.0/makeopts.in (original)
+++ branches/1.6.0/makeopts.in Sun Jan 24 00:42:42 2010
@@ -8,6 +8,8 @@
 
 INSTALL=@INSTALL@
 AWK=@AWK@
+BISON=@BISON@
+FLEX=@FLEX@
 GREP=@GREP@
 AR=@AR@
 RANLIB=@RANLIB@

Modified: branches/1.6.0/pbx/Makefile
URL: http://svnview.digium.com/svn/asterisk/branches/1.6.0/pbx/Makefile?view=diff&rev=242524&r1=242523&r2=242524
==============================================================================
--- branches/1.6.0/pbx/Makefile (original)
+++ branches/1.6.0/pbx/Makefile Sun Jan 24 00:42:42 2010
@@ -9,7 +9,7 @@
 # the GNU General Public License
 #
 
--include $(ASTTOPDIR)/menuselect.makeopts $(ASTTOPDIR)/menuselect.makedeps
+-include $(ASTTOPDIR)/menuselect.makeopts $(ASTTOPDIR)/menuselect.makedeps $(ASTTOPDIR)/makeopts
 
 MODULE_PREFIX=pbx
 MENUSELECT_CATEGORY=PBX

Modified: branches/1.6.0/res/Makefile
URL: http://svnview.digium.com/svn/asterisk/branches/1.6.0/res/Makefile?view=diff&rev=242524&r1=242523&r2=242524
==============================================================================
--- branches/1.6.0/res/Makefile (original)
+++ branches/1.6.0/res/Makefile Sun Jan 24 00:42:42 2010
@@ -39,14 +39,22 @@
 
 $(if $(filter res_ael_share,$(EMBEDDED_MODS)),modules.link,res_ael_share.so): ael/ael_lex.o ael/ael.tab.o ael/pval.o
 
+ifneq ($(FLEX),)
 ael/ael_lex.c: ael/ael.flex
+else
+ael/ael_lex.c:
+endif
 	$(ECHO_PREFIX) echo "   [FLEX] $< -> $@"
-	(cd ael; flex ael.flex; sed -e "/begin standard C headers/i#include \"asterisk.h\"" ael_lex.c > zz; mv zz ael_lex.c)
-	(cd ael; sed 's@#if __STDC_VERSION__ >= 199901L@#if !defined __STDC_VERSION__ || __STDC_VERSION__ >= 199901L@' ael_lex.c > zz; mv zz ael_lex.c)
+	$(ECHO_PREFIX) (cd ael; flex ael.flex; sed -e "/begin standard C headers/i#include \"asterisk.h\"" ael_lex.c > zz; mv zz ael_lex.c)
+	$(ECHO_PREFIX) (cd ael; sed 's@#if __STDC_VERSION__ >= 199901L@#if !defined __STDC_VERSION__ || __STDC_VERSION__ >= 199901L@' ael_lex.c > zz; mv zz ael_lex.c)
 
+ifneq ($(BISON),)
 ael/ael.tab.c ael/ael.tab.h: ael/ael.y
+else
+ael/ael.tab.c ael/ael.tab.h:
+endif
 	$(ECHO_PREFIX) echo "   [BISON] $< -> $@"
-	(cd ael; bison -v -d ael.y)
+	$(ECHO_PREFIX) (cd ael; bison -v -d ael.y)
 
 ael/pval.o: ael/pval.c

More information about the asterisk-commits mailing list