/[pcre]/code/branches/pcre16/configure.ac
ViewVC logotype

Diff of /code/branches/pcre16/configure.ac

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 488 by ph10, Mon Jan 11 15:29:42 2010 UTC revision 691 by ph10, Sun Sep 11 14:31:21 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, [01])  m4_define(pcre_minor, [20])
13  m4_define(pcre_prerelease, [-RC2])  m4_define(pcre_prerelease, [-RC1])
14  m4_define(pcre_date, [2010-01-11])  m4_define(pcre_date, [2011-09-12])
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    AM_CONDITIONAL(WITH_UTF8, test "x$enable_utf8" = "xyes")
417    
418  # Checks for typedefs, structures, and compiler characteristics.  # Checks for typedefs, structures, and compiler characteristics.
419    
# Line 432  AC_CHECK_HEADERS([bzlib.h], [HAVE_BZLIB_ Line 454  AC_CHECK_HEADERS([bzlib.h], [HAVE_BZLIB_
454  AC_MSG_CHECKING([for libbz2])  AC_MSG_CHECKING([for libbz2])
455  OLD_LIBS="$LIBS"  OLD_LIBS="$LIBS"
456  LIBS="$LIBS -lbz2"  LIBS="$LIBS -lbz2"
457  AC_LINK_IFELSE( AC_LANG_PROGRAM([[  AC_LINK_IFELSE([AC_LANG_PROGRAM([[
458  #ifdef HAVE_BZLIB_H  #ifdef HAVE_BZLIB_H
459  #include <bzlib.h>  #include <bzlib.h>
460  #endif]],  #endif]],
461  [[return (int)BZ2_bzopen("conftest", "rb");]]),  [[return (int)BZ2_bzopen("conftest", "rb");]])],
462  [AC_MSG_RESULT([yes]);HAVE_LIBBZ2=1; break;],  [AC_MSG_RESULT([yes]);HAVE_LIBBZ2=1; break;],
463  AC_MSG_RESULT([no]))  AC_MSG_RESULT([no]))
464  LIBS="$OLD_LIBS"  LIBS="$OLD_LIBS"
# Line 460  AC_SUBST(PCRE_STATIC_CFLAG) Line 482  AC_SUBST(PCRE_STATIC_CFLAG)
482    
483  # Here is where pcre specific defines are handled  # Here is where pcre specific defines are handled
484    
485    if test "$enable_jit" = "yes"; then
486      AC_DEFINE([SUPPORT_JIT], [], [
487        Define to enable support for Just-In-Time compiling.])
488    else
489      enable_pcregrep_jit="no"
490    fi
491    
492    if test "$enable_pcregrep_jit" = "yes"; then
493      AC_DEFINE([SUPPORT_PCREGREP_JIT], [], [
494        Define to enable JIT support in pcregrep.])
495    fi
496    
497  if test "$enable_utf8" = "yes"; then  if test "$enable_utf8" = "yes"; then
498    AC_DEFINE([SUPPORT_UTF8], [], [    AC_DEFINE([SUPPORT_UTF8], [], [
499      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 504  fi
504    
505  if test "$enable_unicode_properties" = "yes"; then  if test "$enable_unicode_properties" = "yes"; then
506    AC_DEFINE([SUPPORT_UCP], [], [    AC_DEFINE([SUPPORT_UCP], [], [
507      Define to enable support for Unicode properties])      Define to enable support for Unicode properties.])
508  fi  fi
509    
510  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 532  if test "$enable_pcregrep_libbz2" = "yes
532      able to handle .bz2 files.])      able to handle .bz2 files.])
533  fi  fi
534    
535    if test $with_pcregrep_bufsize -lt 8192 ; then
536      with_pcregrep_bufsize="8192"
537    fi
538    
539    AC_DEFINE_UNQUOTED([PCREGREP_BUFSIZE], [$with_pcregrep_bufsize], [
540      The value of PCREGREP_BUFSIZE determines the size of buffer used by
541      pcregrep to hold parts of the file it is searching. On systems that
542      support it, "configure" can be used to override the default, which is
543      8192. This is also the minimum value. The actual amount of memory used by
544      pcregrep is three times this number, because it allows for the buffering of
545      "before" and "after" lines.])
546    
547  if test "$enable_pcretest_libreadline" = "yes"; then  if test "$enable_pcretest_libreadline" = "yes"; then
548    AC_DEFINE([SUPPORT_LIBREADLINE], [], [    AC_DEFINE([SUPPORT_LIBREADLINE], [], [
549      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 669  AC_SUBST(EXTRA_LIBPCREPOSIX_LDFLAGS)
669  AC_SUBST(EXTRA_LIBPCRECPP_LDFLAGS)  AC_SUBST(EXTRA_LIBPCRECPP_LDFLAGS)
670    
671  # When we run 'make distcheck', use these arguments.  # When we run 'make distcheck', use these arguments.
672  DISTCHECK_CONFIGURE_FLAGS="--enable-cpp --enable-unicode-properties"  DISTCHECK_CONFIGURE_FLAGS="--enable-jit --enable-cpp --enable-unicode-properties"
673  AC_SUBST(DISTCHECK_CONFIGURE_FLAGS)  AC_SUBST(DISTCHECK_CONFIGURE_FLAGS)
674    
675  # 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 757  $PACKAGE-$VERSION configuration summary:
757      Extra libraries ................. : ${LIBS}      Extra libraries ................. : ${LIBS}
758    
759      Build C++ library ............... : ${enable_cpp}      Build C++ library ............... : ${enable_cpp}
760        Enable JIT compiling support .... : ${enable_jit}
761      Enable UTF-8 support ............ : ${enable_utf8}      Enable UTF-8 support ............ : ${enable_utf8}
762      Unicode properties .............. : ${enable_unicode_properties}      Unicode properties .............. : ${enable_unicode_properties}
763      Newline char/sequence ........... : ${enable_newline}      Newline char/sequence ........... : ${enable_newline}
# Line 724  $PACKAGE-$VERSION configuration summary: Line 771  $PACKAGE-$VERSION configuration summary:
771      Match limit recursion ........... : ${with_match_limit_recursion}      Match limit recursion ........... : ${with_match_limit_recursion}
772      Build shared libs ............... : ${enable_shared}      Build shared libs ............... : ${enable_shared}
773      Build static libs ............... : ${enable_static}      Build static libs ............... : ${enable_static}
774        Use JIT in pcregrep ............. : ${enable_pcregrep_jit}
775        Buffer size for pcregrep ........ : ${with_pcregrep_bufsize}
776      Link pcregrep with libz ......... : ${enable_pcregrep_libz}      Link pcregrep with libz ......... : ${enable_pcregrep_libz}
777      Link pcregrep with libbz2 ....... : ${enable_pcregrep_libbz2}      Link pcregrep with libbz2 ....... : ${enable_pcregrep_libbz2}
778      Link pcretest with libreadline .. : ${enable_pcretest_libreadline}      Link pcretest with libreadline .. : ${enable_pcretest_libreadline}

Legend:
Removed from v.488  
changed lines
  Added in v.691

webmaster@exim.org
ViewVC Help
Powered by ViewVC 1.1.12