Diff for /embedaddon/pcre/configure.ac between versions 1.1.1.4 and 1.1.1.5

version 1.1.1.4, 2013/07/22 08:25:55 version 1.1.1.5, 2014/06/15 19:46:03
Line 9  dnl The PCRE_PRERELEASE feature is for identifying rel Line 9  dnl The PCRE_PRERELEASE feature is for identifying rel
 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.
   
 m4_define(pcre_major, [8])  m4_define(pcre_major, [8])
m4_define(pcre_minor, [33])m4_define(pcre_minor, [34])
 m4_define(pcre_prerelease, [])  m4_define(pcre_prerelease, [])
m4_define(pcre_date, [2013-05-28])m4_define(pcre_date, [2013-12-15])
   
 # NOTE: The CMakeLists.txt file searches for the above variables in the first  # NOTE: The CMakeLists.txt file searches for the above variables in the first
 # 50 lines of this file. Please update that if the variables above are moved.  # 50 lines of this file. Please update that if the variables above are moved.
   
 # Libtool shared library interface versions (current:revision:age)  # Libtool shared library interface versions (current:revision:age)
m4_define(libpcre_version, [3:1:2])m4_define(libpcre_version, [3:2:2])
m4_define(libpcre16_version, [2:1:2])m4_define(libpcre16_version, [2:2:2])
m4_define(libpcre32_version, [0:1:0])m4_define(libpcre32_version, [0:2:0])
 m4_define(libpcreposix_version, [0:2:0])  m4_define(libpcreposix_version, [0:2:0])
 m4_define(libpcrecpp_version, [0:0:0])  m4_define(libpcrecpp_version, [0:0:0])
   
Line 275  AC_ARG_WITH(link-size, Line 275  AC_ARG_WITH(link-size,
                            [internal link size (2, 3, or 4 allowed; default=2)]),                             [internal link size (2, 3, or 4 allowed; default=2)]),
             , with_link_size=2)              , with_link_size=2)
   
   # Handle --with-parens-nest-limit=N
   AC_ARG_WITH(parens-nest-limit,
               AS_HELP_STRING([--with-parens-nest-limit=N],
                              [nested parentheses limit (default=250)]),
               , with_parens_nest_limit=250)
   
 # Handle --with-match-limit=N  # Handle --with-match-limit=N
 AC_ARG_WITH(match-limit,  AC_ARG_WITH(match-limit,
             AS_HELP_STRING([--with-match-limit=N],              AS_HELP_STRING([--with-match-limit=N],
Line 784  AC_DEFINE_UNQUOTED([POSIX_MALLOC_THRESHOLD], [$with_po Line 790  AC_DEFINE_UNQUOTED([POSIX_MALLOC_THRESHOLD], [$with_po
   faster than using malloc() for each call. The threshold above which    faster than using malloc() for each call. The threshold above which
   the stack is no longer used is defined by POSIX_MALLOC_THRESHOLD.])    the stack is no longer used is defined by POSIX_MALLOC_THRESHOLD.])
   
   AC_DEFINE_UNQUOTED([PARENS_NEST_LIMIT], [$with_parens_nest_limit], [
     The value of PARENS_NEST_LIMIT specifies the maximum depth of nested
     parentheses (of any kind) in a pattern. This limits the amount of system
     stack that is used while compiling a pattern.])
   
 AC_DEFINE_UNQUOTED([MATCH_LIMIT], [$with_match_limit], [  AC_DEFINE_UNQUOTED([MATCH_LIMIT], [$with_match_limit], [
   The value of MATCH_LIMIT determines the default number of times the    The value of MATCH_LIMIT determines the default number of times the
   internal match() function can be called during a single execution of    internal match() function can be called during a single execution of
Line 957  if test "$enable_pcretest_libreadline" = "yes"; then Line 968  if test "$enable_pcretest_libreadline" = "yes"; then
   fi    fi
 fi  fi
   
# Check for valgrind# Handle valgrind support
   
 if test "$enable_valgrind" = "yes"; then  if test "$enable_valgrind" = "yes"; then
   m4_ifdef([PKG_CHECK_MODULES],    m4_ifdef([PKG_CHECK_MODULES],
Line 965  if test "$enable_valgrind" = "yes"; then Line 976  if test "$enable_valgrind" = "yes"; then
            [AC_MSG_ERROR([pkg-config not supported])])             [AC_MSG_ERROR([pkg-config not supported])])
 fi  fi
   
# test code coverage reporting# Handle code coverage reporting support
 if test "$enable_coverage" = "yes"; then  if test "$enable_coverage" = "yes"; then
   if test "x$GCC" != "xyes"; then    if test "x$GCC" != "xyes"; then
     AC_MSG_ERROR([Code coverage reports can only be generated when using GCC])      AC_MSG_ERROR([Code coverage reports can only be generated when using GCC])
Line 996  if test "$enable_coverage" = "yes"; then Line 1007  if test "$enable_coverage" = "yes"; then
     AC_MSG_ERROR([genhtml not found])      AC_MSG_ERROR([genhtml not found])
   fi    fi
   
  AC_DEFINE([SUPPORT_GCOV],[1], [  # Set flags needed for gcov
    Define to allow pcretest and pcregrep to be linked with gcov, so that they 
    are able to generate code coverage reports.]) 
 
  # And add flags needed for gcov 
   GCOV_CFLAGS="-O0 -ggdb3 -fprofile-arcs -ftest-coverage"    GCOV_CFLAGS="-O0 -ggdb3 -fprofile-arcs -ftest-coverage"
   GCOV_CXXFLAGS="-O0 -ggdb3 -fprofile-arcs -ftest-coverage"    GCOV_CXXFLAGS="-O0 -ggdb3 -fprofile-arcs -ftest-coverage"
   GCOV_LIBS="-lgcov"    GCOV_LIBS="-lgcov"
Line 1075  $PACKAGE-$VERSION configuration summary: Line 1082  $PACKAGE-$VERSION configuration summary:
     Use stack recursion ............. : ${enable_stack_for_recursion}      Use stack recursion ............. : ${enable_stack_for_recursion}
     POSIX mem threshold ............. : ${with_posix_malloc_threshold}      POSIX mem threshold ............. : ${with_posix_malloc_threshold}
     Internal link size .............. : ${with_link_size}      Internal link size .............. : ${with_link_size}
       Nested parentheses limit ........ : ${with_parens_nest_limit}
     Match limit ..................... : ${with_match_limit}      Match limit ..................... : ${with_match_limit}
     Match limit recursion ........... : ${with_match_limit_recursion}      Match limit recursion ........... : ${with_match_limit_recursion}
     Build shared libs ............... : ${enable_shared}      Build shared libs ............... : ${enable_shared}

Removed from v.1.1.1.4  
changed lines
  Added in v.1.1.1.5


FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>