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

Diff of /code/trunk/configure.ac

Parent Directory | Revision Log | View Patch Patch

-revision 123 by ph10,
Mon Mar 12 15:19:06 2007 UTC
+revision 221 by ph10,
Fri Aug 17 09:25:08 2007 UTC
 Line 7 
 dnl be defined as -RC2, for example. For
  dnl empty.
  m4_define(pcre_major, [7])
- m4_define(pcre_minor, [1])
+ m4_define(pcre_minor, [3])
- m4_define(pcre_prerelease, [-RC1])
+ m4_define(pcre_prerelease, [-RC6])
- m4_define(pcre_date, [2007-03-12])
+ m4_define(pcre_date, [2007-08-17])
  # Libtool shared library interface versions (current:revision:age)
  m4_define(libpcre_version, [0:1:0])
 Line 21 
 AC_INIT(PCRE, pcre_major.pcre_minor[]pcr
  AC_CONFIG_SRCDIR([pcre.h.in])
  AM_INIT_AUTOMAKE([dist-bzip2 dist-zip])
  AC_CONFIG_HEADERS(config.h)
+ # The default CFLAGS and CXXFLAGS in Autoconf are "-g -O2" for gcc and just
+ # "-g" for any other compiler. There doesn't seem to be a standard way of
+ # getting rid of the -g (which I don't think is needed for a production
+ # library). This fudge seems to achieve the necessary. First, we remember the
+ # externally set values of CFLAGS and CXXFLAGS. Then call the AC_PROG_CC and
+ # AC_PROG_CXX macros to find the compilers - if CFLAGS and CXXFLAGS are not
+ # set, they will be set to Autoconf's defaults. Afterwards, if the original
+ # values were not set, remove the -g from the Autoconf defaults.
+ # (PH 02-May-07)
+ remember_set_CFLAGS="$CFLAGS"
+ remember_set_CXXFLAGS="$CXXFLAGS"
  AC_PROG_CC
  AC_PROG_CXX
+ if test "x$remember_set_CFLAGS" = "x"
+ then
+   if test "$CFLAGS" = "-g -O2"
+   then
+     CFLAGS="-O2"
+   elif test "$CFLAGS" = "-g"
+   then
+     CFLAGS=""
+   fi
+ fi
+ if test "x$remember_set_CXXFLAGS" = "x"
+ then
+   if test "$CXXFLAGS" = "-g -O2"
+   then
+     CXXFLAGS="-O2"
+   elif test "$CXXFLAGS" = "-g"
+   then
+     CXXFLAGS=""
+   fi
+ fi
  AC_PROG_INSTALL
  AC_LIBTOOL_WIN32_DLL
  AC_PROG_LIBTOOL
+ AC_PROG_LN_S
  PCRE_MAJOR="pcre_major"
  PCRE_MINOR="pcre_minor"
-Line 49 
 AC_ARG_ENABLE(cpp,
+Line 88 
 AC_ARG_ENABLE(cpp,
                               [disable C++ support]),
                , enable_cpp=yes)
+ # Handle --enable-rebuild-chartables
+ AC_ARG_ENABLE(rebuild-chartables,
+               AS_HELP_STRING([--enable-rebuild-chartables],
+                              [rebuild character tables in current locale]),
+               , enable_rebuild_chartables=no)
  # Handle --enable-utf8 (disabled by default)
  AC_ARG_ENABLE(utf8,
                AS_HELP_STRING([--enable-utf8],
-Line 64 
 AC_ARG_ENABLE(unicode-properties,
+Line 109 
 AC_ARG_ENABLE(unicode-properties,
  # Handle --enable-newline=NL
  dnl AC_ARG_ENABLE(newline,
  dnl               AS_HELP_STRING([--enable-newline=NL],
- dnl                              [use NL as newline (lf, cr, crlf, any; default=lf)]),
+ dnl                              [use NL as newline (lf, cr, crlf, anycrlf, any; default=lf)]),
  dnl               , enable_newline=lf)
  # Separate newline options
-Line 81 
 AC_ARG_ENABLE(newline-is-crlf,
+Line 126 
 AC_ARG_ENABLE(newline-is-crlf,
                AS_HELP_STRING([--enable-newline-is-crlf],
                               [use CRLF as newline sequence]),
                ac_pcre_newline=crlf)
+ AC_ARG_ENABLE(newline-is-anycrlf,
+               AS_HELP_STRING([--enable-newline-is-anycrlf],
+                              [use CR, LF, or CRLF as newline sequence]),
+               ac_pcre_newline=anycrlf)
  AC_ARG_ENABLE(newline-is-any,
                AS_HELP_STRING([--enable-newline-is-any],
                               [use any valid Unicode newline sequence]),
-Line 90 
 enable_newline="$ac_pcre_newline"
+Line 139 
 enable_newline="$ac_pcre_newline"
  # Handle --enable-ebcdic
  AC_ARG_ENABLE(ebcdic,
                AS_HELP_STRING([--enable-ebcdic],
-                              [assume EBCDIC coding rather than ASCII]),
+                              [assume EBCDIC coding rather than ASCII; use this only in (uncommon) EBCDIC environments; it implies --enable-rebuild-chartables]),
                , enable_ebcdic=no)
  # Handle --disable-stack-for-recursion
-Line 147 
 then
+Line 196 
 then
    enable_utf8=no
  fi
+ # Make sure that if enable_ebcdic is set, rebuild_chartables is also enabled.
+ #
+ if test "x$enable_ebcdic" = "xyes"
+ then
+   enable_rebuild_chartables=yes
+ fi
  # Convert the newline identifier into the appropriate integer value.
  case "$enable_newline" in
-   lf)   ac_pcre_newline_value=10   ;;
+   lf)      ac_pcre_newline_value=10   ;;
-   cr)   ac_pcre_newline_value=13   ;;
+   cr)      ac_pcre_newline_value=13   ;;
-   crlf) ac_pcre_newline_value=3338 ;;
+   crlf)    ac_pcre_newline_value=3338 ;;
-   any)  ac_pcre_newline_value=-1   ;;
+   anycrlf) ac_pcre_newline_value=-2   ;;
+   any)     ac_pcre_newline_value=-1   ;;
    *)
    AC_MSG_ERROR([invalid argument \"$enable_newline\" to --enable-newline option])
    ;;
-Line 193 
 then
+Line 250 
 then
  AC_LANG_PUSH(C++)
  # We could be more clever here, given we're doing AC_SUBST with this
- # (eg set a var to be the name of the include file we want).  But we're not
+ # (eg set a var to be the name of the include file we want). But we're not
  # so it's easy to change back to 'regular' autoconf vars if we needed to.
  AC_CHECK_HEADERS(string, [pcre_have_cpp_headers="1"],
                           [pcre_have_cpp_headers="0"])
-Line 209 
 AC_SUBST(pcre_have_bits_type_traits)
+Line 266 
 AC_SUBST(pcre_have_bits_type_traits)
  # Conditional compilation
  AM_CONDITIONAL(WITH_PCRE_CPP, test "x$enable_cpp" = "xyes")
+ AM_CONDITIONAL(WITH_REBUILD_CHARTABLES, test "x$enable_rebuild_chartables" = "xyes")
  # Checks for typedefs, structures, and compiler characteristics.
-Line 251 
 fi
+Line 309 
 fi
  if test "$enable_stack_for_recursion" = "no"; then
    AC_DEFINE([NO_RECURSE], [], [
      PCRE uses recursive function calls to handle backtracking while
-     matching.  This can sometimes be a problem on systems that have
+     matching. This can sometimes be a problem on systems that have
      stacks of limited size. Define NO_RECURSE to get a version that
      doesn't use recursion in the match() function; instead it creates
      its own stack by steam using pcre_recurse_malloc() to obtain memory
-Line 265 
 AC_DEFINE_UNQUOTED([NEWLINE], [$ac_pcre_
+Line 323 
 AC_DEFINE_UNQUOTED([NEWLINE], [$ac_pcre_
    The value of NEWLINE determines the newline character sequence. On
    Unix-like systems, "configure" can be used to override the default,
    which is 10. The possible values are 10 (LF), 13 (CR), 3338 (CRLF),
-   or -1 (ANY).])
+   -1 (ANY), or -2 (ANYCRLF).])
  AC_DEFINE_UNQUOTED([LINK_SIZE], [$with_link_size], [
    The value of LINK_SIZE determines the number of bytes used to store
-Line 318 
 AC_DEFINE([MAX_NAME_COUNT], [10000], [
+Line 376 
 AC_DEFINE([MAX_NAME_COUNT], [10000], [
    change it. Care must be taken if it is increased, because it guards
    against integer overflow caused by enormously large patterns.])
- AC_DEFINE([MAX_DUPLENGTH], [30000], [
+ AH_VERBATIM([PCRE_EXP_DEFN], [
-   This limit is parameterized just in case anybody ever wants to
-   change it. Care must be taken if it is increased, because it guards
-   against integer overflow caused by enormously large patterns.])
- AH_VERBATIM([PCRE_DATA_SCOPE], [
  /* If you are compiling for a system other than a Unix-like system or
     Win32, and it needs some magic to be inserted before the definition
     of a function that is exported by the library, define this macro to
-Line 333 
 AH_VERBATIM([PCRE_DATA_SCOPE], [
+Line 386 
 AH_VERBATIM([PCRE_DATA_SCOPE], [
     every exported function that is part of the external API. It does
     not appear on functions that are "external" in the C sense, but
     which are internal to the library. */
- #undef PCRE_DATA_SCOPE])
+ #undef PCRE_EXP_DEFN])
  if test "$enable_ebcdic" = "yes"; then
    AC_DEFINE_UNQUOTED([EBCDIC], [], [
-Line 374 
 AC_SUBST(DISTCHECK_CONFIGURE_FLAGS)
+Line 427 
 AC_SUBST(DISTCHECK_CONFIGURE_FLAGS)
  # Produce these files, in addition to config.h.
  AC_CONFIG_FILES(
          Makefile
-         RunGrepTest
-         RunTest
          libpcre.pc
          libpcrecpp.pc
          pcre-config
-Line 385 
 AC_CONFIG_FILES(
+Line 436 
 AC_CONFIG_FILES(
  )
  # Make the generated script files executable.
- AC_CONFIG_COMMANDS([script-chmod], [chmod a+x RunTest RunGrepTest pcre-config])
+ AC_CONFIG_COMMANDS([script-chmod], [chmod a+x pcre-config])
+ # Make sure that pcre_chartables.c is removed in case the method for
+ # creating it was changed by reconfiguration.
+ AC_CONFIG_COMMANDS([delete-old-chartables], [rm -f pcre_chartables.c])
  AC_OUTPUT
-Line 413 
 $PACKAGE-$VERSION configuration summary:
+Line 468 
 $PACKAGE-$VERSION configuration summary:
      Unicode properties ..... : ${enable_unicode_properties}
      Newline char/sequence .. : ${enable_newline}
      EBCDIC coding .......... : ${enable_ebcdic}
+     Rebuild char tables .... : ${enable_rebuild_chartables}
      Use stack recursion .... : ${enable_stack_for_recursion}
      POSIX mem threshold .... : ${with_posix_malloc_threshold}
      Internal link size ..... : ${with_link_size}

 Legend:



Removed from v.123
 


changed lines


 
Added in v.221
 Legend:



Removed from v.123
 


changed lines


 
Added in v.221
-Removed from v.123
+Added in v.221

webmaster@exim.org	ViewVC Help
Powered by ViewVC 1.1.12