[Pcre-svn] [1226] code/trunk: Give error if --enable-cpp but…

Kezdőlap
Üzenet törlése
Szerző: Subversion repository
Dátum:  
Címzett: pcre-svn
Tárgy: [Pcre-svn] [1226] code/trunk: Give error if --enable-cpp but no C++ compiler found.
Revision: 1226
          http://vcs.pcre.org/viewvc?view=rev&revision=1226
Author:   ph10
Date:     2012-11-30 09:14:29 +0000 (Fri, 30 Nov 2012)


Log Message:
-----------
Give error if --enable-cpp but no C++ compiler found.

Modified Paths:
--------------
    code/trunk/ChangeLog
    code/trunk/configure.ac


Modified: code/trunk/ChangeLog
===================================================================
--- code/trunk/ChangeLog    2012-11-24 11:29:45 UTC (rev 1225)
+++ code/trunk/ChangeLog    2012-11-30 09:14:29 UTC (rev 1226)
@@ -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,7 +162,9 @@

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
-------------------------


Modified: code/trunk/configure.ac
===================================================================
--- code/trunk/configure.ac    2012-11-24 11:29:45 UTC (rev 1225)
+++ code/trunk/configure.ac    2012-11-30 09:14:29 UTC (rev 1226)
@@ -10,15 +10,15 @@


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 @@
# 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++)