Revision: 321
http://vcs.pcre.org/viewvc?view=rev&revision=321
Author: ph10
Date: 2008-03-05 17:10:45 +0000 (Wed, 05 Mar 2008)
Log Message:
-----------
Craig's patch to sort out a long long problem: "If we can't convert
a string to a long long, pretend we don't even have a long long."
Modified Paths:
--------------
code/trunk/ChangeLog
code/trunk/configure.ac
Modified: code/trunk/ChangeLog
===================================================================
--- code/trunk/ChangeLog 2008-02-12 08:48:01 UTC (rev 320)
+++ code/trunk/ChangeLog 2008-03-05 17:10:45 UTC (rev 321)
@@ -1,6 +1,14 @@
ChangeLog for PCRE
------------------
+Version 7.7 05-Mar-08
+---------------------
+
+1. Applied Craig's patch to sort out a long long problem: "If we can't convert
+ a string to a long long, pretend we don't even have a long long." This is
+ done by checking for the strtoq, strtoll, and _strtoi64 functions.
+
+
Version 7.6 28-Jan-08
---------------------
Modified: code/trunk/configure.ac
===================================================================
--- code/trunk/configure.ac 2008-02-12 08:48:01 UTC (rev 320)
+++ code/trunk/configure.ac 2008-03-05 17:10:45 UTC (rev 321)
@@ -7,9 +7,9 @@
dnl empty.
m4_define(pcre_major, [7])
-m4_define(pcre_minor, [6])
-m4_define(pcre_prerelease, [])
-m4_define(pcre_date, [2008-01-28])
+m4_define(pcre_minor, [7])
+m4_define(pcre_prerelease, [-RC1])
+m4_define(pcre_date, [2008-03-05])
# Libtool shared library interface versions (current:revision:age)
m4_define(libpcre_version, [0:1:0])
@@ -301,18 +301,27 @@
AC_C_CONST
AC_TYPE_SIZE_T
-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"])
+pcre_have_strotolonglong=0
+AC_CHECK_FUNCS(strtoq strtoll _strtoi64, [pcre_have_strotolonglong="1"; break])
+# If we can't convert a string to a long long, pretend we don't even
+# have a long long.
+if test $pcre_have_strotolonglong = "0"; then
+ 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 _strtoi64)
+AC_CHECK_FUNCS(bcopy memmove strerror)
# Check for the availability of libz (aka zlib)
