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

Diff of /code/trunk/configure.ac

Parent Directory | Revision Log | View Patch Patch

-revision 213 by ph10,
Wed Aug 15 11:34:14 2007 UTC
+revision 479 by ph10,
Sun Jan  3 16:31:39 2010 UTC
 Line 6 
 dnl PCRE_PRERELEASE feature is for ident
  dnl be defined as -RC2, for example. For real releases, it should be defined
  dnl empty.
- m4_define(pcre_major, [7])
+ m4_define(pcre_major, [8])
- m4_define(pcre_minor, [3])
+ m4_define(pcre_minor, [01])
- m4_define(pcre_prerelease, [-RC5])
+ m4_define(pcre_prerelease, [-RC1])
- m4_define(pcre_date, [2007-08-15])
+ m4_define(pcre_date, [2010-01-02])
  # Libtool shared library interface versions (current:revision:age)
  m4_define(libpcre_version, [0:1:0])
 Line 22 
 AC_CONFIG_SRCDIR([pcre.h.in])
  AM_INIT_AUTOMAKE([dist-bzip2 dist-zip])
  AC_CONFIG_HEADERS(config.h)
+ # This was added at the suggestion of libtoolize (03-Jan-10)
+ AC_CONFIG_MACRO_DIR([m4])
  # 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
-Line 60 
 then
+Line 63 
 then
    fi
  fi
+ # AC_PROG_CXX will return "g++" even if no c++ compiler is installed.
+ # Check for that case, and just disable c++ code if g++ doesn't run.
+ AC_LANG_PUSH(C++)
+ AC_COMPILE_IFELSE(AC_LANG_PROGRAM([],[]),, CXX=""; CXXCP=""; CXXFLAGS="")
+ AC_LANG_POP
+ # Check for a 64-bit integer type
+ AC_TYPE_INT64_T
  AC_PROG_INSTALL
  AC_LIBTOOL_WIN32_DLL
