/[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 550 by ph10, Sun Oct 10 16:24:11 2010 UTC revision 981 by ph10, Mon Jun 18 18:22:51 2012 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, [11])  m4_define(pcre_minor, [31])
13  m4_define(pcre_prerelease, [-RC1])  m4_define(pcre_prerelease, [-RC2])
14  m4_define(pcre_date, [2010-10-09])  m4_define(pcre_date, [2012-06-18])
15    
16    # NOTE: The CMakeLists.txt file searches for the above variables in the first
17    # 50 lines of this file. Please update that if the variables above are moved.
18    
19  # Libtool shared library interface versions (current:revision:age)  # Libtool shared library interface versions (current:revision:age)
20  m4_define(libpcre_version, [0:1:0])  m4_define(libpcre_version, [1:0:0])
21    m4_define(libpcre16_version, [0:0:0])
22  m4_define(libpcreposix_version, [0:0:0])  m4_define(libpcreposix_version, [0:0:0])
23  m4_define(libpcrecpp_version, [0:0:0])  m4_define(libpcrecpp_version, [0:0:0])
24    
# Line 22  AC_PREREQ(2.57) Line 26  AC_PREREQ(2.57)
26  AC_INIT(PCRE, pcre_major.pcre_minor[]pcre_prerelease, , pcre)  AC_INIT(PCRE, pcre_major.pcre_minor[]pcre_prerelease, , pcre)
27  AC_CONFIG_SRCDIR([pcre.h.in])  AC_CONFIG_SRCDIR([pcre.h.in])
28  AM_INIT_AUTOMAKE([dist-bzip2 dist-zip])  AM_INIT_AUTOMAKE([dist-bzip2 dist-zip])
29    m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
30  AC_CONFIG_HEADERS(config.h)  AC_CONFIG_HEADERS(config.h)
31    
32  # This was added at the suggestion of libtoolize (03-Jan-10)  # This was added at the suggestion of libtoolize (03-Jan-10)
# Line 68  fi Line 73  fi
73  # 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.
74  # 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.
75  AC_LANG_PUSH(C++)  AC_LANG_PUSH(C++)
76  AC_COMPILE_IFELSE(AC_LANG_PROGRAM([],[]),, CXX=""; CXXCP=""; CXXFLAGS="")  AC_COMPILE_IFELSE([AC_LANG_PROGRAM([],[])],, CXX=""; CXXCP=""; CXXFLAGS="")
77  AC_LANG_POP  AC_LANG_POP
78    
79  # Check for a 64-bit integer type  # Check for a 64-bit integer type
# Line 76  AC_TYPE_INT64_T Line 81  AC_TYPE_INT64_T
81    
82  AC_PROG_INSTALL  AC_PROG_INSTALL
83  AC_LIBTOOL_WIN32_DLL  AC_LIBTOOL_WIN32_DLL
84  AC_PROG_LIBTOOL  LT_INIT
85  AC_PROG_LN_S  AC_PROG_LN_S
86    
87  PCRE_MAJOR="pcre_major"  PCRE_MAJOR="pcre_major"
# Line 104  then Line 109  then
109    htmldir='${docdir}/html'    htmldir='${docdir}/html'
110  fi  fi
111    
112    # Handle --disable-pcre8 (enabled by default)
113    AC_ARG_ENABLE(pcre8,
114                  AS_HELP_STRING([--disable-pcre8],
115                                 [disable 8 bit character support]),
116                  , enable_pcre8=unset)
117    AC_SUBST(enable_pcre8)
118    
119    # Handle --enable-pcre16 (disabled by default)
120    AC_ARG_ENABLE(pcre16,
121                  AS_HELP_STRING([--enable-pcre16],
122                                 [enable 16 bit character support]),
123                  , enable_pcre16=unset)
124    AC_SUBST(enable_pcre16)
125    
126  # 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
127  # pcre-config.  # pcre-config.
128  AC_ARG_ENABLE(cpp,  AC_ARG_ENABLE(cpp,
129                AS_HELP_STRING([--disable-cpp],                AS_HELP_STRING([--disable-cpp],
130                               [disable C++ support]),                               [disable C++ support]),
131                , enable_cpp=yes)                , enable_cpp=unset)
132  AC_SUBST(enable_cpp)  AC_SUBST(enable_cpp)
133    
134    # Handle --enable-jit (disabled by default)
135    AC_ARG_ENABLE(jit,
136                  AS_HELP_STRING([--enable-jit],
137                                 [enable Just-In-Time compiling support]),
138                  , enable_jit=no)
139    
140    # Handle --disable-pcregrep-jit (enabled by default)
141    AC_ARG_ENABLE(pcregrep-jit,
142                  AS_HELP_STRING([--disable-pcregrep-jit],
143                                 [disable JIT support in pcregrep]),
144                  , enable_pcregrep_jit=yes)
145    
146  # Handle --enable-rebuild-chartables  # Handle --enable-rebuild-chartables
147  AC_ARG_ENABLE(rebuild-chartables,  AC_ARG_ENABLE(rebuild-chartables,
148                AS_HELP_STRING([--enable-rebuild-chartables],                AS_HELP_STRING([--enable-rebuild-chartables],
# Line 121  AC_ARG_ENABLE(rebuild-chartables, Line 152  AC_ARG_ENABLE(rebuild-chartables,
152  # Handle --enable-utf8 (disabled by default)  # Handle --enable-utf8 (disabled by default)
153  AC_ARG_ENABLE(utf8,  AC_ARG_ENABLE(utf8,
154                AS_HELP_STRING([--enable-utf8],                AS_HELP_STRING([--enable-utf8],
155                               [enable UTF-8 support (incompatible with --enable-ebcdic)]),                               [another name for --enable-utf. Kept only for compatibility reasons]),
156                , enable_utf8=unset)                , enable_utf8=unset)
157    
158    # Handle --enable-utf (disabled by default)
159    AC_ARG_ENABLE(utf,
160                  AS_HELP_STRING([--enable-utf],
161                                 [enable UTF-8/16 support (incompatible with --enable-ebcdic)]),
162                  , enable_utf=unset)
163    
164  # Handle --enable-unicode-properties  # Handle --enable-unicode-properties
165  AC_ARG_ENABLE(unicode-properties,  AC_ARG_ENABLE(unicode-properties,
166                AS_HELP_STRING([--enable-unicode-properties],                AS_HELP_STRING([--enable-unicode-properties],
167                               [enable Unicode properties support (implies --enable-utf8)]),                               [enable Unicode properties support (implies --enable-utf)]),
168                , enable_unicode_properties=no)                , enable_unicode_properties=no)
169    
170  # Handle --enable-newline=NL  # Handle --enable-newline=NL
# Line 169  AC_ARG_ENABLE(bsr-anycrlf, Line 206  AC_ARG_ENABLE(bsr-anycrlf,
206  # Handle --enable-ebcdic  # Handle --enable-ebcdic
207  AC_ARG_ENABLE(ebcdic,  AC_ARG_ENABLE(ebcdic,
208                AS_HELP_STRING([--enable-ebcdic],                AS_HELP_STRING([--enable-ebcdic],
209                               [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]),
210                , enable_ebcdic=no)                , enable_ebcdic=no)
211    
212  # Handle --disable-stack-for-recursion  # Handle --disable-stack-for-recursion
# Line 190  AC_ARG_ENABLE(pcregrep-libbz2, Line 227  AC_ARG_ENABLE(pcregrep-libbz2,
227                               [link pcregrep with libbz2 to handle .bz2 files]),                               [link pcregrep with libbz2 to handle .bz2 files]),
228                , enable_pcregrep_libbz2=no)                , enable_pcregrep_libbz2=no)
229    
230    # Handle --with-pcregrep-bufsize=N
231    AC_ARG_WITH(pcregrep-bufsize,
232                  AS_HELP_STRING([--with-pcregrep-bufsize=N],
233                                 [pcregrep buffer size (default=20480)]),
234                  , with_pcregrep_bufsize=20480)
235    
236    # Handle --enable-pcretest-libedit
237    AC_ARG_ENABLE(pcretest-libedit,
238                  AS_HELP_STRING([--enable-pcretest-libedit],
239                                 [link pcretest with libedit]),
240                  , enable_pcretest_libedit=no)
241    
242  # Handle --enable-pcretest-libreadline  # Handle --enable-pcretest-libreadline
243  AC_ARG_ENABLE(pcretest-libreadline,  AC_ARG_ENABLE(pcretest-libreadline,
244                AS_HELP_STRING([--enable-pcretest-libreadline],                AS_HELP_STRING([--enable-pcretest-libreadline],
# Line 227  AC_ARG_WITH(match-limit-recursion, Line 276  AC_ARG_WITH(match-limit-recursion,
276                             [default limit on internal recursion (default=MATCH_LIMIT)]),                             [default limit on internal recursion (default=MATCH_LIMIT)]),
277              , with_match_limit_recursion=MATCH_LIMIT)              , with_match_limit_recursion=MATCH_LIMIT)
278    
279  # Make sure that if enable_unicode_properties was set, that UTF-8 support  # Copy enable_utf8 value to enable_utf for compatibility reasons
280  # is enabled.  if test "x$enable_utf8" != "xunset"
281  #  then
282      if test "x$enable_utf" != "xunset"
283      then
284        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.])
285      fi
286      enable_utf=$enable_utf8
287    fi
288    
289    # Set the default value for pcre8
290    if test "x$enable_pcre8" = "xunset"
291    then
292      enable_pcre8=yes
293    fi
294    
295    # Set the default value for pcre16
296    if test "x$enable_pcre16" = "xunset"
297    then
298      enable_pcre16=no
299    fi
300    
301    # Make sure enable_pcre8 or enable_pcre16 was set
302    if test "x$enable_pcre8$enable_pcre16" = "xnono"
303    then
304      AC_MSG_ERROR([Either 8 or 16 bit (or both) pcre library must be enabled])
305    fi
306    
307    # Make sure that if enable_unicode_properties was set, that UTF support is enabled.
308  if test "x$enable_unicode_properties" = "xyes"  if test "x$enable_unicode_properties" = "xyes"
309  then  then
310    if test "x$enable_utf8" = "xno"    if test "x$enable_utf" = "xno"
311    then    then
312      AC_MSG_ERROR([support for Unicode properties requires UTF-8 support])      AC_MSG_ERROR([support for Unicode properties requires UTF-8/16 support])
313    fi    fi
314    enable_utf8=yes    enable_utf=yes
315    fi
316    
317    # enable_utf is disabled by default.
318    if test "x$enable_utf" = "xunset"
319    then
320      enable_utf=no
321  fi  fi
322    
323  if test "x$enable_utf8" = "xunset"  # enable_cpp copies the value of enable_pcre8 by default
324    if test "x$enable_cpp" = "xunset"
325  then  then
326    enable_utf8=no    enable_cpp=$enable_pcre8
327    fi
328    
329    # Make sure that if enable_cpp was set, that enable_pcre8 support is enabled
330    if test "x$enable_cpp" = "xyes"
331    then
332      if test "x$enable_pcre8" = "xno"
333      then
334        AC_MSG_ERROR([C++ library requires pcre library with 8 bit characters])
335      fi
336  fi  fi
337    
338  # 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.
339  # 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
340  # 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
341  # character constants depending on the mode.  # character constants depending on the mode.
342  #  #
343  if test "x$enable_ebcdic" = "xyes"  if test "x$enable_ebcdic" = "xyes"
344  then  then
345    enable_rebuild_chartables=yes    enable_rebuild_chartables=yes
346    if test "x$enable_utf8" = "xyes"    if test "x$enable_utf" = "xyes"
347    then    then
348      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])
349    fi    fi
350  fi  fi
351    
# Line 320  for flag in "-alias,__ZN7pcrecpp2RE6no_a Line 411  for flag in "-alias,__ZN7pcrecpp2RE6no_a
411    LDFLAGS="$OLD_LDFLAGS -Wl,$flag"    LDFLAGS="$OLD_LDFLAGS -Wl,$flag"
412    # 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,
413    # we give up and remove the new flag from LDFLAGS.    # we give up and remove the new flag from LDFLAGS.
414    AC_LINK_IFELSE(AC_LANG_PROGRAM([namespace pcrecpp {    AC_LINK_IFELSE([AC_LANG_PROGRAM([namespace pcrecpp {
415                                      class RE { static int no_arg; };                                      class RE { static int no_arg; };
416                                      int RE::no_arg;                                      int RE::no_arg;
417                                    }],                                    }],
418                                   []),                                   [])],
419                   [AC_MSG_RESULT([yes]);                   [AC_MSG_RESULT([yes]);
420                    EXTRA_LIBPCRECPP_LDFLAGS="$EXTRA_LIBPCRECPP_LDFLAGS -Wl,$flag";                    EXTRA_LIBPCRECPP_LDFLAGS="$EXTRA_LIBPCRECPP_LDFLAGS -Wl,$flag";
421                    break;],                    break;],
# Line 361  for fn in strtoq strtoll _strtoi64 strto Line 452  for fn in strtoq strtoll _strtoi64 strto
452    else    else
453      include=stdlib.h      include=stdlib.h
454    fi    fi
455    AC_COMPILE_IFELSE(AC_LANG_PROGRAM([#include <$include>],    AC_COMPILE_IFELSE([AC_LANG_PROGRAM([#include <$include>],
456                                      [char* e; return $fn("100", &e, 10)]),                                      [char* e; return $fn("100", &e, 10)])],
457                      [AC_MSG_RESULT(yes)                      [AC_MSG_RESULT(yes)
458                       AC_DEFINE_UNQUOTED(HAVE_`echo $fn | tr abcdefghijklmnopqrstuvwxyz ABCDEFGHIJKLMNOPQRSTUVWXYZ`, 1,                       AC_DEFINE_UNQUOTED(HAVE_`echo $fn | tr abcdefghijklmnopqrstuvwxyz ABCDEFGHIJKLMNOPQRSTUVWXYZ`, 1,
459                                          [Define to 1 if you have `$fn'.])                                          [Define to 1 if you have `$fn'.])
# Line 392  AC_SUBST(pcre_have_type_traits) Line 483  AC_SUBST(pcre_have_type_traits)
483  AC_SUBST(pcre_have_bits_type_traits)  AC_SUBST(pcre_have_bits_type_traits)
484    
485  # Conditional compilation  # Conditional compilation
486    AM_CONDITIONAL(WITH_PCRE8, test "x$enable_pcre8" = "xyes")
487    AM_CONDITIONAL(WITH_PCRE16, test "x$enable_pcre16" = "xyes")
488  AM_CONDITIONAL(WITH_PCRE_CPP, test "x$enable_cpp" = "xyes")  AM_CONDITIONAL(WITH_PCRE_CPP, test "x$enable_cpp" = "xyes")
489  AM_CONDITIONAL(WITH_REBUILD_CHARTABLES, test "x$enable_rebuild_chartables" = "xyes")  AM_CONDITIONAL(WITH_REBUILD_CHARTABLES, test "x$enable_rebuild_chartables" = "xyes")
490    AM_CONDITIONAL(WITH_JIT, test "x$enable_jit" = "xyes")
491    AM_CONDITIONAL(WITH_UTF, test "x$enable_utf" = "xyes")
492    
493  # Checks for typedefs, structures, and compiler characteristics.  # Checks for typedefs, structures, and compiler characteristics.
494    
# Line 434  AC_CHECK_HEADERS([bzlib.h], [HAVE_BZLIB_ Line 529  AC_CHECK_HEADERS([bzlib.h], [HAVE_BZLIB_
529  AC_MSG_CHECKING([for libbz2])  AC_MSG_CHECKING([for libbz2])
530  OLD_LIBS="$LIBS"  OLD_LIBS="$LIBS"
531  LIBS="$LIBS -lbz2"  LIBS="$LIBS -lbz2"
532  AC_LINK_IFELSE( AC_LANG_PROGRAM([[  AC_LINK_IFELSE([AC_LANG_PROGRAM([[
533  #ifdef HAVE_BZLIB_H  #ifdef HAVE_BZLIB_H
534  #include <bzlib.h>  #include <bzlib.h>
535  #endif]],  #endif]],
536  [[return (int)BZ2_bzopen("conftest", "rb");]]),  [[return (int)BZ2_bzopen("conftest", "rb");]])],
537  [AC_MSG_RESULT([yes]);HAVE_LIBBZ2=1; break;],  [AC_MSG_RESULT([yes]);HAVE_LIBBZ2=1; break;],
538  AC_MSG_RESULT([no]))  AC_MSG_RESULT([no]))
539  LIBS="$OLD_LIBS"  LIBS="$OLD_LIBS"
540    
541  # Check for the availabiity of libreadline  # Check for the availabiity of libreadline
542    
543  AC_CHECK_HEADERS([readline/readline.h], [HAVE_READLINE_H=1])  if test "$enable_pcretest_libreadline" = "yes"; then
544  AC_CHECK_HEADERS([readline/history.h], [HAVE_HISTORY_H=1])   AC_CHECK_HEADERS([readline/readline.h], [HAVE_READLINE_H=1])
545  AC_CHECK_LIB([readline], [readline], [HAVE_LIB_READLINE=1])   AC_CHECK_HEADERS([readline/history.h], [HAVE_HISTORY_H=1])
546     AC_CHECK_LIB([readline], [readline], [LIBREADLINE="-lreadline"],
547       [unset ac_cv_lib_readline_readline;
548        AC_CHECK_LIB([readline], [readline], [LIBREADLINE="-ltinfo"],
549         [unset ac_cv_lib_readline_readline;
550          AC_CHECK_LIB([readline], [readline], [LIBREADLINE="-lcurses"],
551           [unset ac_cv_lib_readline_readline;
552            AC_CHECK_LIB([readline], [readline], [LIBREADLINE="-lncurses"],
553             [unset ac_cv_lib_readline_readline;
554              AC_CHECK_LIB([readline], [readline], [LIBREADLINE="-lncursesw"],
555               [unset ac_cv_lib_readline_readline;
556                AC_CHECK_LIB([readline], [readline], [LIBREADLINE="-ltermcap"],
557                 [LIBREADLINE=""],
558                 [-ltermcap])],
559               [-lncursesw])],
560             [-lncurses])],
561           [-lcurses])],
562         [-ltinfo])])
563     AC_SUBST(LIBREADLINE)
564     if test -n "$LIBREADLINE"; then
565       if test "$LIBREADLINE" != "-lreadline"; then
566         echo "-lreadline needs $LIBREADLINE"
567         LIBREADLINE="-lreadline $LIBREADLINE"
568       fi
569     fi
570    fi
571    
572    
573    # Check for the availability of libedit. Different distributions put its
574    # headers in different places. Try to cover the most common ones.
575    
576    if test "$enable_pcretest_libedit" = "yes"; then
577      AC_CHECK_HEADERS([editline/readline.h], [HAVE_EDITLINE_READLINE_H=1],
578        [AC_CHECK_HEADERS([edit/readline/readline.h], [HAVE_READLINE_READLINE_H=1],
579          [AC_CHECK_HEADERS([readline/readline.h], [HAVE_READLINE_READLINE_H=1])])])
580      AC_CHECK_LIB([edit], [readline], [LIBEDIT="-ledit"])
581    fi
582    
583  # This facilitates -ansi builds under Linux  # This facilitates -ansi builds under Linux
584  dnl AC_DEFINE([_GNU_SOURCE], [], [Enable GNU extensions in glibc])  dnl AC_DEFINE([_GNU_SOURCE], [], [Enable GNU extensions in glibc])
# Line 462  AC_SUBST(PCRE_STATIC_CFLAG) Line 593  AC_SUBST(PCRE_STATIC_CFLAG)
593    
594  # Here is where pcre specific defines are handled  # Here is where pcre specific defines are handled
595    
596  if test "$enable_utf8" = "yes"; then  if test "$enable_pcre8" = "yes"; then
597    AC_DEFINE([SUPPORT_UTF8], [], [    AC_DEFINE([SUPPORT_PCRE8], [], [
598      Define to enable support for the UTF-8 Unicode encoding. This will      Define to enable the 8 bit PCRE library.])
599      work even in an EBCDIC environment, but it is incompatible with  fi
600      the EBCDIC macro. That is, PCRE can support *either* EBCDIC code  
601      *or* ASCII/UTF-8, but not both at once.])  if test "$enable_pcre16" = "yes"; then
602      AC_DEFINE([SUPPORT_PCRE16], [], [
603        Define to enable the 16 bit PCRE library.])
604    fi
605    
606    if test "$enable_jit" = "yes"; then
607      AC_DEFINE([SUPPORT_JIT], [], [
608        Define to enable support for Just-In-Time compiling.])
609    else
610      enable_pcregrep_jit="no"
611    fi
612    
613    if test "$enable_pcregrep_jit" = "yes"; then
614      AC_DEFINE([SUPPORT_PCREGREP_JIT], [], [
615        Define to enable JIT support in pcregrep.])
616    fi
617    
618    if test "$enable_utf" = "yes"; then
619      AC_DEFINE([SUPPORT_UTF], [], [
620        Define to enable support for the UTF-8/16 Unicode encoding. This
621        will work even in an EBCDIC environment, but it is incompatible
622        with the EBCDIC macro. That is, PCRE can support *either* EBCDIC
623        code *or* ASCII/UTF-8/16, but not both at once.])
624  fi  fi
625    
626  if test "$enable_unicode_properties" = "yes"; then  if test "$enable_unicode_properties" = "yes"; then
627    AC_DEFINE([SUPPORT_UCP], [], [    AC_DEFINE([SUPPORT_UCP], [], [
628      Define to enable support for Unicode properties])      Define to enable support for Unicode properties.])
629  fi  fi
630    
631  if test "$enable_stack_for_recursion" = "no"; then  if test "$enable_stack_for_recursion" = "no"; then
# Line 500  if test "$enable_pcregrep_libbz2" = "yes Line 653  if test "$enable_pcregrep_libbz2" = "yes
653      able to handle .bz2 files.])      able to handle .bz2 files.])
654  fi  fi
655    
656  if test "$enable_pcretest_libreadline" = "yes"; then  if test $with_pcregrep_bufsize -lt 8192 ; then
657      with_pcregrep_bufsize="8192"
658    fi
659    
660    AC_DEFINE_UNQUOTED([PCREGREP_BUFSIZE], [$with_pcregrep_bufsize], [
661      The value of PCREGREP_BUFSIZE determines the size of buffer used by
662      pcregrep to hold parts of the file it is searching. On systems that
663      support it, "configure" can be used to override the default, which is
664      8192. This is also the minimum value. The actual amount of memory used by
665      pcregrep is three times this number, because it allows for the buffering of
666      "before" and "after" lines.])
667    
668    if test "$enable_pcretest_libedit" = "yes"; then
669      AC_DEFINE([SUPPORT_LIBEDIT], [], [
670        Define to allow pcretest to be linked with libedit.])
671      LIBREADLINE="$LIBEDIT"
672    elif test "$enable_pcretest_libreadline" = "yes"; then
673    AC_DEFINE([SUPPORT_LIBREADLINE], [], [    AC_DEFINE([SUPPORT_LIBREADLINE], [], [
674      Define to allow pcretest to be linked with libreadline.])      Define to allow pcretest to be linked with libreadline.])
675  fi  fi
# Line 590  if test "$enable_ebcdic" = "yes"; then Line 759  if test "$enable_ebcdic" = "yes"; then
759      character codes, define this macro as 1. On systems that can use      character codes, define this macro as 1. On systems that can use
760      "configure", this can be done via --enable-ebcdic. PCRE will then      "configure", this can be done via --enable-ebcdic. PCRE will then
761      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
762      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
763      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
764      EBCDIC and UTF-8.])      supports both EBCDIC and UTF-8/16.])
765  fi  fi
766    
767  # Platform specific issues  # Platform specific issues
# Line 613  esac Line 782  esac
782  EXTRA_LIBPCRE_LDFLAGS="$EXTRA_LIBPCRE_LDFLAGS \  EXTRA_LIBPCRE_LDFLAGS="$EXTRA_LIBPCRE_LDFLAGS \
783                         $NO_UNDEFINED -version-info libpcre_version"                         $NO_UNDEFINED -version-info libpcre_version"
784    
785    EXTRA_LIBPCRE16_LDFLAGS="$EXTRA_LIBPCRE16_LDFLAGS \
786                           $NO_UNDEFINED -version-info libpcre16_version"
787    
788  EXTRA_LIBPCREPOSIX_LDFLAGS="$EXTRA_LIBPCREPOSIX_LDFLAGS \  EXTRA_LIBPCREPOSIX_LDFLAGS="$EXTRA_LIBPCREPOSIX_LDFLAGS \
789                              $NO_UNDEFINED -version-info libpcreposix_version"                              $NO_UNDEFINED -version-info libpcreposix_version"
790    
# Line 621  EXTRA_LIBPCRECPP_LDFLAGS="$EXTRA_LIBPCRE Line 793  EXTRA_LIBPCRECPP_LDFLAGS="$EXTRA_LIBPCRE
793                            $EXPORT_ALL_SYMBOLS"                            $EXPORT_ALL_SYMBOLS"
794    
795  AC_SUBST(EXTRA_LIBPCRE_LDFLAGS)  AC_SUBST(EXTRA_LIBPCRE_LDFLAGS)
796    AC_SUBST(EXTRA_LIBPCRE16_LDFLAGS)
797  AC_SUBST(EXTRA_LIBPCREPOSIX_LDFLAGS)  AC_SUBST(EXTRA_LIBPCREPOSIX_LDFLAGS)
798  AC_SUBST(EXTRA_LIBPCRECPP_LDFLAGS)  AC_SUBST(EXTRA_LIBPCRECPP_LDFLAGS)
799    
800  # When we run 'make distcheck', use these arguments.  # When we run 'make distcheck', use these arguments. Turning off compiler
801  DISTCHECK_CONFIGURE_FLAGS="--enable-cpp --enable-unicode-properties"  # optimization makes it run faster.
802    DISTCHECK_CONFIGURE_FLAGS="CFLAGS='' CXXFLAGS='' --enable-pcre16 --enable-jit --enable-cpp --enable-unicode-properties"
803  AC_SUBST(DISTCHECK_CONFIGURE_FLAGS)  AC_SUBST(DISTCHECK_CONFIGURE_FLAGS)
804    
805  # Check that, if --enable-pcregrep-libz or --enable-pcregrep-libbz2 is  # Check that, if --enable-pcregrep-libz or --enable-pcregrep-libbz2 is
# Line 659  AC_SUBST(LIBBZ2) Line 833  AC_SUBST(LIBBZ2)
833    
834  # Similarly for --enable-pcretest-readline  # Similarly for --enable-pcretest-readline
835    
836    if test "$enable_pcretest_libedit" = "yes"; then
837      if test "$enable_pcretest_libreadline" = "yes"; then
838        echo "** Cannot use both --enable-pcretest-libedit and --enable-pcretest-readline"
839        exit 1
840      fi
841      if test "$HAVE_EDITLINE_READLINE_H" != "1" -a \
842              "$HAVE_READLINE_READLINE_H" != "1"; then
843        echo "** Cannot --enable-pcretest-libedit because neither editline/readline.h"
844        echo "** nor readline/readline.h was found."
845        exit 1
846      fi
847      if test -z "$LIBEDIT"; then
848        echo "** Cannot --enable-pcretest-libedit because libedit library was not found."
849        exit 1
850      fi
851    fi
852    
853  if test "$enable_pcretest_libreadline" = "yes"; then  if test "$enable_pcretest_libreadline" = "yes"; then
854    if test "$HAVE_READLINE_H" != "1"; then    if test "$HAVE_READLINE_H" != "1"; then
855      echo "** Cannot --enable-pcretest-readline because readline/readline.h was not found."      echo "** Cannot --enable-pcretest-readline because readline/readline.h was not found."
# Line 668  if test "$enable_pcretest_libreadline" = Line 859  if test "$enable_pcretest_libreadline" =
859      echo "** Cannot --enable-pcretest-readline because readline/history.h was not found."      echo "** Cannot --enable-pcretest-readline because readline/history.h was not found."
860      exit 1      exit 1
861    fi    fi
862    LIBREADLINE="-lreadline"    if test -z "$LIBREADLINE"; then
863        echo "** Cannot --enable-pcretest-readline because readline library was not found."
864        exit 1
865      fi
866  fi  fi
 AC_SUBST(LIBREADLINE)  
867    
868  # Produce these files, in addition to config.h.  # Produce these files, in addition to config.h.
869  AC_CONFIG_FILES(  AC_CONFIG_FILES(
870          Makefile          Makefile
871          libpcre.pc          libpcre.pc
872          libpcreposix.pc          libpcre16.pc
873            libpcreposix.pc
874          libpcrecpp.pc          libpcrecpp.pc
875          pcre-config          pcre-config
876          pcre.h          pcre.h
# Line 712  $PACKAGE-$VERSION configuration summary: Line 906  $PACKAGE-$VERSION configuration summary:
906      Linker flags .................... : ${LDFLAGS}      Linker flags .................... : ${LDFLAGS}
907      Extra libraries ................. : ${LIBS}      Extra libraries ................. : ${LIBS}
908    
909        Build 8 bit pcre library ........ : ${enable_pcre8}
910        Build 16 bit pcre library ....... : ${enable_pcre16}
911      Build C++ library ............... : ${enable_cpp}      Build C++ library ............... : ${enable_cpp}
912      Enable UTF-8 support ............ : ${enable_utf8}      Enable JIT compiling support .... : ${enable_jit}
913        Enable UTF-8/16 support ......... : ${enable_utf}
914      Unicode properties .............. : ${enable_unicode_properties}      Unicode properties .............. : ${enable_unicode_properties}
915      Newline char/sequence ........... : ${enable_newline}      Newline char/sequence ........... : ${enable_newline}
916      \R matches only ANYCRLF ......... : ${enable_bsr_anycrlf}      \R matches only ANYCRLF ......... : ${enable_bsr_anycrlf}
# Line 726  $PACKAGE-$VERSION configuration summary: Line 923  $PACKAGE-$VERSION configuration summary:
923      Match limit recursion ........... : ${with_match_limit_recursion}      Match limit recursion ........... : ${with_match_limit_recursion}
924      Build shared libs ............... : ${enable_shared}      Build shared libs ............... : ${enable_shared}
925      Build static libs ............... : ${enable_static}      Build static libs ............... : ${enable_static}
926        Use JIT in pcregrep ............. : ${enable_pcregrep_jit}
927        Buffer size for pcregrep ........ : ${with_pcregrep_bufsize}
928      Link pcregrep with libz ......... : ${enable_pcregrep_libz}      Link pcregrep with libz ......... : ${enable_pcregrep_libz}
929      Link pcregrep with libbz2 ....... : ${enable_pcregrep_libbz2}      Link pcregrep with libbz2 ....... : ${enable_pcregrep_libbz2}
930        Link pcretest with libedit ...... : ${enable_pcretest_libedit}
931      Link pcretest with libreadline .. : ${enable_pcretest_libreadline}      Link pcretest with libreadline .. : ${enable_pcretest_libreadline}
932    
933  EOF  EOF

Legend:
Removed from v.550  
changed lines
  Added in v.981

  ViewVC Help
Powered by ViewVC 1.1.5