[BACK]Return to configure.ac CVS log [TXT] [DIR] Up to [ELWIX - Embedded LightWeight unIX -] / embedaddon / pcre

Diff for /embedaddon/pcre/configure.ac between versions 1.1.1.1 and 1.1.1.2

version 1.1.1.1, 2012/02/21 23:05:51 version 1.1.1.2, 2012/02/21 23:50:25
Line 9  dnl The PCRE_PRERELEASE feature is for identifying rel Line 9  dnl The PCRE_PRERELEASE feature is for identifying rel
 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.
   
 m4_define(pcre_major, [8])  m4_define(pcre_major, [8])
m4_define(pcre_minor, [21])m4_define(pcre_minor, [30])
 m4_define(pcre_prerelease, [])  m4_define(pcre_prerelease, [])
m4_define(pcre_date, [2011-12-12])m4_define(pcre_date, [2012-02-04])
   
   # NOTE: The CMakeLists.txt file searches for the above variables in the first
   # 50 lines of this file. Please update that if the variables above are moved.
   
 # Libtool shared library interface versions (current:revision:age)  # Libtool shared library interface versions (current:revision:age)
m4_define(libpcre_version, [0:1:0])m4_define(libpcre_version, [1:0:0])
 m4_define(libpcre16_version, [0:0:0])
 m4_define(libpcreposix_version, [0:0:0])  m4_define(libpcreposix_version, [0:0:0])
 m4_define(libpcrecpp_version, [0:0:0])  m4_define(libpcrecpp_version, [0:0:0])
   
Line 22  AC_PREREQ(2.57) Line 26  AC_PREREQ(2.57)
 AC_INIT(PCRE, pcre_major.pcre_minor[]pcre_prerelease, , pcre)  AC_INIT(PCRE, pcre_major.pcre_minor[]pcre_prerelease, , pcre)
 AC_CONFIG_SRCDIR([pcre.h.in])  AC_CONFIG_SRCDIR([pcre.h.in])
 AM_INIT_AUTOMAKE([dist-bzip2 dist-zip])  AM_INIT_AUTOMAKE([dist-bzip2 dist-zip])
   m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
 AC_CONFIG_HEADERS(config.h)  AC_CONFIG_HEADERS(config.h)
   
 # This was added at the suggestion of libtoolize (03-Jan-10)  # This was added at the suggestion of libtoolize (03-Jan-10)
Line 104  then Line 109  then
   htmldir='${docdir}/html'    htmldir='${docdir}/html'
 fi  fi
   
   # Handle --disable-pcre8 (enabled by default)
   AC_ARG_ENABLE(pcre8,
                 AS_HELP_STRING([--disable-pcre8],
                                [disable 8 bit character support]),
                 , enable_pcre8=unset)
   AC_SUBST(enable_pcre8)
   
   # Handle --enable-pcre16 (disabled by default)
   AC_ARG_ENABLE(pcre16,
                 AS_HELP_STRING([--enable-pcre16],
                                [enable 16 bit character support]),
                 , enable_pcre16=unset)
   AC_SUBST(enable_pcre16)
   
 # Handle --disable-cpp. The substitution of enable_cpp is needed for use in  # Handle --disable-cpp. The substitution of enable_cpp is needed for use in
 # pcre-config.  # pcre-config.
 AC_ARG_ENABLE(cpp,  AC_ARG_ENABLE(cpp,
               AS_HELP_STRING([--disable-cpp],                AS_HELP_STRING([--disable-cpp],
                              [disable C++ support]),                               [disable C++ support]),
              , enable_cpp=yes)              , enable_cpp=unset)
 AC_SUBST(enable_cpp)  AC_SUBST(enable_cpp)
   
 # Handle --enable-jit (disabled by default)  # Handle --enable-jit (disabled by default)
