summaryrefslogtreecommitdiff
path: root/server/configure.ac
diff options
context:
space:
mode:
authorAndreas Politz <politza@hochschule-trier.de>2017-09-05 21:09:27 +0200
committerAndreas Politz <politza@hochschule-trier.de>2017-09-05 21:13:18 +0200
commitdfa1355a2de2b8ba667ea8f94617c0092d979c97 (patch)
tree3b0af63b350b36af1cb2ffce3d3309479fddeb73 /server/configure.ac
parenta087f68e465790925382f9fd8d2ae0305cb6ff90 (diff)
Compile with --std=c++11 if available.
Recent poppler versions seem to require it, on the other hand llvm c++ defaults to some ancient standard.
Diffstat (limited to 'server/configure.ac')
-rw-r--r--server/configure.ac9
1 files changed, 8 insertions, 1 deletions
diff --git a/server/configure.ac b/server/configure.ac
index 18f3d02..c7329a0 100644
--- a/server/configure.ac
+++ b/server/configure.ac
@@ -28,10 +28,17 @@ PKG_CHECK_EXISTS([poppler-glib >= 0.22], [HAVE_POPPLER_FIND_OPTS=yes])
PKG_CHECK_EXISTS([poppler-glib >= 0.26], [HAVE_POPPLER_ANNOT_MARKUP=yes])
PKG_CHECK_MODULES([zlib], [zlib])
-# Check for private poppler header.
SAVED_CPPFLAGS=$CPPFLAGS
CPPFLAGS=$poppler_CFLAGS
AC_LANG_PUSH([C++])
+# Check if we can use the -std=c++11 option.
+m4_include([m4/ax_check_compile_flag.m4])
+AX_CHECK_COMPILE_FLAG([-std=c++11], [HAVE_STD_CXX11=yes])
+
+if test "$HAVE_STD_CXX11" = yes; then
+ CXXFLAGS="-std=c++11 $CXXFLAGS"
+fi
+# Check for private poppler header.
AC_CHECK_HEADERS([Annot.h PDFDocEncoding.h], [],
AC_MSG_ERROR([cannot find necessary poppler-private header (see README.org)]))
AC_LANG_POP([C++])