From bdd37162430a5768da33c908ef83ef7139435afd Mon Sep 17 00:00:00 2001 From: Sam Steingold Date: Tue, 5 Dec 2017 11:02:33 -0500 Subject: [PATCH] no-c++: Avoid "egrep: repetition-operator operand invalid" error. * m4/no-c++.m4 (gt_NO_CXX): Don't use '+' characters nor spaces in the AC_EGREP_CPP pattern. --- ChangeLog | 7 +++++++ m4/no-c++.m4 | 8 ++++---- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 6d4b1ba825..3a7ddc1cb2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2017-12-05 Sam Steingold + Bruno Haible + + no-c++: Avoid "egrep: repetition-operator operand invalid" error. + * m4/no-c++.m4 (gt_NO_CXX): Don't use '+' characters nor spaces in the + AC_EGREP_CPP pattern. + 2017-12-03 Bruno Haible all: Replace more http URLs by https URLs. diff --git a/m4/no-c++.m4 b/m4/no-c++.m4 index ed06b22b61..cf63f6d3c6 100644 --- a/m4/no-c++.m4 +++ b/m4/no-c++.m4 @@ -1,4 +1,4 @@ -# no-c++.m4 serial 1 +# no-c++.m4 serial 2 dnl Copyright (C) 2006, 2009-2017 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -7,14 +7,14 @@ dnl with or without modifications, as long as this notice is preserved. # Support for C source files that cannot be compiled by a C++ compiler. # Set NO_CXX to the C++ compiler flags needed to request C mode instead of # C++ mode. -# So far only g++ is supported. +# So far only g++ is supported. This includes clang++, as it is g++ compatible. AC_DEFUN([gt_NO_CXX], [ NO_CXX= - AC_EGREP_CPP([Is g++], [ + AC_EGREP_CPP([Is_g_plus_plus], [ #if defined __GNUC__ && defined __cplusplus - Is g++ + Is_g_plus_plus #endif ], [NO_CXX="-x c"]) -- 2.39.5