Line 133  AC_ARG_ENABLE(rebuild-chartables, Line 152  AC_ARG_ENABLE(rebuild-chartables,
 # Handle --enable-utf8 (disabled by default)  # Handle --enable-utf8 (disabled by default)
 AC_ARG_ENABLE(utf8,  AC_ARG_ENABLE(utf8,
               AS_HELP_STRING([--enable-utf8],                AS_HELP_STRING([--enable-utf8],
                             [enable UTF-8 support (incompatible with --enable-ebcdic)]),                             [another name for --enable-utf. Kept only for compatibility reasons]),
               , enable_utf8=unset)                , enable_utf8=unset)
   
   # Handle --enable-utf (disabled by default)
   AC_ARG_ENABLE(utf,
                 AS_HELP_STRING([--enable-utf],
                                [enable UTF-8/16 support (incompatible with --enable-ebcdic)]),
                 , enable_utf=unset)
   
 # Handle --enable-unicode-properties  # Handle --enable-unicode-properties
 AC_ARG_ENABLE(unicode-properties,  AC_ARG_ENABLE(unicode-properties,
               AS_HELP_STRING([--enable-unicode-properties],                AS_HELP_STRING([--enable-unicode-properties],
                             [enable Unicode properties support (implies --enable-utf8)]),                             [enable Unicode properties support (implies --enable-utf)]),
               , enable_unicode_properties=no)                , enable_unicode_properties=no)
   
 # Handle --enable-newline=NL  # Handle --enable-newline=NL
Line 181  AC_ARG_ENABLE(bsr-anycrlf, Line 206  AC_ARG_ENABLE(bsr-anycrlf,
 # Handle --enable-ebcdic  # Handle --enable-ebcdic
 AC_ARG_ENABLE(ebcdic,  AC_ARG_ENABLE(ebcdic,
               AS_HELP_STRING([--enable-ebcdic],                AS_HELP_STRING([--enable-ebcdic],
                             [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]),
               , enable_ebcdic=no)                , enable_ebcdic=no)
   
 # Handle --disable-stack-for-recursion  # Handle --disable-stack-for-recursion
Line 245  AC_ARG_WITH(match-limit-recursion, Line 270  AC_ARG_WITH(match-limit-recursion,
                            [default limit on internal recursion (default=MATCH_LIMIT)]),                             [default limit on internal recursion (default=MATCH_LIMIT)]),
             , with_match_limit_recursion=MATCH_LIMIT)              , with_match_limit_recursion=MATCH_LIMIT)
   
# Make sure that if enable_unicode_properties was set, that UTF-8 support# Copy enable_utf8 value to enable_utf for compatibility reasons
# is enabled.if test "x$enable_utf8" != "xunset"
#then
   if test "x$enable_utf" != "xunset"
   then
     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.])
   fi
   enable_utf=$enable_utf8
 fi
 
 # Set the default value for pcre8
 if test "x$enable_pcre8" = "xunset"
 then
   enable_pcre8=yes
 fi
 
 # Set the default value for pcre16
 if test "x$enable_pcre16" = "xunset"
 then
   enable_pcre16=no
 fi
 
 # Make sure enable_pcre8 or enable_pcre16 was set
 if test "x$enable_pcre8$enable_pcre16" = "xnono"
 then
   AC_MSG_ERROR([Either 8 or 16 bit (or both) pcre library must be enabled])
 fi
 
 # Make sure that if enable_unicode_properties was set, that UTF support is enabled.
 if test "x$enable_unicode_properties" = "xyes"  if test "x$enable_unicode_properties" = "xyes"
 then  then
  if test "x$enable_utf8" = "xno"  if test "x$enable_utf" = "xno"
   then    then
    AC_MSG_ERROR([support for Unicode properties requires UTF-8 support])    AC_MSG_ERROR([support for Unicode properties requires UTF-8/16 support])
   fi    fi
  enable_utf8=yes  enable_utf=yes
 fi  fi
   
if test "x$enable_utf8" = "xunset"# enable_utf is disabled by default.
 if test "x$enable_utf" = "xunset"
 then  then
  enable_utf8=no  enable_utf=no
 fi  fi
   
   # enable_cpp copies the value of enable_pcre8 by default
   if test "x$enable_cpp" = "xunset"
   then
     enable_cpp=$enable_pcre8
   fi
   
   # Make sure that if enable_cpp was set, that enable_pcre8 support is enabled
   if test "x$enable_cpp" = "xyes"
   then
     if test "x$enable_pcre8" = "xno"
     then
       AC_MSG_ERROR([C++ library requires pcre library with 8 bit characters])
     fi
   fi
   
 # 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.
# 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
# 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
 # character constants depending on the mode.  # character constants depending on the mode.
 #  #
 if test "x$enable_ebcdic" = "xyes"  if test "x$enable_ebcdic" = "xyes"
 then  then
   enable_rebuild_chartables=yes    enable_rebuild_chartables=yes
  if test "x$enable_utf8" = "xyes"  if test "x$enable_utf" = "xyes"
   then    then
    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])
   fi    fi
 fi  fi
   
