/[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 491 by ph10, Mon Mar 1 17:45:08 2010 UTC revision 685 by ph10, Tue Sep 6 15:02:07 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, [02])  m4_define(pcre_minor, [20])
13  m4_define(pcre_prerelease, [-RC1])  m4_define(pcre_prerelease, [-RC1])
14  m4_define(pcre_date, [2010-03-01])  m4_define(pcre_date, [2011-08-18])
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 68  fi Line 68  fi
68  # 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.
69  # 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.
70  AC_LANG_PUSH(C++)  AC_LANG_PUSH(C++)
71  AC_COMPILE_IFELSE(AC_LANG_PROGRAM([],[]),, CXX=""; CXXCP=""; CXXFLAGS="")  AC_COMPILE_IFELSE([AC_LANG_PROGRAM([],[])],, CXX=""; CXXCP=""; CXXFLAGS="")
72  AC_LANG_POP  AC_LANG_POP
73    
74  # Check for a 64-bit integer type  # Check for a 64-bit integer type
# Line 76  AC_TYPE_INT64_T Line 76  AC_TYPE_INT64_T
76    
77  AC_PROG_INSTALL  AC_PROG_INSTALL
78  AC_LIBTOOL_WIN32_DLL  AC_LIBTOOL_WIN32_DLL
79  AC_PROG_LIBTOOL  LT_INIT
80  AC_PROG_LN_S  AC_PROG_LN_S
81    
82  PCRE_MAJOR="pcre_major"  PCRE_MAJOR="pcre_major"
# Line 104  then Line 104  then
104    htmldir='${docdir}/html'    htmldir='${docdir}/html'
105  fi  fi
106    
107  # Handle --disable-cpp  # Handle --disable-cpp. The substitution of enable_cpp is needed for use in
108    # pcre-config.
109  AC_ARG_ENABLE(cpp,  AC_ARG_ENABLE(cpp,
110                AS_HELP_STRING([--disable-cpp],                AS_HELP_STRING([--disable-cpp],
111                               [disable C++ support]),                               [disable C++ support]),
112                , enable_cpp=yes)                , enable_cpp=yes)
113    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,
# Line 188  AC_ARG_ENABLE(pcregrep-libbz2, Line 202  AC_ARG_ENABLE(pcregrep-libbz2,
202                               [link pcregrep with libbz2 to handle .bz2 files]),                               [link pcregrep with libbz2 to handle .bz2 files]),
203                , enable_pcregrep_libbz2=no)                , enable_pcregrep_libbz2=no)
204    
205    # Handle --with-pcregrep-bufsize=N
206    AC_ARG_WITH(pcregrep-bufsize,
207                  AS_HELP_STRING([--with-pcregrep-bufsize=N],
208                                 [pcregrep buffer size (default=20480)]),
209                  , with_pcregrep_bufsize=20480)
210    
211  # Handle --enable-pcretest-libreadline  # Handle --enable-pcretest-libreadline
212  AC_ARG_ENABLE(pcretest-libreadline,  AC_ARG_ENABLE(pcretest-libreadline,
213                AS_HELP_STRING([--enable-pcretest-libreadline],                AS_HELP_STRING([--enable-pcretest-libreadline],
# Line 318  for flag in "-alias,__ZN7pcrecpp2RE6no_a Line 338  for flag in "-alias,__ZN7pcrecpp2RE6no_a
338    LDFLAGS="$OLD_LDFLAGS -Wl,$flag"    LDFLAGS="$OLD_LDFLAGS -Wl,$flag"
339    # 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,
340    # we give up and remove the new flag from LDFLAGS.    # we give up and remove the new flag from LDFLAGS.
341    AC_LINK_IFELSE(AC_LANG_PROGRAM([namespace pcrecpp {    AC_LINK_IFELSE([AC_LANG_PROGRAM([namespace pcrecpp {
342                                      class RE { static int no_arg; };                                      class RE { static int no_arg; };
343                                      int RE::no_arg;                                      int RE::no_arg;
344                                    }],                                    }],
345                                   []),                                   [])],
346                   [AC_MSG_RESULT([yes]);                   [AC_MSG_RESULT([yes]);
347                    EXTRA_LIBPCRECPP_LDFLAGS="$EXTRA_LIBPCRECPP_LDFLAGS -Wl,$flag";                    EXTRA_LIBPCRECPP_LDFLAGS="$EXTRA_LIBPCRECPP_LDFLAGS -Wl,$flag";
348                    break;],                    break;],
# Line 352  AH_TEMPLATE(HAVE_STRTOLL, [Define to 1 i Line 372  AH_TEMPLATE(HAVE_STRTOLL, [Define to 1 i
372  AH_TEMPLATE(HAVE__STRTOI64, [Define to 1 if you have `_strtoi64'.])  AH_TEMPLATE(HAVE__STRTOI64, [Define to 1 if you have `_strtoi64'.])
373  AH_TEMPLATE(HAVE_STRTOIMAX, [Define to 1 if you have `strtoimax'.])  AH_TEMPLATE(HAVE_STRTOIMAX, [Define to 1 if you have `strtoimax'.])
374  have_strto_fn=0  have_strto_fn=0
375  for fn in srtoq strtoll _strtoi64 strtoimax; do  for fn in strtoq strtoll _strtoi64 strtoimax; do
376    AC_MSG_CHECKING([for $fn])    AC_MSG_CHECKING([for $fn])
377    if test "$fn" = strtoimax; then    if test "$fn" = strtoimax; then
378      include=stdint.h      include=stdint.h
379    else    else
380      include=stdlib.h      include=stdlib.h
381    fi    fi
382    AC_COMPILE_IFELSE(AC_LANG_PROGRAM([#include <$include>],    AC_COMPILE_IFELSE([AC_LANG_PROGRAM([#include <$include>],
383                                      [char* e; return $fn("100", &e, 10)]),                                      [char* e; return $fn("100", &e, 10)])],
384                      [AC_MSG_RESULT(yes)                      [AC_MSG_RESULT(yes)
385                       AC_DEFINE_UNQUOTED(HAVE_`echo $fn | tr abcdefghijklmnopqrstuvwxyz ABCDEFGHIJKLMNOPQRSTUVWXYZ`, 1,                       AC_DEFINE_UNQUOTED(HAVE_`echo $fn | tr abcdefghijklmnopqrstuvwxyz ABCDEFGHIJKLMNOPQRSTUVWXYZ`, 1,
386                                          [Define to 1 if you have `$fn'.])                                          [Define to 1 if you have `$fn'.])
# Line 392  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    
417  # Checks for typedefs, structures, and compiler characteristics.  # Checks for typedefs, structures, and compiler characteristics.
418    
# Line 432  AC_CHECK_HEADERS([bzlib.h], [HAVE_BZLIB_ Line 453  AC_CHECK_HEADERS([bzlib.h], [HAVE_BZLIB_
453  AC_MSG_CHECKING([for libbz2])  AC_MSG_CHECKING([for libbz2])
454  OLD_LIBS="$LIBS"  OLD_LIBS="$LIBS"
455  LIBS="$LIBS -lbz2"  LIBS="$LIBS -lbz2"
456  AC_LINK_IFELSE( AC_LANG_PROGRAM([[  AC_LINK_IFELSE([AC_LANG_PROGRAM([[
457  #ifdef HAVE_BZLIB_H  #ifdef HAVE_BZLIB_H
458  #include <bzlib.h>  #include <bzlib.h>
459  #endif]],  #endif]],
460  [[return (int)BZ2_bzopen("conftest", "rb");]]),  [[return (int)BZ2_bzopen("conftest", "rb");]])],
461  [AC_MSG_RESULT([yes]);HAVE_LIBBZ2=1; break;],  [AC_MSG_RESULT([yes]);HAVE_LIBBZ2=1; break;],
462  AC_MSG_RESULT([no]))  AC_MSG_RESULT([no]))
463  LIBS="$OLD_LIBS"  LIBS="$OLD_LIBS"
# Line 460  AC_SUBST(PCRE_STATIC_CFLAG) Line 481  AC_SUBST(PCRE_STATIC_CFLAG)
481    
482  # Here is where pcre specific defines are handled  # Here is where pcre specific defines are handled
483    
484    if test "$enable_jit" = "yes"; then
485      AC_DEFINE([SUPPORT_JIT], [], [
486        Define to enable support for Just-In-Time compiling.])
487    else
488      enable_pcregrep_jit="no"
489    fi
490    
491    if test "$enable_pcregrep_jit" = "yes"; then
492      AC_DEFINE([SUPPORT_PCREGREP_JIT], [], [
493        Define to enable JIT support in pcregrep.])
494    fi
495    
496  if test "$enable_utf8" = "yes"; then  if test "$enable_utf8" = "yes"; then
497    AC_DEFINE([SUPPORT_UTF8], [], [    AC_DEFINE([SUPPORT_UTF8], [], [
498      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 470  fi Line 503  fi
503    
504  if test "$enable_unicode_properties" = "yes"; then  if test "$enable_unicode_properties" = "yes"; then
505    AC_DEFINE([SUPPORT_UCP], [], [    AC_DEFINE([SUPPORT_UCP], [], [
506      Define to enable support for Unicode properties])      Define to enable support for Unicode properties.])
507  fi  fi
508    
509  if test "$enable_stack_for_recursion" = "no"; then  if test "$enable_stack_for_recursion" = "no"; then
# Line 498  if test "$enable_pcregrep_libbz2" = "yes Line 531  if test "$enable_pcregrep_libbz2" = "yes
531      able to handle .bz2 files.])      able to handle .bz2 files.])
532  fi  fi
533    
534    if test $with_pcregrep_bufsize -lt 8192 ; then
535      with_pcregrep_bufsize="8192"
536    fi
537    
538    AC_DEFINE_UNQUOTED([PCREGREP_BUFSIZE], [$with_pcregrep_bufsize], [
539      The value of PCREGREP_BUFSIZE determines the size of buffer used by
540      pcregrep to hold parts of the file it is searching. On systems that
541      support it, "configure" can be used to override the default, which is
542      8192. This is also the minimum value. The actual amount of memory used by
543      pcregrep is three times this number, because it allows for the buffering of
544      "before" and "after" lines.])
545    
546  if test "$enable_pcretest_libreadline" = "yes"; then  if test "$enable_pcretest_libreadline" = "yes"; then
547    AC_DEFINE([SUPPORT_LIBREADLINE], [], [    AC_DEFINE([SUPPORT_LIBREADLINE], [], [
548      Define to allow pcretest to be linked with libreadline.])      Define to allow pcretest to be linked with libreadline.])
# Line 623  AC_SUBST(EXTRA_LIBPCREPOSIX_LDFLAGS) Line 668  AC_SUBST(EXTRA_LIBPCREPOSIX_LDFLAGS)
668  AC_SUBST(EXTRA_LIBPCRECPP_LDFLAGS)  AC_SUBST(EXTRA_LIBPCRECPP_LDFLAGS)
669    
670  # When we run 'make distcheck', use these arguments.  # When we run 'make distcheck', use these arguments.
671  DISTCHECK_CONFIGURE_FLAGS="--enable-cpp --enable-unicode-properties"  DISTCHECK_CONFIGURE_FLAGS="--enable-jit --enable-cpp --enable-unicode-properties"
672  AC_SUBST(DISTCHECK_CONFIGURE_FLAGS)  AC_SUBST(DISTCHECK_CONFIGURE_FLAGS)
673    
674  # Check that, if --enable-pcregrep-libz or --enable-pcregrep-libbz2 is  # Check that, if --enable-pcregrep-libz or --enable-pcregrep-libbz2 is
# Line 711  $PACKAGE-$VERSION configuration summary: Line 756  $PACKAGE-$VERSION configuration summary:
756      Extra libraries ................. : ${LIBS}      Extra libraries ................. : ${LIBS}
757    
758      Build C++ library ............... : ${enable_cpp}      Build C++ library ............... : ${enable_cpp}
759        Enable JIT compiling support .... : ${enable_jit}
760      Enable UTF-8 support ............ : ${enable_utf8}      Enable UTF-8 support ............ : ${enable_utf8}
761      Unicode properties .............. : ${enable_unicode_properties}      Unicode properties .............. : ${enable_unicode_properties}
762      Newline char/sequence ........... : ${enable_newline}      Newline char/sequence ........... : ${enable_newline}
# Line 724  $PACKAGE-$VERSION configuration summary: Line 770  $PACKAGE-$VERSION configuration summary:
770      Match limit recursion ........... : ${with_match_limit_recursion}      Match limit recursion ........... : ${with_match_limit_recursion}
771      Build shared libs ............... : ${enable_shared}      Build shared libs ............... : ${enable_shared}
772      Build static libs ............... : ${enable_static}      Build static libs ............... : ${enable_static}
773        Use JIT in pcregrep ............. : ${enable_pcregrep_jit}
774        Buffer size for pcregrep ........ : ${with_pcregrep_bufsize}
775      Link pcregrep with libz ......... : ${enable_pcregrep_libz}      Link pcregrep with libz ......... : ${enable_pcregrep_libz}
776      Link pcregrep with libbz2 ....... : ${enable_pcregrep_libbz2}      Link pcregrep with libbz2 ....... : ${enable_pcregrep_libbz2}
777      Link pcretest with libreadline .. : ${enable_pcretest_libreadline}      Link pcretest with libreadline .. : ${enable_pcretest_libreadline}

Legend:
Removed from v.491  
changed lines
  Added in v.685

  ViewVC Help
Powered by ViewVC 1.1.5