summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorph10 <ph10@2f5784b3-3f2a-0410-8824-cb99058d5e15>2012-11-30 09:14:29 +0000
committerph10 <ph10@2f5784b3-3f2a-0410-8824-cb99058d5e15>2012-11-30 09:14:29 +0000
commit9a4e407ccd46167c159afc6c135facff05851a3b (patch)
tree075d7e15a406e2318f2ae83f4d66c236a7d90e08
parent5f4aa7fda9cac74e408b72dd77eb6b528de3e2ed (diff)
downloadpcre-9a4e407ccd46167c159afc6c135facff05851a3b.tar.gz
Give error if --enable-cpp but no C++ compiler found.
git-svn-id: svn://vcs.exim.org/pcre/code/trunk@1226 2f5784b3-3f2a-0410-8824-cb99058d5e15
-rw-r--r--ChangeLog4
-rw-r--r--configure.ac13
2 files changed, 12 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index 2808488..1b016ec 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,7 @@
ChangeLog for PCRE
------------------
-Version 8.32 11-November-2012
+Version 8.32 30-November-2012
-----------------------------
1. Improved JIT compiler optimizations for first character search and single
@@ -162,6 +162,8 @@ Version 8.32 11-November-2012
25. (*UTF) can now be used to start a pattern in any of the three libraries.
+26. Give configure error if --enable-cpp but no C++ compiler found.
+
Version 8.31 06-July-2012
-------------------------
diff --git a/configure.ac b/configure.ac
index 2cfab75..a5dc3c7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -10,15 +10,15 @@ dnl be defined as -RC2, for example. For real releases, it should be empty.
m4_define(pcre_major, [8])
m4_define(pcre_minor, [32])
-m4_define(pcre_prerelease, [-RC1])
-m4_define(pcre_date, [2012-11-11])
+m4_define(pcre_prerelease, [])
+m4_define(pcre_date, [2012-11-30])
# 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)
-m4_define(libpcre_version, [2:0:1])
-m4_define(libpcre16_version, [1:0:1])
+m4_define(libpcre_version, [3:0:2])
+m4_define(libpcre16_version, [2:0:2])
m4_define(libpcre32_version, [0:0:0])
m4_define(libpcreposix_version, [0:1:0])
m4_define(libpcrecpp_version, [0:0:0])
@@ -449,6 +449,11 @@ AC_CHECK_HEADERS(limits.h sys/types.h sys/stat.h dirent.h windows.h)
# The files below are C++ header files.
pcre_have_type_traits="0"
pcre_have_bits_type_traits="0"
+
+if test "x$enable_cpp" = "xyes" -a -z "$CXX"; then
+ AC_MSG_ERROR([You need a C++ compiler for C++ support.])
+fi
+
if test "x$enable_cpp" = "xyes" -a -n "$CXX"
then
AC_LANG_PUSH(C++)