Line 410  AC_SUBST(pcre_have_type_traits) Line 477  AC_SUBST(pcre_have_type_traits)
 AC_SUBST(pcre_have_bits_type_traits)  AC_SUBST(pcre_have_bits_type_traits)
   
 # Conditional compilation  # Conditional compilation
   AM_CONDITIONAL(WITH_PCRE8, test "x$enable_pcre8" = "xyes")
   AM_CONDITIONAL(WITH_PCRE16, test "x$enable_pcre16" = "xyes")
 AM_CONDITIONAL(WITH_PCRE_CPP, test "x$enable_cpp" = "xyes")  AM_CONDITIONAL(WITH_PCRE_CPP, test "x$enable_cpp" = "xyes")
 AM_CONDITIONAL(WITH_REBUILD_CHARTABLES, test "x$enable_rebuild_chartables" = "xyes")  AM_CONDITIONAL(WITH_REBUILD_CHARTABLES, test "x$enable_rebuild_chartables" = "xyes")
 AM_CONDITIONAL(WITH_JIT, test "x$enable_jit" = "xyes")  AM_CONDITIONAL(WITH_JIT, test "x$enable_jit" = "xyes")
AM_CONDITIONAL(WITH_UTF8, test "x$enable_utf8" = "xyes")AM_CONDITIONAL(WITH_UTF, test "x$enable_utf" = "xyes")
   
 # Checks for typedefs, structures, and compiler characteristics.  # Checks for typedefs, structures, and compiler characteristics.
   
Line 467  LIBS="$OLD_LIBS" Line 536  LIBS="$OLD_LIBS"
   
 AC_CHECK_HEADERS([readline/readline.h], [HAVE_READLINE_H=1])  AC_CHECK_HEADERS([readline/readline.h], [HAVE_READLINE_H=1])
 AC_CHECK_HEADERS([readline/history.h], [HAVE_HISTORY_H=1])  AC_CHECK_HEADERS([readline/history.h], [HAVE_HISTORY_H=1])
AC_CHECK_LIB([readline], [readline], [HAVE_LIB_READLINE=1])AC_CHECK_LIB([readline], [readline], [LIBREADLINE="-lreadline"],
   [unset ac_cv_lib_readline_readline;
    AC_CHECK_LIB([readline], [readline], [LIBREADLINE="-ltinfo"],
     [unset ac_cv_lib_readline_readline;
      AC_CHECK_LIB([readline], [readline], [LIBREADLINE="-lcurses"],
       [unset ac_cv_lib_readline_readline;
        AC_CHECK_LIB([readline], [readline], [LIBREADLINE="-lncurses"],
         [unset ac_cv_lib_readline_readline;
          AC_CHECK_LIB([readline], [readline], [LIBREADLINE="-lncursesw"],
           [unset ac_cv_lib_readline_readline;
            AC_CHECK_LIB([readline], [readline], [LIBREADLINE="-ltermcap"],
             [LIBREADLINE=""],
             [-ltermcap])],
           [-lncursesw])],
         [-lncurses])],
       [-lcurses])],
     [-ltinfo])])
 AC_SUBST(LIBREADLINE)
 if test -n "$LIBREADLINE"; then
   if test "$LIBREADLINE" != "-lreadline"; then
     echo "-lreadline needs $LIBREADLINE"
     LIBREADLINE="-lreadline $LIBREADLINE"
   fi
 fi
   
 # This facilitates -ansi builds under Linux  # This facilitates -ansi builds under Linux
 dnl AC_DEFINE([_GNU_SOURCE], [], [Enable GNU extensions in glibc])  dnl AC_DEFINE([_GNU_SOURCE], [], [Enable GNU extensions in glibc])