-Line 97 
 AC_ARG_ENABLE(rebuild-chartables,
+Line 108 
 AC_ARG_ENABLE(rebuild-chartables,
  # Handle --enable-utf8 (disabled by default)
  AC_ARG_ENABLE(utf8,
                AS_HELP_STRING([--enable-utf8],
-                              [enable UTF-8 support]),
+                              [enable UTF-8 support (incompatible with --enable-ebcdic)]),
                , enable_utf8=unset)
  # Handle --enable-unicode-properties
-Line 136 
 AC_ARG_ENABLE(newline-is-any,
+Line 147 
 AC_ARG_ENABLE(newline-is-any,
                ac_pcre_newline=any)
  enable_newline="$ac_pcre_newline"
+ # Handle --enable-bsr-anycrlf
+ AC_ARG_ENABLE(bsr-anycrlf,
+               AS_HELP_STRING([--enable-bsr-anycrlf],
+                              [\R matches only CR, LF, CRLF by default]),
+               , enable_bsr_anycrlf=no)
  # Handle --enable-ebcdic
  AC_ARG_ENABLE(ebcdic,
                AS_HELP_STRING([--enable-ebcdic],
-                              [assume EBCDIC coding rather than ASCII; use this only in (uncommon) EBCDIC environments; it implies --enable-rebuild-chartables]),
+                              [assume EBCDIC coding rather than ASCII; incompatible with --enable-utf8; use only in (uncommon) EBCDIC environments; it implies --enable-rebuild-chartables]),
                , enable_ebcdic=no)
  # Handle --disable-stack-for-recursion
-Line 148 
 AC_ARG_ENABLE(stack-for-recursion,
+Line 165 
 AC_ARG_ENABLE(stack-for-recursion,
                               [don't use stack recursion when matching]),
                , enable_stack_for_recursion=yes)
+ # Handle --enable-pcregrep-libz
+ AC_ARG_ENABLE(pcregrep-libz,
+               AS_HELP_STRING([--enable-pcregrep-libz],
+                              [link pcregrep with libz to handle .gz files]),
+               , enable_pcregrep_libz=no)
+ # Handle --enable-pcregrep-libbz2
+ AC_ARG_ENABLE(pcregrep-libbz2,
+               AS_HELP_STRING([--enable-pcregrep-libbz2],
+                              [link pcregrep with libbz2 to handle .bz2 files]),
+               , enable_pcregrep_libbz2=no)
+ # Handle --enable-pcretest-libreadline
+ AC_ARG_ENABLE(pcretest-libreadline,
+               AS_HELP_STRING([--enable-pcretest-libreadline],
+                              [link pcretest with libreadline]),
+               , enable_pcretest_libreadline=no)
  # Handle --with-posix-malloc-threshold=NBYTES
  AC_ARG_WITH(posix-malloc-threshold,
              AS_HELP_STRING([--with-posix-malloc-threshold=NBYTES],
-Line 197 
 then
+Line 232 
 then
  fi
  # Make sure that if enable_ebcdic is set, rebuild_chartables is also enabled.
+ # Also check that UTF-8 support is not requested, because PCRE cannot handle
+ # EBCDIC and UTF-8 in the same build. To do so it would need to use different
+ # character constants depending on the mode.
  #
  if test "x$enable_ebcdic" = "xyes"
  then
    enable_rebuild_chartables=yes
+   if test "x$enable_utf8" = "xyes"
+   then
+     AC_MSG_ERROR([support for EBCDIC and UTF-8 cannot be enabled at the same time])
+   fi
  fi
  # Convert the newline identifier into the appropriate integer value.
-Line 231 
 it to run on SunOS4 and other "close to
+Line 273 
 it to run on SunOS4 and other "close to
  If you are going to build PCRE "by hand" on a system without "configure" you
  should copy the distributed config.h.generic to config.h, and then set up the
- macros the way you need them. Alternatively, you can avoid editing by using -D
+ macro definitions the way you need them. You must then add -DHAVE_CONFIG_H to
- on the compiler command line to set the macro values.
+ all of your compile commands, so that config.h is included at the start of
+ every source.
+ Alternatively, you can avoid editing by using -D on the compiler command line
+ to set the macro values. In this case, you do not have to set -DHAVE_CONFIG_H.
  PCRE uses memmove() if HAVE_MEMMOVE is set to 1; otherwise it uses bcopy() if
  HAVE_BCOPY is set to 1. If your system has neither bcopy() nor memmove(), set
-Line 249 
 if test "x$enable_cpp" = "xyes" -a -n "$
+Line 295 
 if test "x$enable_cpp" = "xyes" -a -n "$
  then
  AC_LANG_PUSH(C++)
+ # Older versions of pcre defined pcrecpp::no_arg, but in new versions
+ # it's called pcrecpp::RE::no_arg.  For backwards ABI compatibility,
+ # we want to make one an alias for the other.  Different systems do
+ # this in different ways.  Some systems, for instance, can do it via
+ # a linker flag: -alias (for os x 10.5) or -i (for os x <=10.4).
+ OLD_LDFLAGS="$LDFLAGS"
+ for flag in "-alias,__ZN7pcrecpp2RE6no_argE,__ZN7pcrecpp6no_argE" \
+             "-i__ZN7pcrecpp6no_argE:__ZN7pcrecpp2RE6no_argE"; do
+   AC_MSG_CHECKING([for alias support in the linker])
+   LDFLAGS="$OLD_LDFLAGS -Wl,$flag"
+   # We try to run the linker with this new ld flag.  If the link fails,
+   # we give up and remove the new flag from LDFLAGS.
+   AC_LINK_IFELSE(AC_LANG_PROGRAM([namespace pcrecpp {
+                                     class RE { static int no_arg; };
+                                     int RE::no_arg;
+                                   }],
+                                  []),
+                  [AC_MSG_RESULT([yes]);
+                   EXTRA_LIBPCRECPP_LDFLAGS="$EXTRA_LIBPCRECPP_LDFLAGS -Wl,$flag";
+                   break;],
+                  AC_MSG_RESULT([no]))
+ done
+ LDFLAGS="$OLD_LDFLAGS"
  # 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
  # so it's easy to change back to 'regular' autoconf vars if we needed to.
-Line 258 
 AC_CHECK_HEADERS(bits/type_traits.h, [pc
+Line 328 
 AC_CHECK_HEADERS(bits/type_traits.h, [pc
                                       [pcre_have_bits_type_traits="0"])
  AC_CHECK_HEADERS(type_traits.h, [pcre_have_type_traits="1"],
                                  [pcre_have_type_traits="0"])
  AC_LANG_POP
  fi
  # Using AC_SUBST eliminates the need to include config.h in a public .h file
-Line 273 
 AM_CONDITIONAL(WITH_REBUILD_CHARTABLES,
+Line 344 
 AM_CONDITIONAL(WITH_REBUILD_CHARTABLES,
  AC_C_CONST
  AC_TYPE_SIZE_T
- AC_CHECK_TYPES([long long],
+ pcre_have_strotolonglong=0
-                [pcre_have_long_long="1"],
+ AC_CHECK_FUNCS(strtoq strtoll _strtoi64, [pcre_have_strotolonglong="1"; break])
-                [pcre_have_long_long="0"])
+ # If we can't convert a string to a long long, pretend we don't even
- AC_CHECK_TYPES([unsigned long long],
+ # have a long long.
-                [pcre_have_ulong_long="1"],
+ if test $pcre_have_strotolonglong = "0"; then
-                [pcre_have_ulong_long="0"])
+    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)
  # Checks for library functions.
- AC_CHECK_FUNCS(bcopy memmove strerror strtoq strtoll)
+ AC_CHECK_FUNCS(bcopy memmove strerror)
+ # Check for the availability of libz (aka zlib)
+ AC_CHECK_HEADERS([zlib.h], [HAVE_ZLIB_H=1])
+ AC_CHECK_LIB([z], [gzopen], [HAVE_LIBZ=1])
+ # Check for the availability of libbz2. Originally we just used AC_CHECK_LIB,
+ # as for libz. However, this had the following problem, diagnosed and fixed by
+ # a user:
+ #
+ #   - libbz2 uses the Pascal calling convention (WINAPI) for the functions
+ #     under Win32.
+ #   - The standard autoconf AC_CHECK_LIB fails to include "bzlib.h",
+ #     therefore missing the function definition.
+ #   - The compiler thus generates a "C" signature for the test function.
+ #   - The linker fails to find the "C" function.
+ #   - PCRE fails to configure if asked to do so against libbz2.
+ #
+ # Solution:
+ #
+ #   - Replace the AC_CHECK_LIB test with a custom test.
+ AC_CHECK_HEADERS([bzlib.h], [HAVE_BZLIB_H=1])
+ # Original test
+ # AC_CHECK_LIB([bz2], [BZ2_bzopen], [HAVE_LIBBZ2=1])
+ #
+ # Custom test follows
+ AC_MSG_CHECKING([for libbz2])
+ OLD_LIBS="$LIBS"
+ LIBS="$LIBS -lbz2"
+ AC_LINK_IFELSE( AC_LANG_PROGRAM([[
+ #ifdef HAVE_BZLIB_H
+ #include <bzlib.h>
+ #endif]],
+ [[return (int)BZ2_bzopen("conftest", "rb");]]),
+ [AC_MSG_RESULT([yes]);HAVE_LIBBZ2=1; break;],
+ AC_MSG_RESULT([no]))
+ LIBS="$OLD_LIBS"
+ # Check for the availabiity of libreadline
+ AC_CHECK_HEADERS([readline/readline.h], [HAVE_READLINE_H=1])
+ AC_CHECK_HEADERS([readline/history.h], [HAVE_HISTORY_H=1])
+ AC_CHECK_LIB([readline], [readline], [HAVE_LIB_READLINE=1])
  # This facilitates -ansi builds under Linux
  dnl AC_DEFINE([_GNU_SOURCE], [], [Enable GNU extensions in glibc])
+ PCRE_STATIC_CFLAG=""
  if test "x$enable_shared" = "xno" ; then
    AC_DEFINE([PCRE_STATIC], [1], [
      Define if linking statically (TODO: make nice with Libtool)])
+   PCRE_STATIC_CFLAG="-DPCRE_STATIC"
  fi
+ AC_SUBST(PCRE_STATIC_CFLAG)
  # Here is where pcre specific defines are handled
  if test "$enable_utf8" = "yes"; then
    AC_DEFINE([SUPPORT_UTF8], [], [
-     Define to enable support for the UTF-8 Unicode encoding.])
+     Define to enable support for the UTF-8 Unicode encoding. This will
+     work even in an EBCDIC environment, but it is incompatible with
+     the EBCDIC macro. That is, PCRE can support *either* EBCDIC code
+     *or* ASCII/UTF-8, but not both at once.])
  fi
  if test "$enable_unicode_properties" = "yes"; then
-Line 319 
 if test "$enable_stack_for_recursion" =
+Line 450 
 if test "$enable_stack_for_recursion" =
      (use --disable-stack-for-recursion).])
  fi
+ if test "$enable_pcregrep_libz" = "yes"; then
+   AC_DEFINE([SUPPORT_LIBZ], [], [
+     Define to allow pcregrep to be linked with libz, so that it is
+     able to handle .gz files.])
+ fi
+ if test "$enable_pcregrep_libbz2" = "yes"; then
+   AC_DEFINE([SUPPORT_LIBBZ2], [], [
+     Define to allow pcregrep to be linked with libbz2, so that it is
+     able to handle .bz2 files.])
+ fi
+ if test "$enable_pcretest_libreadline" = "yes"; then
+   AC_DEFINE([SUPPORT_LIBREADLINE], [], [
+     Define to allow pcretest to be linked with libreadline.])
+ fi
  AC_DEFINE_UNQUOTED([NEWLINE], [$ac_pcre_newline_value], [
    The value of NEWLINE determines the newline character sequence. On
-   Unix-like systems, "configure" can be used to override the default,
+   systems that support it, "configure" can be used to override the
-   which is 10. The possible values are 10 (LF), 13 (CR), 3338 (CRLF),
+   default, which is 10. The possible values are 10 (LF), 13 (CR),
-   -1 (ANY), or -2 (ANYCRLF).])
+(CRLF), -1 (ANY), or -2 (ANYCRLF).])
+ if test "$enable_bsr_anycrlf" = "yes"; then
+   AC_DEFINE([BSR_ANYCRLF], [], [
+     By default, the \R escape sequence matches any Unicode line ending
+     character or sequence of characters. If BSR_ANYCRLF is defined, this is
+     changed so that backslash-R matches only CR, LF, or CRLF. The build-
+     time default can be overridden by the user of PCRE at runtime. On
+     systems that support it, "configure" can be used to override the
+     default.])
+ fi
  AC_DEFINE_UNQUOTED([LINK_SIZE], [$with_link_size], [
    The value of LINK_SIZE determines the number of bytes used to store
-Line 392 
 if test "$enable_ebcdic" = "yes"; then
+Line 550 
 if test "$enable_ebcdic" = "yes"; then
    AC_DEFINE_UNQUOTED([EBCDIC], [], [
      If you are compiling for a system that uses EBCDIC instead of ASCII
      character codes, define this macro as 1. On systems that can use
-     "configure", this can be done via --enable-ebcdic.])
+     "configure", this can be done via --enable-ebcdic. PCRE will then
+     assume that all input strings are in EBCDIC. If you do not define
+     this macro, PCRE will assume input strings are ASCII or UTF-8 Unicode.
+     It is not possible to build a version of PCRE that supports both
+     EBCDIC and UTF-8.])
  fi
  # Platform specific issues
-Line 410 
 esac
+Line 572 
 esac
  # The extra LDFLAGS for each particular library
  # (Note: The libpcre*_version bits are m4 variables, assigned above)
- EXTRA_LIBPCRE_LDFLAGS="$NO_UNDEFINED -version-info libpcre_version"
+ EXTRA_LIBPCRE_LDFLAGS="$EXTRA_LIBPCRE_LDFLAGS \
+                        $NO_UNDEFINED -version-info libpcre_version"
- EXTRA_LIBPCREPOSIX_LDFLAGS="$NO_UNDEFINED -version-info libpcreposix_version"
+ EXTRA_LIBPCREPOSIX_LDFLAGS="$EXTRA_LIBPCREPOSIX_LDFLAGS \
+                             $NO_UNDEFINED -version-info libpcreposix_version"
- EXTRA_LIBPCRECPP_LDFLAGS="$NO_UNDEFINED $EXPORT_ALL_SYMBOLS -version-info libpcrecpp_version"
+ EXTRA_LIBPCRECPP_LDFLAGS="$EXTRA_LIBPCRECPP_LDFLAGS \
+                           $NO_UNDEFINED -version-info libpcrecpp_version \
+                           $EXPORT_ALL_SYMBOLS"
  AC_SUBST(EXTRA_LIBPCRE_LDFLAGS)
  AC_SUBST(EXTRA_LIBPCREPOSIX_LDFLAGS)
-Line 424 
 AC_SUBST(EXTRA_LIBPCRECPP_LDFLAGS)
+Line 590 
 AC_SUBST(EXTRA_LIBPCRECPP_LDFLAGS)
  DISTCHECK_CONFIGURE_FLAGS="--enable-cpp --enable-unicode-properties"
  AC_SUBST(DISTCHECK_CONFIGURE_FLAGS)
+ # Check that, if --enable-pcregrep-libz or --enable-pcregrep-libbz2 is
+ # specified, the relevant library is available.
+ if test "$enable_pcregrep_libz" = "yes"; then
+   if test "$HAVE_ZLIB_H" != "1"; then
+     echo "** Cannot --enable-pcregrep-libz because zlib.h was not found"
+     exit 1
+   fi
+   if test "$HAVE_LIBZ" != "1"; then
+     echo "** Cannot --enable-pcregrep-libz because libz was not found"
+     exit 1
+   fi
+   LIBZ="-lz"
+ fi
+ AC_SUBST(LIBZ)
+ if test "$enable_pcregrep_libbz2" = "yes"; then
+   if test "$HAVE_BZLIB_H" != "1"; then
+     echo "** Cannot --enable-pcregrep-libbz2 because bzlib.h was not found"
+     exit 1
+   fi
+   if test "$HAVE_LIBBZ2" != "1"; then
+     echo "** Cannot --enable-pcregrep-libbz2 because libbz2 was not found"
+     exit 1
+   fi
+   LIBBZ2="-lbz2"
+ fi
+ AC_SUBST(LIBBZ2)
+ # Similarly for --enable-pcretest-readline
+ if test "$enable_pcretest_libreadline" = "yes"; then
+   if test "$HAVE_READLINE_H" != "1"; then
+     echo "** Cannot --enable-pcretest-readline because readline/readline.h was not found."
+     exit 1
+   fi
+   if test "$HAVE_HISTORY_H" != "1"; then
+     echo "** Cannot --enable-pcretest-readline because readline/history.h was not found."
+     exit 1
+   fi
+   LIBREADLINE="-lreadline"
+ fi
+ AC_SUBST(LIBREADLINE)
  # Produce these files, in addition to config.h.
  AC_CONFIG_FILES(
          Makefile
          libpcre.pc
+         libpcreposix.pc
          libpcrecpp.pc
          pcre-config
          pcre.h
-Line 446 
 AC_OUTPUT
+Line 657 
 AC_OUTPUT
  # Print out a nice little message after configure is run displaying your
  # chosen options.
- #
  cat <<EOF
  $PACKAGE-$VERSION configuration summary:
-     Install prefix ......... : ${prefix}
+     Install prefix .................. : ${prefix}
-     C preprocessor ......... : ${CPP}
+     C preprocessor .................. : ${CPP}
-     C compiler ............. : ${CC}
+     C compiler ...................... : ${CC}
-     C++ preprocessor ....... : ${CXXCPP}
+     C++ preprocessor ................ : ${CXXCPP}
-     C++ compiler ........... : ${CXX}
+     C++ compiler .................... : ${CXX}
-     Linker ................. : ${LD}
+     Linker .......................... : ${LD}
-     C preprocessor flags ... : ${CPPFLAGS}
+     C preprocessor flags ............ : ${CPPFLAGS}
-     C compiler flags ....... : ${CFLAGS}
+     C compiler flags ................ : ${CFLAGS}
-     C++ compiler flags ..... : ${CXXFLAGS}
+     C++ compiler flags .............. : ${CXXFLAGS}
-     Linker flags ........... : ${LDFLAGS}
+     Linker flags .................... : ${LDFLAGS}
-     Extra libraries ........ : ${LIBS}
+     Extra libraries ................. : ${LIBS}
-     Build C++ library ...... : ${enable_cpp}
+     Build C++ library ............... : ${enable_cpp}
-     Enable UTF-8 support ... : ${enable_utf8}
+     Enable UTF-8 support ............ : ${enable_utf8}
-     Unicode properties ..... : ${enable_unicode_properties}
+     Unicode properties .............. : ${enable_unicode_properties}
-     Newline char/sequence .. : ${enable_newline}
+     Newline char/sequence ........... : ${enable_newline}
-     EBCDIC coding .......... : ${enable_ebcdic}
+     \R matches only ANYCRLF ......... : ${enable_bsr_anycrlf}
-     Rebuild char tables .... : ${enable_rebuild_chartables}
+     EBCDIC coding ................... : ${enable_ebcdic}
-     Use stack recursion .... : ${enable_stack_for_recursion}
+     Rebuild char tables ............. : ${enable_rebuild_chartables}
-     POSIX mem threshold .... : ${with_posix_malloc_threshold}
+     Use stack recursion ............. : ${enable_stack_for_recursion}
-     Internal link size ..... : ${with_link_size}
+     POSIX mem threshold ............. : ${with_posix_malloc_threshold}
-     Match limit ............ : ${with_match_limit}
+     Internal link size .............. : ${with_link_size}
-     Match limit recursion .. : ${with_match_limit_recursion}
+     Match limit ..................... : ${with_match_limit}
-     Build shared libs ...... : ${enable_shared}
+     Match limit recursion ........... : ${with_match_limit_recursion}
-     Build static libs ...... : ${enable_static}
+     Build shared libs ............... : ${enable_shared}
+     Build static libs ............... : ${enable_static}
+     Link pcregrep with libz ......... : ${enable_pcregrep_libz}
+     Link pcregrep with libbz2 ....... : ${enable_pcregrep_libbz2}
+     Link pcretest with libreadline .. : ${enable_pcretest_libreadline}
  EOF

 Legend:



Removed from v.213
 


changed lines


 
Added in v.479
 Legend:



Removed from v.213
 


changed lines


 
Added in v.479
-Removed from v.213
+Added in v.479

webmaster@exim.org	ViewVC Help
Powered by ViewVC 1.1.12