/[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 126 by ph10, Mon Mar 19 10:20:14 2007 UTC revision 145 by ph10, Wed Apr 4 14:06:52 2007 UTC
# Line 8  dnl empty. Line 8  dnl empty.
8    
9  m4_define(pcre_major, [7])  m4_define(pcre_major, [7])
10  m4_define(pcre_minor, [1])  m4_define(pcre_minor, [1])
11  m4_define(pcre_prerelease, [-RC2])  m4_define(pcre_prerelease, [-RC4])
12  m4_define(pcre_date, [2007-03-19])  m4_define(pcre_date, [2007-04-04])
13    
14  # Libtool shared library interface versions (current:revision:age)  # Libtool shared library interface versions (current:revision:age)
15  m4_define(libpcre_version, [0:1:0])  m4_define(libpcre_version, [0:1:0])
# Line 26  AC_PROG_CXX Line 26  AC_PROG_CXX
26  AC_PROG_INSTALL  AC_PROG_INSTALL
27  AC_LIBTOOL_WIN32_DLL  AC_LIBTOOL_WIN32_DLL
28  AC_PROG_LIBTOOL  AC_PROG_LIBTOOL
29    AC_PROG_LN_S
30    
31  PCRE_MAJOR="pcre_major"  PCRE_MAJOR="pcre_major"
32  PCRE_MINOR="pcre_minor"  PCRE_MINOR="pcre_minor"
# Line 49  AC_ARG_ENABLE(cpp, Line 50  AC_ARG_ENABLE(cpp,
50                               [disable C++ support]),                               [disable C++ support]),
51                , enable_cpp=yes)                , enable_cpp=yes)
52    
53    # Handle --enable-rebuild-chartables
54    AC_ARG_ENABLE(rebuild-chartables,
55                  AS_HELP_STRING([--enable-rebuild-chartables],
56                                 [rebuild character tables in current locale]),
57                  , enable_rebuild_chartables=no)
58    
59  # Handle --enable-utf8 (disabled by default)  # Handle --enable-utf8 (disabled by default)
60  AC_ARG_ENABLE(utf8,  AC_ARG_ENABLE(utf8,
61                AS_HELP_STRING([--enable-utf8],                AS_HELP_STRING([--enable-utf8],
# Line 90  enable_newline="$ac_pcre_newline" Line 97  enable_newline="$ac_pcre_newline"
97  # Handle --enable-ebcdic  # Handle --enable-ebcdic
98  AC_ARG_ENABLE(ebcdic,  AC_ARG_ENABLE(ebcdic,
99                AS_HELP_STRING([--enable-ebcdic],                AS_HELP_STRING([--enable-ebcdic],
100                               [assume EBCDIC coding rather than ASCII]),                               [assume EBCDIC coding rather than ASCII (implies --enable-rebuild-chartables)]),
101                , enable_ebcdic=no)                , enable_ebcdic=no)
102    
103  # Handle --disable-stack-for-recursion  # Handle --disable-stack-for-recursion
# Line 147  then Line 154  then
154    enable_utf8=no    enable_utf8=no
155  fi  fi
156    
157    # Make sure that if enable_ebcdic is set, rebuild_chartables is also enabled.
158    #
159    if test "x$enable_ebcdic" = "xyes"
160    then
161      enable_rebuild_chartables=yes
162    fi
163    
164  # Convert the newline identifier into the appropriate integer value.  # Convert the newline identifier into the appropriate integer value.
165  case "$enable_newline" in  case "$enable_newline" in
166    lf)   ac_pcre_newline_value=10   ;;    lf)   ac_pcre_newline_value=10   ;;
# Line 193  then Line 207  then
207  AC_LANG_PUSH(C++)  AC_LANG_PUSH(C++)
208    
209  # We could be more clever here, given we're doing AC_SUBST with this  # We could be more clever here, given we're doing AC_SUBST with this
210  # (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
211  # so it's easy to change back to 'regular' autoconf vars if we needed to.  # so it's easy to change back to 'regular' autoconf vars if we needed to.
212  AC_CHECK_HEADERS(string, [pcre_have_cpp_headers="1"],  AC_CHECK_HEADERS(string, [pcre_have_cpp_headers="1"],
213                           [pcre_have_cpp_headers="0"])                           [pcre_have_cpp_headers="0"])
# Line 209  AC_SUBST(pcre_have_bits_type_traits) Line 223  AC_SUBST(pcre_have_bits_type_traits)
223    
224  # Conditional compilation  # Conditional compilation
225  AM_CONDITIONAL(WITH_PCRE_CPP, test "x$enable_cpp" = "xyes")  AM_CONDITIONAL(WITH_PCRE_CPP, test "x$enable_cpp" = "xyes")
226    AM_CONDITIONAL(WITH_REBUILD_CHARTABLES, test "x$enable_rebuild_chartables" = "xyes")
227    
228  # Checks for typedefs, structures, and compiler characteristics.  # Checks for typedefs, structures, and compiler characteristics.
229    
# Line 251  fi Line 266  fi
266  if test "$enable_stack_for_recursion" = "no"; then  if test "$enable_stack_for_recursion" = "no"; then
267    AC_DEFINE([NO_RECURSE], [], [    AC_DEFINE([NO_RECURSE], [], [
268      PCRE uses recursive function calls to handle backtracking while      PCRE uses recursive function calls to handle backtracking while
269      matching.  This can sometimes be a problem on systems that have      matching. This can sometimes be a problem on systems that have
270      stacks of limited size. Define NO_RECURSE to get a version that      stacks of limited size. Define NO_RECURSE to get a version that
271      doesn't use recursion in the match() function; instead it creates      doesn't use recursion in the match() function; instead it creates
272      its own stack by steam using pcre_recurse_malloc() to obtain memory      its own stack by steam using pcre_recurse_malloc() to obtain memory
# Line 323  AC_DEFINE([MAX_DUPLENGTH], [30000], [ Line 338  AC_DEFINE([MAX_DUPLENGTH], [30000], [
338    change it. Care must be taken if it is increased, because it guards    change it. Care must be taken if it is increased, because it guards
339    against integer overflow caused by enormously large patterns.])    against integer overflow caused by enormously large patterns.])
340    
341  AH_VERBATIM([PCRE_DATA_SCOPE], [  AH_VERBATIM([PCRE_EXP_DEFN], [
342  /* If you are compiling for a system other than a Unix-like system or  /* If you are compiling for a system other than a Unix-like system or
343     Win32, and it needs some magic to be inserted before the definition     Win32, and it needs some magic to be inserted before the definition
344     of a function that is exported by the library, define this macro to     of a function that is exported by the library, define this macro to
# Line 333  AH_VERBATIM([PCRE_DATA_SCOPE], [ Line 348  AH_VERBATIM([PCRE_DATA_SCOPE], [
348     every exported function that is part of the external API. It does     every exported function that is part of the external API. It does
349     not appear on functions that are "external" in the C sense, but     not appear on functions that are "external" in the C sense, but
350     which are internal to the library. */     which are internal to the library. */
351  #undef PCRE_DATA_SCOPE])  #undef PCRE_EXP_DEFN])
352    
353  if test "$enable_ebcdic" = "yes"; then  if test "$enable_ebcdic" = "yes"; then
354    AC_DEFINE_UNQUOTED([EBCDIC], [], [    AC_DEFINE_UNQUOTED([EBCDIC], [], [
# Line 374  AC_SUBST(DISTCHECK_CONFIGURE_FLAGS) Line 389  AC_SUBST(DISTCHECK_CONFIGURE_FLAGS)
389  # Produce these files, in addition to config.h.  # Produce these files, in addition to config.h.
390  AC_CONFIG_FILES(  AC_CONFIG_FILES(
391          Makefile          Makefile
         RunGrepTest  
         RunTest  
392          libpcre.pc          libpcre.pc
393          libpcrecpp.pc          libpcrecpp.pc
394          pcre-config          pcre-config
# Line 385  AC_CONFIG_FILES( Line 398  AC_CONFIG_FILES(
398  )  )
399    
400  # Make the generated script files executable.  # Make the generated script files executable.
401  AC_CONFIG_COMMANDS([script-chmod], [chmod a+x RunTest RunGrepTest pcre-config])  AC_CONFIG_COMMANDS([script-chmod], [chmod a+x pcre-config])
402    
403    # Make sure that pcre_chartables.c is removed in case the method for
404    # creating it was changed by reconfiguration.
405    AC_CONFIG_COMMANDS([delete-old-chartables], [rm -f pcre_chartables.c])
406    
407  AC_OUTPUT  AC_OUTPUT
408    
# Line 413  $PACKAGE-$VERSION configuration summary: Line 430  $PACKAGE-$VERSION configuration summary:
430      Unicode properties ..... : ${enable_unicode_properties}      Unicode properties ..... : ${enable_unicode_properties}
431      Newline char/sequence .. : ${enable_newline}      Newline char/sequence .. : ${enable_newline}
432      EBCDIC coding .......... : ${enable_ebcdic}      EBCDIC coding .......... : ${enable_ebcdic}
433        Rebuild char tables .... : ${enable_rebuild_chartables}
434      Use stack recursion .... : ${enable_stack_for_recursion}      Use stack recursion .... : ${enable_stack_for_recursion}
435      POSIX mem threshold .... : ${with_posix_malloc_threshold}      POSIX mem threshold .... : ${with_posix_malloc_threshold}
436      Internal link size ..... : ${with_link_size}      Internal link size ..... : ${with_link_size}
Legend:
Removed from v.126  
changed lines
  Added in v.145
  ViewVC Help
Powered by ViewVC 1.1.5