Line 482  AC_SUBST(PCRE_STATIC_CFLAG) Line 574  AC_SUBST(PCRE_STATIC_CFLAG)
   
 # Here is where pcre specific defines are handled  # Here is where pcre specific defines are handled
   
   if test "$enable_pcre8" = "yes"; then
     AC_DEFINE([SUPPORT_PCRE8], [], [
       Define to enable the 8 bit PCRE library.])
   fi
   
   if test "$enable_pcre16" = "yes"; then
     AC_DEFINE([SUPPORT_PCRE16], [], [
       Define to enable the 16 bit PCRE library.])
   fi
   
 if test "$enable_jit" = "yes"; then  if test "$enable_jit" = "yes"; then
   AC_DEFINE([SUPPORT_JIT], [], [    AC_DEFINE([SUPPORT_JIT], [], [
     Define to enable support for Just-In-Time compiling.])      Define to enable support for Just-In-Time compiling.])
Line 494  if test "$enable_pcregrep_jit" = "yes"; then Line 596  if test "$enable_pcregrep_jit" = "yes"; then
     Define to enable JIT support in pcregrep.])      Define to enable JIT support in pcregrep.])
 fi  fi
   
if test "$enable_utf8" = "yes"; thenif test "$enable_utf" = "yes"; then
  AC_DEFINE([SUPPORT_UTF8], [], [  AC_DEFINE([SUPPORT_UTF], [], [
    Define to enable support for the UTF-8 Unicode encoding. This will    Define to enable support for the UTF-8/16 Unicode encoding. This
    work even in an EBCDIC environment, but it is incompatible with    will work even in an EBCDIC environment, but it is incompatible
    the EBCDIC macro. That is, PCRE can support *either* EBCDIC code    with the EBCDIC macro. That is, PCRE can support *either* EBCDIC
    *or* ASCII/UTF-8, but not both at once.])    code *or* ASCII/UTF-8/16, but not both at once.])
 fi  fi
   
 if test "$enable_unicode_properties" = "yes"; then  if test "$enable_unicode_properties" = "yes"; then
Line 634  if test "$enable_ebcdic" = "yes"; then Line 736  if test "$enable_ebcdic" = "yes"; then
     character codes, define this macro as 1. On systems that can use      character codes, define this macro as 1. On systems that can use
     "configure", this can be done via --enable-ebcdic. PCRE will then      "configure", this can be done via --enable-ebcdic. PCRE will then
     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
    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
    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
    EBCDIC and UTF-8.])    supports both EBCDIC and UTF-8/16.])
 fi  fi
   
 # Platform specific issues  # Platform specific issues
Line 657  esac Line 759  esac
 EXTRA_LIBPCRE_LDFLAGS="$EXTRA_LIBPCRE_LDFLAGS \  EXTRA_LIBPCRE_LDFLAGS="$EXTRA_LIBPCRE_LDFLAGS \
                        $NO_UNDEFINED -version-info libpcre_version"                         $NO_UNDEFINED -version-info libpcre_version"
   
   EXTRA_LIBPCRE16_LDFLAGS="$EXTRA_LIBPCRE16_LDFLAGS \
                          $NO_UNDEFINED -version-info libpcre16_version"
   
 EXTRA_LIBPCREPOSIX_LDFLAGS="$EXTRA_LIBPCREPOSIX_LDFLAGS \  EXTRA_LIBPCREPOSIX_LDFLAGS="$EXTRA_LIBPCREPOSIX_LDFLAGS \
                             $NO_UNDEFINED -version-info libpcreposix_version"                              $NO_UNDEFINED -version-info libpcreposix_version"
   
