Use C++17 now to compile 'gb.pdf'.

[GB.PDF]
* BUG: Use C++17 now to compile 'gb.pdf'.

Gbp-Pq: Name build-PDF-support-with-C-17.patch

diff --git a/acinclude.m4 b/acinclude.m4
index df97105c7f457b1ff1a163563060227f581096bc..c5e4df0fed99a4454c58edbb070153957c2ceb6b 100644 (file)
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -399,6 +399,18 @@ AC_DEFUN([GB_INIT],
     AC_DEFINE(HAVE_GCC_STD_CPP11, 1, [Whether g++ supports -std=c++11])
   fi
   
+  dnl ---- check for -std=c++17 compiler flag
+  
+  GB_CXXFLAGS_GCC_OPTION([-std=c++17],,
+    [
+      GB_CXXFLAGS_STD_CPP11=" -std=c++17"
+      have_gcc_std_cpp11x=yes
+    ])
+  
+  if test "$have_gcc_std_cpp17" = "yes"; then
+    AC_DEFINE(HAVE_GCC_STD_CPP17, 1, [Whether g++ supports -std=c++17])
+  fi
+  
   dnl ---- Debug flags
 
   if test "$gambas_debug" = "yes"; then

diff --git a/gb.pdf/src/Makefile.am b/gb.pdf/src/Makefile.am
index eda3f0f36ccfc15cce7e854635da896a7646353a..ba2a7781dadc65d8b817dddb7533f5be664de39a 100644 (file)
--- a/gb.pdf/src/Makefile.am
+++ b/gb.pdf/src/Makefile.am
@@ -5,11 +5,12 @@ gblib_LTLIBRARIES = gb.pdf.la
 
 gb_pdf_la_LIBADD = @POPPLER_LIB@
 gb_pdf_la_LDFLAGS = -module @LD_FLAGS@ @POPPLER_LDFLAGS@
-gb_pdf_la_CXXFLAGS = $(AM_CXXFLAGS) $(GB_CXXFLAGS_STD_CPP11)
+gb_pdf_la_CXXFLAGS = $(AM_CXXFLAGS) $(GB_CXXFLAGS_STD_CPP17)
 gb_pdf_la_CPPFLAGS = @POPPLER_INC@
 
-gb_pdf_la_SOURCES = main.h main.cpp \
-                        CPdfDocument.h CPdfDocument.cpp 
+gb_pdf_la_SOURCES = \
+ main.h main.cpp \
+ CPdfDocument.h CPdfDocument.cpp