/[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 475 by ph10, Sat Jan 2 18:21:30 2010 UTC revision 876 by zherczeg, Sun Jan 15 09:29:56 2012 UTC
# Line 1  Line 1 
1  dnl Process this file with autoconf to produce a configure script.  dnl Process this file with autoconf to produce a configure script.
2    
3  dnl NOTE FOR MAINTAINERS: Do not use major or minor version numbers with  dnl NOTE FOR MAINTAINERS: Do not use minor version numbers 08 or 09 because
4  dnl leading zeros, because they may be treated as octal constants. The  dnl the leading zeros may cause them to be treated as invalid octal constants
5  dnl PCRE_PRERELEASE feature is for identifying release candidates. It might  dnl if a PCRE user writes code that uses PCRE_MINOR as a number. There is now
6  dnl be defined as -RC2, for example. For real releases, it should be defined  dnl a check further down that throws an error if 08 or 09 are used.
7  dnl empty.  
8    dnl The PCRE_PRERELEASE feature is for identifying release candidates. It might
9    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, [01])  m4_define(pcre_minor, [30])
13  m4_define(pcre_prerelease, [])  m4_define(pcre_prerelease, [-PT1])
14  m4_define(pcre_date, [2010-01-02])  m4_define(pcre_date, [2012-01-01])
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, [1:0:0])
18    m4_define(libpcre16_version, [0:0:0])
19  m4_define(libpcreposix_version, [0:0:0])  m4_define(libpcreposix_version, [0:0:0])
20  m4_define(libpcrecpp_version, [0:0:0])  m4_define(libpcrecpp_version, [0:0:0])
21    
# Line 22  AC_CONFIG_SRCDIR([pcre.h.in]) Line 25  AC_CONFIG_SRCDIR([pcre.h.in])
25  AM_INIT_AUTOMAKE([dist-bzip2 dist-zip])  AM_INIT_AUTOMAKE([dist-bzip2 dist-zip])
26  AC_CONFIG_HEADERS(config.h)  AC_CONFIG_HEADERS(config.h)
27    
28    # This was added at the suggestion of libtoolize (03-Jan-10)
29    AC_CONFIG_MACRO_DIR([m4])
30    
31  # The default CFLAGS and CXXFLAGS in Autoconf are "-g -O2" for gcc and just  # The default CFLAGS and CXXFLAGS in Autoconf are "-g -O2" for gcc and just
32  # "-g" for any other compiler. There doesn't seem to be a standard way of  # "-g" for any other compiler. There doesn't seem to be a standard way of
33  # getting rid of the -g (which I don't think is needed for a production  # getting rid of the -g (which I don't think is needed for a production
# Line 63  fi Line 69  fi
69  # AC_PROG_CXX will return "g++" even if no c++ compiler is installed.  # AC_PROG_CXX will return "g++" even if no c++ compiler is installed.
70  # Check for that case, and just disable c++ code if g++ doesn't run.  # Check for that case, and just disable c++ code if g++ doesn't run.
71  AC_LANG_PUSH(C++)  AC_LANG_PUSH(C++)
72  AC_COMPILE_IFELSE(AC_LANG_PROGRAM([],[]),, CXX=""; CXXCP=""; CXXFLAGS="")  AC_COMPILE_IFELSE([AC_LANG_PROGRAM([],[])],, CXX=""; CXXCP=""; CXXFLAGS="")
73  AC_LANG_POP  AC_LANG_POP
74    
75  # Check for a 64-bit integer type  # Check for a 64-bit integer type
# Line 71  AC_TYPE_INT64_T Line 77  AC_TYPE_INT64_T
77    
78  AC_PROG_INSTALL  AC_PROG_INSTALL
79  AC_LIBTOOL_WIN32_DLL  AC_LIBTOOL_WIN32_DLL
80  AC_PROG_LIBTOOL  LT_INIT
81  AC_PROG_LN_S  AC_PROG_LN_S
82    
83  PCRE_MAJOR="pcre_major"  PCRE_MAJOR="pcre_major"
# Line 79  PCRE_MINOR="pcre_minor" Line 85  PCRE_MINOR="pcre_minor"
85  PCRE_PRERELEASE="pcre_prerelease"  PCRE_PRERELEASE="pcre_prerelease"
86  PCRE_DATE="pcre_date"  PCRE_DATE="pcre_date"
87    
88    if test "$PCRE_MINOR" = "08" -o "$PCRE_MINOR" = "09"
89    then
90      echo "***"
91      echo "*** Minor version number $PCRE_MINOR must not be used. ***"
92      echo "*** Use only 01 to 07 or 10 onwards, to avoid octal issues. ***"
93      echo "***"
94      exit 1
95    fi
96    
97  AC_SUBST(PCRE_MAJOR)  AC_SUBST(PCRE_MAJOR)
98  AC_SUBST(PCRE_MINOR)  AC_SUBST(PCRE_MINOR)
99  AC_SUBST(PCRE_PRERELEASE)  AC_SUBST(PCRE_PRERELEASE)
# Line 90  then Line 105  then
105    htmldir='${docdir}/html'    htmldir='${docdir}/html'
106  fi  fi
107    
108  # Handle --disable-cpp  # Handle --disable-pcre8 (enabled by default)
109    AC_ARG_ENABLE(pcre8,
110                  AS_HELP_STRING([--disable-pcre8],
111                                 [disable 8 bit character support]),
112                  , enable_pcre8=unset)
113    AC_SUBST(enable_pcre8)
114    
115    # Handle --enable-pcre16 (disabled by default)
116    AC_ARG_ENABLE(pcre16,
117                  AS_HELP_STRING([--enable-pcre16],
118                                 [enable 16 bit character support]),
119                  , enable_pcre16=unset)
120    AC_SUBST(enable_pcre16)
121    
122    # Handle --disable-cpp. The substitution of enable_cpp is needed for use in
123    # pcre-config.
124  AC_ARG_ENABLE(cpp,  AC_ARG_ENABLE(cpp,
125                AS_HELP_STRING([--disable-cpp],                AS_HELP_STRING([--disable-cpp],
126                               [disable C++ support]),                               [disable C++ support]),
127                , enable_cpp=yes)                , enable_cpp=unset)
128    AC_SUBST(enable_cpp)
129    
130    # Handle --enable-jit (disabled by default)
131    AC_ARG_ENABLE(jit,
132                  AS_HELP_STRING([--enable-jit],
133                                 [enable Just-In-Time compiling support]),
134                  , enable_jit=no)
135    
136    # Handle --disable-pcregrep-jit (enabled by default)
137    AC_ARG_ENABLE(pcregrep-jit,
138                  AS_HELP_STRING([--disable-pcregrep-jit],
139                                 [disable JIT support in pcregrep]),
140                  , enable_pcregrep_jit=yes)
141    
142  # Handle --enable-rebuild-chartables  # Handle --enable-rebuild-chartables
143  AC_ARG_ENABLE(rebuild-chartables,  AC_ARG_ENABLE(rebuild-chartables,
# Line 105  AC_ARG_ENABLE(rebuild-chartables, Line 148  AC_ARG_ENABLE(rebuild-chartables,
148  # Handle --enable-utf8 (disabled by default)  # Handle --enable-utf8 (disabled by default)
149  AC_ARG_ENABLE(utf8,  AC_ARG_ENABLE(utf8,
150                AS_HELP_STRING([--enable-utf8],                AS_HELP_STRING([--enable-utf8],
151                               [enable UTF-8 support (incompatible with --enable-ebcdic)]),                               [another name for --enable-utf. Kept only for compatibility reasons]),
152                , enable_utf8=unset)                , enable_utf8=unset)
153    
154    # Handle --enable-utf (disabled by default)
155    AC_ARG_ENABLE(utf,
156                  AS_HELP_STRING([--enable-utf],
157                                 [enable UTF-8/16 support (incompatible with --enable-ebcdic)]),
158                  , enable_utf=unset)
159    
160  # Handle --enable-unicode-properties  # Handle --enable-unicode-properties
161  AC_ARG_ENABLE(unicode-properties,  AC_ARG_ENABLE(unicode-properties,
162                AS_HELP_STRING([--enable-unicode-properties],                AS_HELP_STRING([--enable-unicode-properties],
163                               [enable Unicode properties support (implies --enable-utf8)]),                               [enable Unicode properties support (implies --enable-utf)]),
164                , enable_unicode_properties=no)                , enable_unicode_properties=no)
165    
166  # Handle --enable-newline=NL  # Handle --enable-newline=NL
# Line 153  AC_ARG_ENABLE(bsr-anycrlf, Line 202  AC_ARG_ENABLE(bsr-anycrlf,
202  # Handle --enable-ebcdic  # Handle --enable-ebcdic
203  AC_ARG_ENABLE(ebcdic,  AC_ARG_ENABLE(ebcdic,
204                AS_HELP_STRING([--enable-ebcdic],                AS_HELP_STRING([--enable-ebcdic],
205                               [assume EBCDIC coding rather than ASCII; incompatible with --enable-utf8; use only in (uncommon) EBCDIC environments; it implies --enable-rebuild-chartables]),                               [assume EBCDIC coding rather than ASCII; incompatible with --enable-utf; use only in (uncommon) EBCDIC environments; it implies --enable-rebuild-chartables]),
206                , enable_ebcdic=no)                , enable_ebcdic=no)
207    
208  # Handle --disable-stack-for-recursion  # Handle --disable-stack-for-recursion
# Line 174  AC_ARG_ENABLE(pcregrep-libbz2, Line 223  AC_ARG_ENABLE(pcregrep-libbz2,
223                               [link pcregrep with libbz2 to handle .bz2 files]),                               [link pcregrep with libbz2 to handle .bz2 files]),
224                , enable_pcregrep_libbz2=no)                , enable_pcregrep_libbz2=no)
225    
226    # Handle --with-pcregrep-bufsize=N
227    AC_ARG_WITH(pcregrep-bufsize,
228                  AS_HELP_STRING([--with-pcregrep-bufsize=N],
229                                 [pcregrep buffer size (default=20480)]),
230                  , with_pcregrep_bufsize=20480)
231    
232  # Handle --enable-pcretest-libreadline  # Handle --enable-pcretest-libreadline
233  AC_ARG_ENABLE(pcretest-libreadline,  AC_ARG_ENABLE(pcretest-libreadline,
234                AS_HELP_STRING([--enable-pcretest-libreadline],                AS_HELP_STRING([--enable-pcretest-libreadline],
# Line 211  AC_ARG_WITH(match-limit-recursion, Line 266  AC_ARG_WITH(match-limit-recursion,
266                             [default limit on internal recursion (default=MATCH_LIMIT)]),                             [default limit on internal recursion (default=MATCH_LIMIT)]),
267              , with_match_limit_recursion=MATCH_LIMIT)              , with_match_limit_recursion=MATCH_LIMIT)
268    
269  # Make sure that if enable_unicode_properties was set, that UTF-8 support  # Copy enable_utf8 value to enable_utf for compatibility reasons
270  # is enabled.  if test "x$enable_utf8" != "xunset"
271  #  then
272      if test "x$enable_utf" != "xunset"
273      then
274        AC_MSG_ERROR([--enable/disable-utf8 is kept only for compatibility reasons and its value is copied to --enable/disable-utf. Newer code must use --enable/disable-utf alone.])
275      fi
276      enable_utf=$enable_utf8
277    fi
278    
279    # Set the default value for pcre8
280    if test "x$enable_pcre8" = "xunset"
281    then
282      enable_pcre8=yes
283    fi
284    
285    # Set the default value for pcre16
286    if test "x$enable_pcre16" = "xunset"
287    then
288      enable_pcre16=no
289    fi
290    
291    # Make sure enable_pcre8 or enable_pcre16 was set
292    if test "x$enable_pcre8$enable_pcre16" = "xnono"
293    then
294      AC_MSG_ERROR([Either 8 or 16 bit (or both) pcre library must be enabled])
295    fi
296    
297    # Make sure that if enable_unicode_properties was set, that UTF support is enabled.
298  if test "x$enable_unicode_properties" = "xyes"  if test "x$enable_unicode_properties" = "xyes"
299  then  then
300    if test "x$enable_utf8" = "xno"    if test "x$enable_utf" = "xno"
301    then    then
302      AC_MSG_ERROR([support for Unicode properties requires UTF-8 support])      AC_MSG_ERROR([support for Unicode properties requires UTF-8/16 support])
303    fi    fi
304    enable_utf8=yes    enable_utf=yes
305  fi  fi
306    
307  if test "x$enable_utf8" = "xunset"  # enable_utf is disabled by default.
308    if test "x$enable_utf" = "xunset"
309  then  then
310    enable_utf8=no    enable_utf=no
311    fi
312    
313    # enable_cpp copies the value of enable_pcre8 by default
314    if test "x$enable_cpp" = "xunset"
315    then
316      enable_cpp=$enable_pcre8
317    fi
318    
319    # Make sure that if enable_cpp was set, that enable_pcre8 support is enabled
320    if test "x$enable_cpp" = "xyes"
321    then
322      if test "x$enable_pcre8" = "xno"
323      then
324        AC_MSG_ERROR([C++ library requires pcre library with 8 bit characters])
325      fi
326  fi  fi
327    
328  # Make sure that if enable_ebcdic is set, rebuild_chartables is also enabled.  # Make sure that if enable_ebcdic is set, rebuild_chartables is also enabled.
329  # Also check that UTF-8 support is not requested, because PCRE cannot handle  # Also check that UTF support is not requested, because PCRE cannot handle
330  # EBCDIC and UTF-8 in the same build. To do so it would need to use different  # EBCDIC and UTF in the same build. To do so it would need to use different
331  # character constants depending on the mode.  # character constants depending on the mode.
332  #  #
333  if test "x$enable_ebcdic" = "xyes"  if test "x$enable_ebcdic" = "xyes"
334  then  then
335    enable_rebuild_chartables=yes    enable_rebuild_chartables=yes
336    if test "x$enable_utf8" = "xyes"    if test "x$enable_utf" = "xyes"
337    then    then
338      AC_MSG_ERROR([support for EBCDIC and UTF-8 cannot be enabled at the same time])      AC_MSG_ERROR([support for EBCDIC and UTF-8/16 cannot be enabled at the same time])
339    fi    fi
340  fi  fi
341    
# Line 304  for flag in "-alias,__ZN7pcrecpp2RE6no_a Line 401  for flag in "-alias,__ZN7pcrecpp2RE6no_a
401    LDFLAGS="$OLD_LDFLAGS -Wl,$flag"    LDFLAGS="$OLD_LDFLAGS -Wl,$flag"
402    # We try to run the linker with this new ld flag.  If the link fails,    # We try to run the linker with this new ld flag.  If the link fails,
403    # we give up and remove the new flag from LDFLAGS.    # we give up and remove the new flag from LDFLAGS.
404    AC_LINK_IFELSE(AC_LANG_PROGRAM([namespace pcrecpp {    AC_LINK_IFELSE([AC_LANG_PROGRAM([namespace pcrecpp {
405                                      class RE { static int no_arg; };                                      class RE { static int no_arg; };
406                                      int RE::no_arg;                                      int RE::no_arg;
407                                    }],                                    }],
408                                   []),                                   [])],
409                   [AC_MSG_RESULT([yes]);                   [AC_MSG_RESULT([yes]);
410                    EXTRA_LIBPCRECPP_LDFLAGS="$EXTRA_LIBPCRECPP_LDFLAGS -Wl,$flag";                    EXTRA_LIBPCRECPP_LDFLAGS="$EXTRA_LIBPCRECPP_LDFLAGS -Wl,$flag";
411                    break;],                    break;],
# Line 326  AC_CHECK_HEADERS(bits/type_traits.h, [pc Line 423  AC_CHECK_HEADERS(bits/type_traits.h, [pc
423  AC_CHECK_HEADERS(type_traits.h, [pcre_have_type_traits="1"],  AC_CHECK_HEADERS(type_traits.h, [pcre_have_type_traits="1"],
424                                  [pcre_have_type_traits="0"])                                  [pcre_have_type_traits="0"])
425    
426    # (This isn't c++-specific, but is only used in pcrecpp.cc, so try this
427    # in a c++ context.  This matters becuase strtoimax is C99 and may not
428    # be supported by the C++ compiler.)
429    # Figure out how to create a longlong from a string: strtoll and
430    # equiv.  It's not enough to call AC_CHECK_FUNCS: hpux has a
431    # strtoll, for instance, but it only takes 2 args instead of 3!
432    # We have to call AH_TEMPLATE since AC_DEFINE_UNQUOTED below is complex.
433    AH_TEMPLATE(HAVE_STRTOQ, [Define to 1 if you have `strtoq'.])
434    AH_TEMPLATE(HAVE_STRTOLL, [Define to 1 if you have `strtoll'.])
435    AH_TEMPLATE(HAVE__STRTOI64, [Define to 1 if you have `_strtoi64'.])
436    AH_TEMPLATE(HAVE_STRTOIMAX, [Define to 1 if you have `strtoimax'.])
437    have_strto_fn=0
438    for fn in strtoq strtoll _strtoi64 strtoimax; do
439      AC_MSG_CHECKING([for $fn])
440      if test "$fn" = strtoimax; then
441        include=stdint.h
442      else
443        include=stdlib.h
444      fi
445      AC_COMPILE_IFELSE([AC_LANG_PROGRAM([#include <$include>],
446                                        [char* e; return $fn("100", &e, 10)])],
447                        [AC_MSG_RESULT(yes)
448                         AC_DEFINE_UNQUOTED(HAVE_`echo $fn | tr abcdefghijklmnopqrstuvwxyz ABCDEFGHIJKLMNOPQRSTUVWXYZ`, 1,
449                                            [Define to 1 if you have `$fn'.])
450                         have_strto_fn=1
451                         break],
452                        [AC_MSG_RESULT(no)])
453    done
454    
455    if test "$have_strto_fn" = 1; then
456      AC_CHECK_TYPES([long long],
457                     [pcre_have_long_long="1"],
458                     [pcre_have_long_long="0"])
459      AC_CHECK_TYPES([unsigned long long],
460                     [pcre_have_ulong_long="1"],
461                     [pcre_have_ulong_long="0"])
462    else
463      pcre_have_long_long="0"
464      pcre_have_ulong_long="0"
465    fi
466    AC_SUBST(pcre_have_long_long)
467    AC_SUBST(pcre_have_ulong_long)
468    
469  AC_LANG_POP  AC_LANG_POP
470  fi  fi
471  # Using AC_SUBST eliminates the need to include config.h in a public .h file  # Using AC_SUBST eliminates the need to include config.h in a public .h file
# Line 333  AC_SUBST(pcre_have_type_traits) Line 473  AC_SUBST(pcre_have_type_traits)
473  AC_SUBST(pcre_have_bits_type_traits)  AC_SUBST(pcre_have_bits_type_traits)
474    
475  # Conditional compilation  # Conditional compilation
476    AM_CONDITIONAL(WITH_PCRE8, test "x$enable_pcre8" = "xyes")
477    AM_CONDITIONAL(WITH_PCRE16, test "x$enable_pcre16" = "xyes")
478  AM_CONDITIONAL(WITH_PCRE_CPP, test "x$enable_cpp" = "xyes")  AM_CONDITIONAL(WITH_PCRE_CPP, test "x$enable_cpp" = "xyes")
479  AM_CONDITIONAL(WITH_REBUILD_CHARTABLES, test "x$enable_rebuild_chartables" = "xyes")  AM_CONDITIONAL(WITH_REBUILD_CHARTABLES, test "x$enable_rebuild_chartables" = "xyes")
480    AM_CONDITIONAL(WITH_JIT, test "x$enable_jit" = "xyes")
481    AM_CONDITIONAL(WITH_UTF, test "x$enable_utf" = "xyes")
482    
483  # Checks for typedefs, structures, and compiler characteristics.  # Checks for typedefs, structures, and compiler characteristics.
484    
485  AC_C_CONST  AC_C_CONST
486  AC_TYPE_SIZE_T  AC_TYPE_SIZE_T
487    
 pcre_have_strotolonglong=0  
 AC_CHECK_FUNCS(strtoq strtoll _strtoi64, [pcre_have_strotolonglong="1"; break])  
 # If we can't convert a string to a long long, pretend we don't even  
 # have a long long.  
 if test $pcre_have_strotolonglong = "0"; then  
    pcre_have_long_long="0"  
    pcre_have_ulong_long="0"  
 else  
   AC_CHECK_TYPES([long long],  
                  [pcre_have_long_long="1"],  
                  [pcre_have_long_long="0"])  
   AC_CHECK_TYPES([unsigned long long],  
                  [pcre_have_ulong_long="1"],  
                  [pcre_have_ulong_long="0"])  
 fi  
 AC_SUBST(pcre_have_long_long)  
 AC_SUBST(pcre_have_ulong_long)  
   
488  # Checks for library functions.  # Checks for library functions.
489    
490  AC_CHECK_FUNCS(bcopy memmove strerror)  AC_CHECK_FUNCS(bcopy memmove strerror)
# Line 368  AC_CHECK_FUNCS(bcopy memmove strerror) Line 494  AC_CHECK_FUNCS(bcopy memmove strerror)
494  AC_CHECK_HEADERS([zlib.h], [HAVE_ZLIB_H=1])  AC_CHECK_HEADERS([zlib.h], [HAVE_ZLIB_H=1])
495  AC_CHECK_LIB([z], [gzopen], [HAVE_LIBZ=1])  AC_CHECK_LIB([z], [gzopen], [HAVE_LIBZ=1])
496    
497  # Check for the availability of libbz2  # Check for the availability of libbz2. Originally we just used AC_CHECK_LIB,
498    # as for libz. However, this had the following problem, diagnosed and fixed by
499    # a user:
500    #
501    #   - libbz2 uses the Pascal calling convention (WINAPI) for the functions
502    #     under Win32.
503    #   - The standard autoconf AC_CHECK_LIB fails to include "bzlib.h",
504    #     therefore missing the function definition.
505    #   - The compiler thus generates a "C" signature for the test function.
506    #   - The linker fails to find the "C" function.
507    #   - PCRE fails to configure if asked to do so against libbz2.
508    #
509    # Solution:
510    #
511    #   - Replace the AC_CHECK_LIB test with a custom test.
512    
513  AC_CHECK_HEADERS([bzlib.h], [HAVE_BZLIB_H=1])  AC_CHECK_HEADERS([bzlib.h], [HAVE_BZLIB_H=1])
514  AC_CHECK_LIB([bz2], [BZ2_bzopen], [HAVE_LIBBZ2=1])  # Original test
515    # AC_CHECK_LIB([bz2], [BZ2_bzopen], [HAVE_LIBBZ2=1])
516    #
517    # Custom test follows
518    
519    AC_MSG_CHECKING([for libbz2])
520    OLD_LIBS="$LIBS"
521    LIBS="$LIBS -lbz2"
522    AC_LINK_IFELSE([AC_LANG_PROGRAM([[
523    #ifdef HAVE_BZLIB_H
524    #include <bzlib.h>
525    #endif]],
526    [[return (int)BZ2_bzopen("conftest", "rb");]])],
527    [AC_MSG_RESULT([yes]);HAVE_LIBBZ2=1; break;],
528    AC_MSG_RESULT([no]))
529    LIBS="$OLD_LIBS"
530    
531  # Check for the availabiity of libreadline  # Check for the availabiity of libreadline
532    
# Line 392  AC_SUBST(PCRE_STATIC_CFLAG) Line 547  AC_SUBST(PCRE_STATIC_CFLAG)
547    
548  # Here is where pcre specific defines are handled  # Here is where pcre specific defines are handled
549    
550  if test "$enable_utf8" = "yes"; then  if test "$enable_pcre8" = "yes"; then
551    AC_DEFINE([SUPPORT_UTF8], [], [    AC_DEFINE([SUPPORT_PCRE8], [], [
552      Define to enable support for the UTF-8 Unicode encoding. This will      Define to enable the 8 bit PCRE library.])
553      work even in an EBCDIC environment, but it is incompatible with  fi
554      the EBCDIC macro. That is, PCRE can support *either* EBCDIC code  
555      *or* ASCII/UTF-8, but not both at once.])  if test "$enable_pcre16" = "yes"; then
556      AC_DEFINE([SUPPORT_PCRE16], [], [
557        Define to enable the 16 bit PCRE library.])
558    fi
559    
560    if test "$enable_jit" = "yes"; then
561      AC_DEFINE([SUPPORT_JIT], [], [
562        Define to enable support for Just-In-Time compiling.])
563    else
564      enable_pcregrep_jit="no"
565    fi
566    
567    if test "$enable_pcregrep_jit" = "yes"; then
568      AC_DEFINE([SUPPORT_PCREGREP_JIT], [], [
569        Define to enable JIT support in pcregrep.])
570    fi
571    
572    if test "$enable_utf" = "yes"; then
573      AC_DEFINE([SUPPORT_UTF], [], [
574        Define to enable support for the UTF-8/16 Unicode encoding. This
575        will work even in an EBCDIC environment, but it is incompatible
576        with the EBCDIC macro. That is, PCRE can support *either* EBCDIC
577        code *or* ASCII/UTF-8/16, but not both at once.])
578  fi  fi
579    
580  if test "$enable_unicode_properties" = "yes"; then  if test "$enable_unicode_properties" = "yes"; then
581    AC_DEFINE([SUPPORT_UCP], [], [    AC_DEFINE([SUPPORT_UCP], [], [
582      Define to enable support for Unicode properties])      Define to enable support for Unicode properties.])
583  fi  fi
584    
585  if test "$enable_stack_for_recursion" = "no"; then  if test "$enable_stack_for_recursion" = "no"; then
# Line 430  if test "$enable_pcregrep_libbz2" = "yes Line 607  if test "$enable_pcregrep_libbz2" = "yes
607      able to handle .bz2 files.])      able to handle .bz2 files.])
608  fi  fi
609    
610    if test $with_pcregrep_bufsize -lt 8192 ; then
611      with_pcregrep_bufsize="8192"
612    fi
613    
614    AC_DEFINE_UNQUOTED([PCREGREP_BUFSIZE], [$with_pcregrep_bufsize], [
615      The value of PCREGREP_BUFSIZE determines the size of buffer used by
616      pcregrep to hold parts of the file it is searching. On systems that
617      support it, "configure" can be used to override the default, which is
618      8192. This is also the minimum value. The actual amount of memory used by
619      pcregrep is three times this number, because it allows for the buffering of
620      "before" and "after" lines.])
621    
622  if test "$enable_pcretest_libreadline" = "yes"; then  if test "$enable_pcretest_libreadline" = "yes"; then
623    AC_DEFINE([SUPPORT_LIBREADLINE], [], [    AC_DEFINE([SUPPORT_LIBREADLINE], [], [
624      Define to allow pcretest to be linked with libreadline.])      Define to allow pcretest to be linked with libreadline.])
# Line 520  if test "$enable_ebcdic" = "yes"; then Line 709  if test "$enable_ebcdic" = "yes"; then
709      character codes, define this macro as 1. On systems that can use      character codes, define this macro as 1. On systems that can use
710      "configure", this can be done via --enable-ebcdic. PCRE will then      "configure", this can be done via --enable-ebcdic. PCRE will then
711      assume that all input strings are in EBCDIC. If you do not define      assume that all input strings are in EBCDIC. If you do not define
712      this macro, PCRE will assume input strings are ASCII or UTF-8 Unicode.      this macro, PCRE will assume input strings are ASCII or UTF-8/16
713      It is not possible to build a version of PCRE that supports both      Unicode. It is not possible to build a version of PCRE that
714      EBCDIC and UTF-8.])      supports both EBCDIC and UTF-8/16.])
715  fi  fi
716    
717  # Platform specific issues  # Platform specific issues
# Line 543  esac Line 732  esac
732  EXTRA_LIBPCRE_LDFLAGS="$EXTRA_LIBPCRE_LDFLAGS \  EXTRA_LIBPCRE_LDFLAGS="$EXTRA_LIBPCRE_LDFLAGS \
733                         $NO_UNDEFINED -version-info libpcre_version"                         $NO_UNDEFINED -version-info libpcre_version"
734    
735    EXTRA_LIBPCRE16_LDFLAGS="$EXTRA_LIBPCRE16_LDFLAGS \
736                           $NO_UNDEFINED -version-info libpcre16_version"
737    
738  EXTRA_LIBPCREPOSIX_LDFLAGS="$EXTRA_LIBPCREPOSIX_LDFLAGS \  EXTRA_LIBPCREPOSIX_LDFLAGS="$EXTRA_LIBPCREPOSIX_LDFLAGS \
739                              $NO_UNDEFINED -version-info libpcreposix_version"                              $NO_UNDEFINED -version-info libpcreposix_version"
740    
# Line 551  EXTRA_LIBPCRECPP_LDFLAGS="$EXTRA_LIBPCRE Line 743  EXTRA_LIBPCRECPP_LDFLAGS="$EXTRA_LIBPCRE
743                            $EXPORT_ALL_SYMBOLS"                            $EXPORT_ALL_SYMBOLS"
744    
745  AC_SUBST(EXTRA_LIBPCRE_LDFLAGS)  AC_SUBST(EXTRA_LIBPCRE_LDFLAGS)
746    AC_SUBST(EXTRA_LIBPCRE16_LDFLAGS)
747  AC_SUBST(EXTRA_LIBPCREPOSIX_LDFLAGS)  AC_SUBST(EXTRA_LIBPCREPOSIX_LDFLAGS)
748  AC_SUBST(EXTRA_LIBPCRECPP_LDFLAGS)  AC_SUBST(EXTRA_LIBPCRECPP_LDFLAGS)
749    
750  # When we run 'make distcheck', use these arguments.  # When we run 'make distcheck', use these arguments.
751  DISTCHECK_CONFIGURE_FLAGS="--enable-cpp --enable-unicode-properties"  DISTCHECK_CONFIGURE_FLAGS="--enable-pcre16 --enable-jit --enable-cpp --enable-unicode-properties"
752  AC_SUBST(DISTCHECK_CONFIGURE_FLAGS)  AC_SUBST(DISTCHECK_CONFIGURE_FLAGS)
753    
754  # Check that, if --enable-pcregrep-libz or --enable-pcregrep-libbz2 is  # Check that, if --enable-pcregrep-libz or --enable-pcregrep-libbz2 is
# Line 606  AC_SUBST(LIBREADLINE) Line 799  AC_SUBST(LIBREADLINE)
799  AC_CONFIG_FILES(  AC_CONFIG_FILES(
800          Makefile          Makefile
801          libpcre.pc          libpcre.pc
802          libpcreposix.pc          libpcre16.pc
803            libpcreposix.pc
804          libpcrecpp.pc          libpcrecpp.pc
805          pcre-config          pcre-config
806          pcre.h          pcre.h
# Line 642  $PACKAGE-$VERSION configuration summary: Line 836  $PACKAGE-$VERSION configuration summary:
836      Linker flags .................... : ${LDFLAGS}      Linker flags .................... : ${LDFLAGS}
837      Extra libraries ................. : ${LIBS}      Extra libraries ................. : ${LIBS}
838    
839        Build 8 bit pcre library ........ : ${enable_pcre8}
840        Build 16 bit pcre library ....... : ${enable_pcre16}
841      Build C++ library ............... : ${enable_cpp}      Build C++ library ............... : ${enable_cpp}
842      Enable UTF-8 support ............ : ${enable_utf8}      Enable JIT compiling support .... : ${enable_jit}
843        Enable UTF-8/16 support ......... : ${enable_utf}
844      Unicode properties .............. : ${enable_unicode_properties}      Unicode properties .............. : ${enable_unicode_properties}
845      Newline char/sequence ........... : ${enable_newline}      Newline char/sequence ........... : ${enable_newline}
846      \R matches only ANYCRLF ......... : ${enable_bsr_anycrlf}      \R matches only ANYCRLF ......... : ${enable_bsr_anycrlf}
# Line 656  $PACKAGE-$VERSION configuration summary: Line 853  $PACKAGE-$VERSION configuration summary:
853      Match limit recursion ........... : ${with_match_limit_recursion}      Match limit recursion ........... : ${with_match_limit_recursion}
854      Build shared libs ............... : ${enable_shared}      Build shared libs ............... : ${enable_shared}
855      Build static libs ............... : ${enable_static}      Build static libs ............... : ${enable_static}
856        Use JIT in pcregrep ............. : ${enable_pcregrep_jit}
857        Buffer size for pcregrep ........ : ${with_pcregrep_bufsize}
858      Link pcregrep with libz ......... : ${enable_pcregrep_libz}      Link pcregrep with libz ......... : ${enable_pcregrep_libz}
859      Link pcregrep with libbz2 ....... : ${enable_pcregrep_libbz2}      Link pcregrep with libbz2 ....... : ${enable_pcregrep_libbz2}
860      Link pcretest with libreadline .. : ${enable_pcretest_libreadline}      Link pcretest with libreadline .. : ${enable_pcretest_libreadline}

Legend:
Removed from v.475  
changed lines
  Added in v.876

  ViewVC Help
Powered by ViewVC 1.1.5