/[pcre]/code/trunk/configure.ac
ViewVC logotype

Diff of /code/trunk/configure.ac

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 654 by ph10, Tue Aug 2 11:00:40 2011 UTC revision 797 by ph10, Sun Dec 11 17:09:37 2011 UTC
# Line 9  dnl The PCRE_PRERELEASE feature is for i Line 9  dnl The PCRE_PRERELEASE feature is for i
9  dnl be defined as -RC2, for example. For real releases, it should be empty.  dnl be defined as -RC2, for example. For real releases, it should be empty.
10    
11  m4_define(pcre_major, [8])  m4_define(pcre_major, [8])
12  m4_define(pcre_minor, [13])  m4_define(pcre_minor, [21])
13  m4_define(pcre_prerelease, [-RC1])  m4_define(pcre_prerelease, [])
14  m4_define(pcre_date, [2011-08-02])  m4_define(pcre_date, [2011-12-12])
15    
16  # Libtool shared library interface versions (current:revision:age)  # Libtool shared library interface versions (current:revision:age)
17  m4_define(libpcre_version, [0:1:0])  m4_define(libpcre_version, [0:1:0])
# Line 112  AC_ARG_ENABLE(cpp, Line 112  AC_ARG_ENABLE(cpp,
112                , enable_cpp=yes)                , enable_cpp=yes)
113  AC_SUBST(enable_cpp)  AC_SUBST(enable_cpp)
114    
115    # Handle --enable-jit (disabled by default)
116    AC_ARG_ENABLE(jit,
117                  AS_HELP_STRING([--enable-jit],
118                                 [enable Just-In-Time compiling support]),
119                  , enable_jit=no)
120    
121    # Handle --disable-pcregrep-jit (enabled by default)
122    AC_ARG_ENABLE(pcregrep-jit,
123                  AS_HELP_STRING([--disable-pcregrep-jit],
124                                 [disable JIT support in pcregrep]),
125                  , enable_pcregrep_jit=yes)
126    
127  # Handle --enable-rebuild-chartables  # Handle --enable-rebuild-chartables
128  AC_ARG_ENABLE(rebuild-chartables,  AC_ARG_ENABLE(rebuild-chartables,
129                AS_HELP_STRING([--enable-rebuild-chartables],                AS_HELP_STRING([--enable-rebuild-chartables],
# Line 400  AC_SUBST(pcre_have_bits_type_traits) Line 412  AC_SUBST(pcre_have_bits_type_traits)
412  # Conditional compilation  # Conditional compilation
413  AM_CONDITIONAL(WITH_PCRE_CPP, test "x$enable_cpp" = "xyes")  AM_CONDITIONAL(WITH_PCRE_CPP, test "x$enable_cpp" = "xyes")
414  AM_CONDITIONAL(WITH_REBUILD_CHARTABLES, test "x$enable_rebuild_chartables" = "xyes")  AM_CONDITIONAL(WITH_REBUILD_CHARTABLES, test "x$enable_rebuild_chartables" = "xyes")
415    AM_CONDITIONAL(WITH_JIT, test "x$enable_jit" = "xyes")
416    AM_CONDITIONAL(WITH_UTF8, test "x$enable_utf8" = "xyes")
417    
418  # Checks for typedefs, structures, and compiler characteristics.  # Checks for typedefs, structures, and compiler characteristics.
419    
# Line 468  AC_SUBST(PCRE_STATIC_CFLAG) Line 482  AC_SUBST(PCRE_STATIC_CFLAG)
482    
483  # Here is where pcre specific defines are handled  # Here is where pcre specific defines are handled
484    
485    if test "$enable_jit" = "yes"; then
486      AC_DEFINE([SUPPORT_JIT], [], [
487        Define to enable support for Just-In-Time compiling.])
488    else
489      enable_pcregrep_jit="no"
490    fi
491    
492    if test "$enable_pcregrep_jit" = "yes"; then
493      AC_DEFINE([SUPPORT_PCREGREP_JIT], [], [
494        Define to enable JIT support in pcregrep.])
495    fi
496    
497  if test "$enable_utf8" = "yes"; then  if test "$enable_utf8" = "yes"; then
498    AC_DEFINE([SUPPORT_UTF8], [], [    AC_DEFINE([SUPPORT_UTF8], [], [
499      Define to enable support for the UTF-8 Unicode encoding. This will      Define to enable support for the UTF-8 Unicode encoding. This will
# Line 478  fi Line 504  fi
504    
505  if test "$enable_unicode_properties" = "yes"; then  if test "$enable_unicode_properties" = "yes"; then
506    AC_DEFINE([SUPPORT_UCP], [], [    AC_DEFINE([SUPPORT_UCP], [], [
507      Define to enable support for Unicode properties])      Define to enable support for Unicode properties.])
508  fi  fi
509    
510  if test "$enable_stack_for_recursion" = "no"; then  if test "$enable_stack_for_recursion" = "no"; then
# Line 643  AC_SUBST(EXTRA_LIBPCREPOSIX_LDFLAGS) Line 669  AC_SUBST(EXTRA_LIBPCREPOSIX_LDFLAGS)
669  AC_SUBST(EXTRA_LIBPCRECPP_LDFLAGS)  AC_SUBST(EXTRA_LIBPCRECPP_LDFLAGS)
670    
671  # When we run 'make distcheck', use these arguments.  # When we run 'make distcheck', use these arguments.
672  DISTCHECK_CONFIGURE_FLAGS="--enable-cpp --enable-unicode-properties"  DISTCHECK_CONFIGURE_FLAGS="--enable-jit --enable-cpp --enable-unicode-properties"
673  AC_SUBST(DISTCHECK_CONFIGURE_FLAGS)  AC_SUBST(DISTCHECK_CONFIGURE_FLAGS)
674    
675  # Check that, if --enable-pcregrep-libz or --enable-pcregrep-libbz2 is  # Check that, if --enable-pcregrep-libz or --enable-pcregrep-libbz2 is
# Line 731  $PACKAGE-$VERSION configuration summary: Line 757  $PACKAGE-$VERSION configuration summary:
757      Extra libraries ................. : ${LIBS}      Extra libraries ................. : ${LIBS}
758    
759      Build C++ library ............... : ${enable_cpp}      Build C++ library ............... : ${enable_cpp}
760        Enable JIT compiling support .... : ${enable_jit}
761      Enable UTF-8 support ............ : ${enable_utf8}      Enable UTF-8 support ............ : ${enable_utf8}
762      Unicode properties .............. : ${enable_unicode_properties}      Unicode properties .............. : ${enable_unicode_properties}
763      Newline char/sequence ........... : ${enable_newline}      Newline char/sequence ........... : ${enable_newline}
# Line 744  $PACKAGE-$VERSION configuration summary: Line 771  $PACKAGE-$VERSION configuration summary:
771      Match limit recursion ........... : ${with_match_limit_recursion}      Match limit recursion ........... : ${with_match_limit_recursion}
772      Build shared libs ............... : ${enable_shared}      Build shared libs ............... : ${enable_shared}
773      Build static libs ............... : ${enable_static}      Build static libs ............... : ${enable_static}
774        Use JIT in pcregrep ............. : ${enable_pcregrep_jit}
775      Buffer size for pcregrep ........ : ${with_pcregrep_bufsize}      Buffer size for pcregrep ........ : ${with_pcregrep_bufsize}
776      Link pcregrep with libz ......... : ${enable_pcregrep_libz}      Link pcregrep with libz ......... : ${enable_pcregrep_libz}
777      Link pcregrep with libbz2 ....... : ${enable_pcregrep_libbz2}      Link pcregrep with libbz2 ....... : ${enable_pcregrep_libbz2}

Legend:
Removed from v.654  
changed lines
  Added in v.797

  ViewVC Help
Powered by ViewVC 1.1.5