/[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 287 by ph10, Tue Dec 18 20:11:28 2007 UTC revision 321 by ph10, Wed Mar 5 17:10:45 2008 UTC
# Line 7  dnl be defined as -RC2, for example. For Line 7  dnl be defined as -RC2, for example. For
7  dnl empty.  dnl empty.
8    
9  m4_define(pcre_major, [7])  m4_define(pcre_major, [7])
10  m4_define(pcre_minor, [5])  m4_define(pcre_minor, [7])
11  m4_define(pcre_prerelease, [-RC1])  m4_define(pcre_prerelease, [-RC1])
12  m4_define(pcre_date, [2007-11-12])  m4_define(pcre_date, [2008-03-05])
13    
14  # Libtool shared library interface versions (current:revision:age)  # Libtool shared library interface versions (current:revision:age)
15  m4_define(libpcre_version, [0:1:0])  m4_define(libpcre_version, [0:1:0])
# Line 301  AM_CONDITIONAL(WITH_REBUILD_CHARTABLES, Line 301  AM_CONDITIONAL(WITH_REBUILD_CHARTABLES,
301  AC_C_CONST  AC_C_CONST
302  AC_TYPE_SIZE_T  AC_TYPE_SIZE_T
303    
304  AC_CHECK_TYPES([long long],  pcre_have_strotolonglong=0
305                 [pcre_have_long_long="1"],  AC_CHECK_FUNCS(strtoq strtoll _strtoi64, [pcre_have_strotolonglong="1"; break])
306                 [pcre_have_long_long="0"])  # If we can't convert a string to a long long, pretend we don't even
307  AC_CHECK_TYPES([unsigned long long],  # have a long long.
308                 [pcre_have_ulong_long="1"],  if test $pcre_have_strotolonglong = "0"; then
309                 [pcre_have_ulong_long="0"])     pcre_have_long_long="0"
310       pcre_have_ulong_long="0"
311    else
312      AC_CHECK_TYPES([long long],
313                     [pcre_have_long_long="1"],
314                     [pcre_have_long_long="0"])
315      AC_CHECK_TYPES([unsigned long long],
316                     [pcre_have_ulong_long="1"],
317                     [pcre_have_ulong_long="0"])
318    fi
319  AC_SUBST(pcre_have_long_long)  AC_SUBST(pcre_have_long_long)
320  AC_SUBST(pcre_have_ulong_long)  AC_SUBST(pcre_have_ulong_long)
321    
322  # Checks for library functions.  # Checks for library functions.
323    
324  AC_CHECK_FUNCS(bcopy memmove strerror strtoq strtoll _strtoi64)  AC_CHECK_FUNCS(bcopy memmove strerror)
325    
326  # Check for the availability of libz (aka zlib)  # Check for the availability of libz (aka zlib)
327    
# Line 378  fi Line 387  fi
387  if test "$enable_pcretest_libreadline" = "yes"; then  if test "$enable_pcretest_libreadline" = "yes"; then
388    AC_DEFINE([SUPPORT_LIBREADLINE], [], [    AC_DEFINE([SUPPORT_LIBREADLINE], [], [
389      Define to allow pcretest to be linked with libreadline.])      Define to allow pcretest to be linked with libreadline.])
390  fi  fi
391    
392  AC_DEFINE_UNQUOTED([NEWLINE], [$ac_pcre_newline_value], [  AC_DEFINE_UNQUOTED([NEWLINE], [$ac_pcre_newline_value], [
393    The value of NEWLINE determines the newline character sequence. On    The value of NEWLINE determines the newline character sequence. On
# Line 534  if test "$enable_pcretest_libreadline" = Line 543  if test "$enable_pcretest_libreadline" =
543      exit 1      exit 1
544    fi    fi
545    if test "$LIBS" = ""; then LIBS=-lreadline; else LIBS="$LIBS -lreadline"; fi    if test "$LIBS" = ""; then LIBS=-lreadline; else LIBS="$LIBS -lreadline"; fi
546  fi  fi
547    
548  # Produce these files, in addition to config.h.  # Produce these files, in addition to config.h.
549  AC_CONFIG_FILES(  AC_CONFIG_FILES(
# Line 574  $PACKAGE-$VERSION configuration summary: Line 583  $PACKAGE-$VERSION configuration summary:
583      C++ compiler flags .............. : ${CXXFLAGS}      C++ compiler flags .............. : ${CXXFLAGS}
584      Linker flags .................... : ${LDFLAGS}      Linker flags .................... : ${LDFLAGS}
585      Extra libraries ................. : ${LIBS}      Extra libraries ................. : ${LIBS}
586    
587      Build C++ library ............... : ${enable_cpp}      Build C++ library ............... : ${enable_cpp}
588      Enable UTF-8 support ............ : ${enable_utf8}      Enable UTF-8 support ............ : ${enable_utf8}
589      Unicode properties .............. : ${enable_unicode_properties}      Unicode properties .............. : ${enable_unicode_properties}
# Line 591  $PACKAGE-$VERSION configuration summary: Line 600  $PACKAGE-$VERSION configuration summary:
600      Build static libs ............... : ${enable_static}      Build static libs ............... : ${enable_static}
601      Link pcregrep with libz ......... : ${enable_pcregrep_libz}      Link pcregrep with libz ......... : ${enable_pcregrep_libz}
602      Link pcregrep with libbz2 ....... : ${enable_pcregrep_libbz2}      Link pcregrep with libbz2 ....... : ${enable_pcregrep_libbz2}
603      Link pcretest with libreadline .. : ${enable_pcretest_libreadline}      Link pcretest with libreadline .. : ${enable_pcretest_libreadline}
604    
605  EOF  EOF
606    

Legend:
Removed from v.287  
changed lines
  Added in v.321

  ViewVC Help
Powered by ViewVC 1.1.5