Line 665  EXTRA_LIBPCRECPP_LDFLAGS="$EXTRA_LIBPCRECPP_LDFLAGS \ Line 770  EXTRA_LIBPCRECPP_LDFLAGS="$EXTRA_LIBPCRECPP_LDFLAGS \
                           $EXPORT_ALL_SYMBOLS"                            $EXPORT_ALL_SYMBOLS"
   
 AC_SUBST(EXTRA_LIBPCRE_LDFLAGS)  AC_SUBST(EXTRA_LIBPCRE_LDFLAGS)
   AC_SUBST(EXTRA_LIBPCRE16_LDFLAGS)
 AC_SUBST(EXTRA_LIBPCREPOSIX_LDFLAGS)  AC_SUBST(EXTRA_LIBPCREPOSIX_LDFLAGS)
 AC_SUBST(EXTRA_LIBPCRECPP_LDFLAGS)  AC_SUBST(EXTRA_LIBPCRECPP_LDFLAGS)
   
# When we run 'make distcheck', use these arguments.# When we run 'make distcheck', use these arguments. Turning off compiler
DISTCHECK_CONFIGURE_FLAGS="--enable-jit --enable-cpp --enable-unicode-properties"# optimization makes it run faster.
 DISTCHECK_CONFIGURE_FLAGS="CFLAGS='' CXXFLAGS='' --enable-pcre16 --enable-jit --enable-cpp --enable-unicode-properties"
 AC_SUBST(DISTCHECK_CONFIGURE_FLAGS)  AC_SUBST(DISTCHECK_CONFIGURE_FLAGS)
   
 # Check that, if --enable-pcregrep-libz or --enable-pcregrep-libbz2 is  # Check that, if --enable-pcregrep-libz or --enable-pcregrep-libbz2 is
Line 712  if test "$enable_pcretest_libreadline" = "yes"; then Line 819  if test "$enable_pcretest_libreadline" = "yes"; then
     echo "** Cannot --enable-pcretest-readline because readline/history.h was not found."      echo "** Cannot --enable-pcretest-readline because readline/history.h was not found."
     exit 1      exit 1
   fi    fi
  LIBREADLINE="-lreadline"  if test -z "$LIBREADLINE"; then
     echo "** Cannot --enable-pcretest-readline because readline library was not found."
     exit 1
   fi
 fi  fi
 AC_SUBST(LIBREADLINE)  
   
 # Produce these files, in addition to config.h.  # Produce these files, in addition to config.h.
 AC_CONFIG_FILES(  AC_CONFIG_FILES(
         Makefile          Makefile
         libpcre.pc          libpcre.pc
        libpcreposix.pc        libpcre16.pc
         libpcreposix.pc
         libpcrecpp.pc          libpcrecpp.pc
         pcre-config          pcre-config
         pcre.h          pcre.h
Line 756  $PACKAGE-$VERSION configuration summary: Line 866  $PACKAGE-$VERSION configuration summary:
     Linker flags .................... : ${LDFLAGS}      Linker flags .................... : ${LDFLAGS}
     Extra libraries ................. : ${LIBS}      Extra libraries ................. : ${LIBS}
   
       Build 8 bit pcre library ........ : ${enable_pcre8}
       Build 16 bit pcre library ....... : ${enable_pcre16}
     Build C++ library ............... : ${enable_cpp}      Build C++ library ............... : ${enable_cpp}
     Enable JIT compiling support .... : ${enable_jit}      Enable JIT compiling support .... : ${enable_jit}
    Enable UTF-8 support ............ : ${enable_utf8}    Enable UTF-8/16 support ......... : ${enable_utf}
     Unicode properties .............. : ${enable_unicode_properties}      Unicode properties .............. : ${enable_unicode_properties}
     Newline char/sequence ........... : ${enable_newline}      Newline char/sequence ........... : ${enable_newline}
     \R matches only ANYCRLF ......... : ${enable_bsr_anycrlf}      \R matches only ANYCRLF ......... : ${enable_bsr_anycrlf}
Removed from v.1.1.1.1  
changed lines
  Added in v.1.1.1.2

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>