[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.2 and 1.1.1.3

version 1.1.1.2, 2012/02/21 23:50:25 version 1.1.1.3, 2012/10/09 09:19:17
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, [30])m4_define(pcre_minor, [31])
 m4_define(pcre_prerelease, [])  m4_define(pcre_prerelease, [])
m4_define(pcre_date, [2012-02-04])m4_define(pcre_date, [2012-07-06])
   
 # NOTE: The CMakeLists.txt file searches for the above variables in the first  # 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.  # 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, [1:0:0])m4_define(libpcre_version, [1:1:0])
m4_define(libpcre16_version, [0:0:0])m4_define(libpcre16_version, [0:1:0])
m4_define(libpcreposix_version, [0:0:0])m4_define(libpcreposix_version, [0:1:0])
 m4_define(libpcrecpp_version, [0:0:0])  m4_define(libpcrecpp_version, [0:0:0])
   
 AC_PREREQ(2.57)  AC_PREREQ(2.57)
Line 233  AC_ARG_WITH(pcregrep-bufsize, Line 233  AC_ARG_WITH(pcregrep-bufsize,
                              [pcregrep buffer size (default=20480)]),                               [pcregrep buffer size (default=20480)]),
               , with_pcregrep_bufsize=20480)                , with_pcregrep_bufsize=20480)
   
   # Handle --enable-pcretest-libedit
   AC_ARG_ENABLE(pcretest-libedit,
                 AS_HELP_STRING([--enable-pcretest-libedit],
                                [link pcretest with libedit]),
                 , enable_pcretest_libedit=no)
   
 # Handle --enable-pcretest-libreadline  # Handle --enable-pcretest-libreadline
 AC_ARG_ENABLE(pcretest-libreadline,  AC_ARG_ENABLE(pcretest-libreadline,
               AS_HELP_STRING([--enable-pcretest-libreadline],                AS_HELP_STRING([--enable-pcretest-libreadline],
Line 534  LIBS="$OLD_LIBS" Line 540  LIBS="$OLD_LIBS"
   
 # Check for the availabiity of libreadline  # Check for the availabiity of libreadline
   
AC_CHECK_HEADERS([readline/readline.h], [HAVE_READLINE_H=1])if test "$enable_pcretest_libreadline" = "yes"; then
AC_CHECK_HEADERS([readline/history.h], [HAVE_HISTORY_H=1]) AC_CHECK_HEADERS([readline/readline.h], [HAVE_READLINE_H=1])
AC_CHECK_LIB([readline], [readline], [LIBREADLINE="-lreadline"], AC_CHECK_HEADERS([readline/history.h], [HAVE_HISTORY_H=1])
  [unset ac_cv_lib_readline_readline; AC_CHECK_LIB([readline], [readline], [LIBREADLINE="-lreadline"],
   AC_CHECK_LIB([readline], [readline], [LIBREADLINE="-ltinfo"],   [unset ac_cv_lib_readline_readline;
    [unset ac_cv_lib_readline_readline;    AC_CHECK_LIB([readline], [readline], [LIBREADLINE="-ltinfo"],
     AC_CHECK_LIB([readline], [readline], [LIBREADLINE="-lcurses"],     [unset ac_cv_lib_readline_readline;
      [unset ac_cv_lib_readline_readline;      AC_CHECK_LIB([readline], [readline], [LIBREADLINE="-lcurses"],
       AC_CHECK_LIB([readline], [readline], [LIBREADLINE="-lncurses"],       [unset ac_cv_lib_readline_readline;
        [unset ac_cv_lib_readline_readline;        AC_CHECK_LIB([readline], [readline], [LIBREADLINE="-lncurses"],
         AC_CHECK_LIB([readline], [readline], [LIBREADLINE="-lncursesw"],         [unset ac_cv_lib_readline_readline;
          [unset ac_cv_lib_readline_readline;          AC_CHECK_LIB([readline], [readline], [LIBREADLINE="-lncursesw"],
           AC_CHECK_LIB([readline], [readline], [LIBREADLINE="-ltermcap"],           [unset ac_cv_lib_readline_readline;
            [LIBREADLINE=""],            AC_CHECK_LIB([readline], [readline], [LIBREADLINE="-ltermcap"],
            [-ltermcap])],             [LIBREADLINE=""],
          [-lncursesw])],             [-ltermcap])],
        [-lncurses])],           [-lncursesw])],
      [-lcurses])],         [-lncurses])],
    [-ltinfo])])       [-lcurses])],
AC_SUBST(LIBREADLINE)     [-ltinfo])])
if test -n "$LIBREADLINE"; then AC_SUBST(LIBREADLINE)
  if test "$LIBREADLINE" != "-lreadline"; then if test -n "$LIBREADLINE"; then
    echo "-lreadline needs $LIBREADLINE"   if test "$LIBREADLINE" != "-lreadline"; then
    LIBREADLINE="-lreadline $LIBREADLINE"     echo "-lreadline needs $LIBREADLINE"
  fi     LIBREADLINE="-lreadline $LIBREADLINE"
    fi
  fi
 fi  fi
   
   
   # Check for the availability of libedit. Different distributions put its
   # headers in different places. Try to cover the most common ones.
   
   if test "$enable_pcretest_libedit" = "yes"; then
     AC_CHECK_HEADERS([editline/readline.h], [HAVE_EDITLINE_READLINE_H=1],
       [AC_CHECK_HEADERS([edit/readline/readline.h], [HAVE_READLINE_READLINE_H=1],
         [AC_CHECK_HEADERS([readline/readline.h], [HAVE_READLINE_READLINE_H=1])])])
     AC_CHECK_LIB([edit], [readline], [LIBEDIT="-ledit"])
   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 646  AC_DEFINE_UNQUOTED([PCREGREP_BUFSIZE], [$with_pcregrep Line 665  AC_DEFINE_UNQUOTED([PCREGREP_BUFSIZE], [$with_pcregrep
   pcregrep is three times this number, because it allows for the buffering of    pcregrep is three times this number, because it allows for the buffering of
   "before" and "after" lines.])    "before" and "after" lines.])
   
if test "$enable_pcretest_libreadline" = "yes"; thenif test "$enable_pcretest_libedit" = "yes"; then
   AC_DEFINE([SUPPORT_LIBEDIT], [], [
     Define to allow pcretest to be linked with libedit.])
   LIBREADLINE="$LIBEDIT"
 elif test "$enable_pcretest_libreadline" = "yes"; then
   AC_DEFINE([SUPPORT_LIBREADLINE], [], [    AC_DEFINE([SUPPORT_LIBREADLINE], [], [
     Define to allow pcretest to be linked with libreadline.])      Define to allow pcretest to be linked with libreadline.])
 fi  fi
Line 810  AC_SUBST(LIBBZ2) Line 833  AC_SUBST(LIBBZ2)
   
 # Similarly for --enable-pcretest-readline  # Similarly for --enable-pcretest-readline
   
   if test "$enable_pcretest_libedit" = "yes"; then
     if test "$enable_pcretest_libreadline" = "yes"; then
       echo "** Cannot use both --enable-pcretest-libedit and --enable-pcretest-readline"
       exit 1
     fi
     if test "$HAVE_EDITLINE_READLINE_H" != "1" -a \
             "$HAVE_READLINE_READLINE_H" != "1"; then
       echo "** Cannot --enable-pcretest-libedit because neither editline/readline.h"
       echo "** nor readline/readline.h was found."
       exit 1
     fi
     if test -z "$LIBEDIT"; then
       echo "** Cannot --enable-pcretest-libedit because libedit library was not found."
       exit 1
     fi
   fi
   
 if test "$enable_pcretest_libreadline" = "yes"; then  if test "$enable_pcretest_libreadline" = "yes"; then
   if test "$HAVE_READLINE_H" != "1"; then    if test "$HAVE_READLINE_H" != "1"; then
     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 887  $PACKAGE-$VERSION configuration summary: Line 927  $PACKAGE-$VERSION configuration summary:
     Buffer size for pcregrep ........ : ${with_pcregrep_bufsize}      Buffer size for pcregrep ........ : ${with_pcregrep_bufsize}
     Link pcregrep with libz ......... : ${enable_pcregrep_libz}      Link pcregrep with libz ......... : ${enable_pcregrep_libz}
     Link pcregrep with libbz2 ....... : ${enable_pcregrep_libbz2}      Link pcregrep with libbz2 ....... : ${enable_pcregrep_libbz2}
       Link pcretest with libedit ...... : ${enable_pcretest_libedit}
     Link pcretest with libreadline .. : ${enable_pcretest_libreadline}      Link pcretest with libreadline .. : ${enable_pcretest_libreadline}
   
 EOF  EOF
Removed from v.1.1.1.2  
changed lines
  Added in v.1.1.1.3

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