[asterisk-commits] tilghman: branch 1.4 r242520 - in /branches/1.4: ./ include/asterisk/ pbx/ pb...
SVN commits to the Asterisk project
asterisk-commits at lists.digium.com
Sun Jan 24 00:33:07 CST 2010
Author: tilghman
Date: Sun Jan 24 00:33:01 2010
New Revision: 242520
URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=242520
Log:
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.4/configure
branches/1.4/configure.ac
branches/1.4/include/asterisk/autoconfig.h.in
branches/1.4/makeopts.in
branches/1.4/pbx/Makefile
branches/1.4/pbx/ael/ael_lex.c
Modified: branches/1.4/configure.ac
URL: http://svnview.digium.com/svn/asterisk/branches/1.4/configure.ac?view=diff&rev=242520&r1=242519&r2=242520
==============================================================================
--- branches/1.4/configure.ac (original)
+++ branches/1.4/configure.ac Sun Jan 24 00:33:01 2010
@@ -142,6 +142,8 @@
AC_SUBST(GNU_LD)
AC_PATH_PROG([AWK], [awk], :)
+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.4/include/asterisk/autoconfig.h.in
URL: http://svnview.digium.com/svn/asterisk/branches/1.4/include/asterisk/autoconfig.h.in?view=diff&rev=242520&r1=242519&r2=242520
==============================================================================
--- branches/1.4/include/asterisk/autoconfig.h.in (original)
+++ branches/1.4/include/asterisk/autoconfig.h.in Sun Jan 24 00:33:01 2010
@@ -457,7 +457,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. */
@@ -646,11 +646,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. */
@@ -670,6 +670,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
@@ -691,46 +696,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.4/makeopts.in
URL: http://svnview.digium.com/svn/asterisk/branches/1.4/makeopts.in?view=diff&rev=242520&r1=242519&r2=242520
==============================================================================
--- branches/1.4/makeopts.in (original)
+++ branches/1.4/makeopts.in Sun Jan 24 00:33:01 2010
@@ -8,6 +8,8 @@
INSTALL=@INSTALL@
AWK=@AWK@
+BISON=@BISON@
+FLEX=@FLEX@
GREP=@GREP@
AR=@AR@
RANLIB=@RANLIB@
Modified: branches/1.4/pbx/Makefile
URL: http://svnview.digium.com/svn/asterisk/branches/1.4/pbx/Makefile?view=diff&rev=242520&r1=242519&r2=242520
==============================================================================
--- branches/1.4/pbx/Makefile (original)
+++ branches/1.4/pbx/Makefile Sun Jan 24 00:33:01 2010
@@ -9,7 +9,7 @@
# the GNU General Public License
#
--include ../menuselect.makeopts ../menuselect.makedeps
+-include ../menuselect.makeopts ../menuselect.makedeps ../makeopts
MENUSELECT_CATEGORY=PBX
MENUSELECT_DESCRIPTION=PBX Modules
@@ -44,14 +44,22 @@
$(if $(filter pbx_ael,$(EMBEDDED_MODS)),modules.link,pbx_ael.so): ael/ael.tab.o ael/ael_lex.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 -i -e "/begin standard C headers/i#include \"asterisk.h\"" 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 -i -e "/begin standard C headers/i#include \"asterisk.h\"" 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)
dundi-parser.o: dundi-parser.h
dundi-parser.o: _ASTCFLAGS+=-I.
Modified: branches/1.4/pbx/ael/ael_lex.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.4/pbx/ael/ael_lex.c?view=diff&rev=242520&r1=242519&r2=242520
==============================================================================
--- branches/1.4/pbx/ael/ael_lex.c (original)
+++ branches/1.4/pbx/ael/ael_lex.c Sun Jan 24 00:33:01 2010
@@ -55,6 +55,7 @@
typedef unsigned char flex_uint8_t;
typedef unsigned short int flex_uint16_t;
typedef unsigned int flex_uint32_t;
+#endif /* ! C99 */
/* Limits of integral types. */
#ifndef INT8_MIN
@@ -84,8 +85,6 @@
#ifndef UINT32_MAX
#define UINT32_MAX (4294967295U)
#endif
-
-#endif /* ! C99 */
#endif /* ! FLEXINT_H */
@@ -951,7 +950,7 @@
#define STORE_POS
#define STORE_LOC
#endif
-#line 954 "ael_lex.c"
+#line 953 "ael_lex.c"
#define INITIAL 0
#define paren 1
@@ -1103,7 +1102,7 @@
/* This used to be an fputs(), but since the string might contain NUL's,
* we now use fwrite().
*/
-#define ECHO do { if (fwrite( yytext, yyleng, 1, yyout )) {} } while (0)
+#define ECHO fwrite( yytext, yyleng, 1, yyout )
#endif
/* Gets input and stuffs it into "buf". number of characters read, or YY_NULL,
@@ -1114,7 +1113,7 @@
if ( YY_CURRENT_BUFFER_LVALUE->yy_is_interactive ) \
{ \
int c = '*'; \
- size_t n; \
+ int n; \
for ( n = 0; n < max_size && \
(c = getc( yyin )) != EOF && c != '\n'; ++n ) \
buf[n] = (char) c; \
@@ -1202,7 +1201,7 @@
#line 216 "ael.flex"
-#line 1205 "ael_lex.c"
+#line 1204 "ael_lex.c"
yylval = yylval_param;
@@ -2028,7 +2027,7 @@
#line 649 "ael.flex"
YY_FATAL_ERROR( "flex scanner jammed" );
YY_BREAK
-#line 2031 "ael_lex.c"
+#line 2030 "ael_lex.c"
case YY_END_OF_BUFFER:
{
More information about the asterisk-commits
mailing list