X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=config%2Flyxinclude.m4;h=2e529ea22121254980535454fc584abfbd43c660;hb=66dcc7f62c1e6c9ff0d4e55c6c13e3fbbf806bc6;hp=299efbc6fbb778bd86b38dde36ceb97128e6bcd2;hpb=51cc826961654a02a8e2a518c2397265565f8aa5;p=lyx.git

diff --git a/config/lyxinclude.m4 b/config/lyxinclude.m4
index 299efbc6fb..2e529ea221 100644
--- a/config/lyxinclude.m4
+++ b/config/lyxinclude.m4
@@ -56,6 +56,7 @@ AC_ARG_WITH(version-suffix,
    AC_SUBST(version_suffix,$withval)
    RPM_VERSION_SUFFIX="--with-version-suffix=$withval"])
 AC_SUBST(RPM_VERSION_SUFFIX)
+AC_SUBST(program_base_name,"lyx")
 AC_MSG_RESULT([$withval])
 ])
 
@@ -231,6 +232,10 @@ AC_ARG_ENABLE(pch,
 	enable_pch=no;)
 lyx_pch_comp=no
 
+AC_ARG_ENABLE(cxx11,
+  AC_HELP_STRING([--enable-cxx11],[enable C++11 mode]),,
+  enable_cxx11=no;)
+
 AC_ARG_ENABLE(assertions,
   AC_HELP_STRING([--enable-assertions],[add runtime sanity checks in the program]),,
   [AS_CASE([$build_type], [dev*|pre*], [enable_assertions=yes],
@@ -305,6 +310,18 @@ if test x$GXX = xyes; then
 	;;
     esac
   fi
+  if test x$enable_cxx11 = xyes ; then
+      case $gxx_version in
+	  4.3*|4.4*|4.5*|4.6*)
+	      lyx_flags="$lyx_flags c++11-mode"
+	      CXXFLAGS="-std=gnu++0x $CXXFLAGS"
+	      ;;
+	  4.7*|4.8*)
+	      lyx_flags="$lyx_flags c++11-mode"
+	      CXXFLAGS="-std=gnu++11 $CXXFLAGS"
+	      ;;
+      esac
+  fi
 fi
 test "$lyx_pch_comp" = yes && lyx_flags="$lyx_flags pch"
 AM_CONDITIONAL(LYX_BUILD_PCH, test "$lyx_pch_comp" = yes)
@@ -498,6 +515,7 @@ case $lyx_use_packaging in
    macosx) AC_DEFINE(USE_MACOSX_PACKAGING, 1, [Define to 1 if LyX should use a MacOS X application bundle file layout])
 	   PACKAGE=LyX${version_suffix}
 	   default_prefix="/Applications/${PACKAGE}.app"
+	   AC_SUBST(osx_bundle_program_name,"${program_base_name}")
 	   bindir='${prefix}/Contents/MacOS'
 	   libdir='${prefix}/Contents/Resources'
 	   datarootdir='${prefix}/Contents/Resources'