external/libodfgen/c++11.patch

   1 # Add -std=c++11 before existing CXXFLAGS, in case those already contain some -std= (which will thus
   2 # override the preceding -std=c++11, which is likely what the caller passing in those CXXFLAGS
   3 # intends):
   4 #
   5 #--- configure.ac
   6 #+++ configure.ac
   7 #@@ -217,7 +217,7 @@
   8 # AS_IF([test "x$with_sharedptr" = "xc++11"], [
   9 #     AC_MSG_CHECKING([for c++11 shared ptr])
  10 #     save_CXXFLAGS="$CXXFLAGS"
  11 #-    CXXFLAGS="$CXXFLAGS -std=c++11"
  12 #+    CXXFLAGS="-std=c++11 $CXXFLAGS"
  13 #     AC_COMPILE_IFELSE([
  14 #         AC_LANG_PROGRAM(
  15 #             [[#include <memory>]],
  16 #@@ -241,7 +241,7 @@
  17 #         AC_MSG_RESULT([no])
  18 #     ], [
  19 #         AC_MSG_RESULT([yes])
  20 #-        CXXFLAGS="$CXXFLAGS -std=c++11"
  21 #+        CXXFLAGS="-std=c++11 $CXXFLAGS"
  22 #     ])
  23 # ])
  24 # AS_IF([test "x$with_sharedptr" = "xtr1"], [
  25 --- configure
  26 +++ configure
  27 @@ -16723,7 +16723,7 @@
  28      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for c++11 shared ptr" >&5
  29  $as_echo_n "checking for c++11 shared ptr... " >&6; }
  30      save_CXXFLAGS="$CXXFLAGS"
  31 -    CXXFLAGS="$CXXFLAGS -std=c++11"
  32 +    CXXFLAGS="-std=c++11 $CXXFLAGS"
  33      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  34  /* end confdefs.h.  */
  35
  36 @@ -16780,7 +16780,7 @@
  37
  38          { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
  39  $as_echo "yes" >&6; }
  40 -        CXXFLAGS="$CXXFLAGS -std=c++11"
  41 +        CXXFLAGS="-std=c++11 $CXXFLAGS"
  42
  43  fi
  44  rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext