Compress lexer tables for usual download in Cydia.

diff --git a/Makefile.am b/Makefile.am
index 343b0500a3b9a38c8730189cf4cc128a3a204072..e67adb7ecb2da8a2310032f4bc3504eb8c3563a0 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -105,7 +105,7 @@ Scanner.lpp: Scanner.lpp.in UnicodeIDStart.l UnicodeIDContinue.l
 
 CLEANFILES += Scanner.cpp Scanner.output lex.backup
 Scanner.cpp: Scanner.lpp
-       $(FLEX) -o $@ -T $< 2>Scanner.output || (grep -F '$<:' Scanner.output; false)
+       $(FLEX) $(LFLAGS) -o $@ -T $< 2>Scanner.output || (grep -F '$<:' Scanner.output; false)
        grep -E '^(No backing up\.|Compressed tables always back up\.)$$' lex.backup >/dev/null
        ! grep -F ': warning, ' Scanner.output || true
 

diff --git a/Makefile.in b/Makefile.in
index 9d6be4329ae8252f0604c0656ca51344a737d3c3..04b082ee95396b24bad87c31613434f0269875d0 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -426,6 +426,7 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
+LFLAGS = @LFLAGS@
 LIBFFI_CFLAGS = @LIBFFI_CFLAGS@
 LIBFFI_LIBS = @LIBFFI_LIBS@
 LIBOBJS = @LIBOBJS@
@@ -1308,7 +1309,7 @@ Parser.ypp: Parser.ypp.in
 Scanner.lpp: Scanner.lpp.in UnicodeIDStart.l UnicodeIDContinue.l
        $(srcdir)/Filter.sh $< >$@ $(filters)
 Scanner.cpp: Scanner.lpp
-       $(FLEX) -o $@ -T $< 2>Scanner.output || (grep -F '$<:' Scanner.output; false)
+       $(FLEX) $(LFLAGS) -o $@ -T $< 2>Scanner.output || (grep -F '$<:' Scanner.output; false)
        grep -E '^(No backing up\.|Compressed tables always back up\.)$$' lex.backup >/dev/null
        ! grep -F ': warning, ' Scanner.output || true
 

diff --git a/Scanner.lpp.in b/Scanner.lpp.in
index bcbd0d00d99e80e11c0f2a565099ce4a8466783d..e56b5470877ad4209dde80fdbfa7a2a7cf2cdbfa 100644 (file)
--- a/Scanner.lpp.in
+++ b/Scanner.lpp.in
@@ -204,9 +204,6 @@ static void U(char *&local, const char *text, yy_size_t &i) {
 %option reentrant
 %option stack
 
-%option full
-%option ecs
-
 U1 [\x00-\x7f]
 U0 [\x80-\xbf]
 U2 [\xc2-\xdf]

diff --git a/apple-configure.sh b/apple-configure.sh
index 457cbf621675b350b329e0cff75a0cb848efaa8a..7e1c50d3c59eafa1b856fadcae221904d6b602ad 100755 (executable)
--- a/apple-configure.sh
+++ b/apple-configure.sh
@@ -116,5 +116,5 @@ for arch in armv6 armv7 armv7s arm64; do
 
     build "ios-${arch}" iphoneos "-arch ${arch} -miphoneos-version-min=${min}" --host=arm-apple-darwin10 \
         CFLAGS="${gof[*]}" CXXFLAGS="${gof[*]}" OBJCXXFLAGS="${gof[*]}" \
-        CPPFLAGS="${cpf}" LDFLAGS="${ldf}" "${flg[@]}" --host=arm-apple-darwin10
+        CPPFLAGS="${cpf}" LDFLAGS="${ldf}" LFLAGS="--ecs --meta-ecs" "${flg[@]}"
 done

diff --git a/configure b/configure
index 8be0f218a8b112553ba464de02f0a74423efc9d4..b537939fde9eb819aafd4760d0b159ca42c40bd1 100755 (executable)
--- a/configure
+++ b/configure
@@ -669,6 +669,7 @@ PTHREAD_CFLAGS
 PTHREAD_LIBS
 PTHREAD_CC
 ax_pthread_config
+LFLAGS
 GNUTAR
 GPERF
 FLEX
@@ -849,6 +850,7 @@ BISON
 FLEX
 GPERF
 GNUTAR
+LFLAGS
 WEBKIT_CFLAGS
 WEBKIT_LIBS
 LIBFFI_CFLAGS
@@ -1530,6 +1532,7 @@ Some influential environment variables:
   FLEX        the fast lexical analyser generator
   GPERF       perfect hash function generator
   GNUTAR      a very sticky lump of files
+  LFLAGS      flex flags
   WEBKIT_CFLAGS
               C compiler flags for WEBKIT, overriding pkg-config
   WEBKIT_LIBS linker flags for WEBKIT, overriding pkg-config
@@ -17229,6 +17232,11 @@ fi
 
 
 
+if test "x$LFLAGS" = x; then :
+  LFLAGS="--full --ecs"
+fi
+
+
 
 
 

diff --git a/configure.ac b/configure.ac
index a8ef86bb20859147ca55fb628775bb18622bf882..b4828707f3452de3a37150b6c4b21b3e5d36dfd8 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -93,6 +93,9 @@ AC_DEFUN([CY_TRY], [
     AS_IF([test "x$cy_good" = x1], ]$4[, ]$5[)
 ]) dnl }}}
 
+AC_ARG_VAR([LFLAGS], [flex flags])
+AS_IF([test "x$LFLAGS" = x], [LFLAGS="--full --ecs"])
+
 AC_DEFUN([CY_TEST_FLAG_], [
     AC_LANG_PUSH(]$2[)
     AC_MSG_CHECKING([for ]]$4[[ ]]$1[)