From b93340b8623de865c73b7e12a5b448732f9a5f68 Mon Sep 17 00:00:00 2001
From: Povilas Kanapickas <povilas@radix.lt>
Date: Sat, 11 May 2019 00:02:47 +0300
Subject: [PATCH] Enable C++ in autoconf

---
 acinclude.m4 | 11 +++++++++++
 configure.ac |  2 ++
 2 files changed, 13 insertions(+)

diff --git a/acinclude.m4 b/acinclude.m4
index 6bf46b0cc..766592a45 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -55,6 +55,17 @@ if test "${ac_cv_c_compiler_gnu}" = "yes"; then
 fi # ac_cv_c_compiler_gnu
 ])
 
+# SANE_SET_AM_CXXFLAGS()
+# Set default AM_CXXFLAGS.
+AC_DEFUN([SANE_SET_AM_CXXFLAGS],
+[
+AX_CXX_COMPILE_STDCXX_11([noext], [mandatory])
+if test "${ac_cv_cxx_compiler_gnu}" = "yes"; then
+  AM_CXXFLAGS="$AM_CXXFLAGS -std=c++11"
+fi # ac_cv_cxx_compiler_gnu
+])
+
+
 dnl SANE_CHECK_MISSING_HEADERS
 dnl Do some sanity checks. It doesn't make sense to proceed if those headers
 dnl aren't present.
diff --git a/configure.ac b/configure.ac
index d333f5513..61dcc8710 100644
--- a/configure.ac
+++ b/configure.ac
@@ -40,6 +40,7 @@ dnl ******************************************************************
 dnl  Set up the compiler and linker
 dnl ******************************************************************
 AC_PROG_CC
+AC_PROG_CXX
 AM_PROG_CC_C_O
 sane_save_CC=$CC
 AC_PROG_CC_C99                  dnl enables extensions to ISO C99 :-(
@@ -80,6 +81,7 @@ dnl ***********************************************************************
 dnl set compiler/linker flags
 dnl ***********************************************************************
 SANE_SET_AM_CFLAGS([$is_release])
+SANE_SET_AM_CXXFLAGS
 SANE_SET_AM_LDFLAGS
 
 dnl ***********************************************************************