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

diff --git a/config/lyxinclude.m4 b/config/lyxinclude.m4
index bb94bfc5b2..2e529ea221 100644
--- a/config/lyxinclude.m4
+++ b/config/lyxinclude.m4
@@ -22,7 +22,7 @@ AC_ARG_ENABLE(build-type,
     *) AC_ERROR([Bad build type specification \"$enableval\". Please use one of rel(ease), pre(release), dev(elopment), prof(iling), or gprof]);;
    esac],
   [case AC_PACKAGE_VERSION in
-    *svn*) build_type=development;;
+    *svn*|*dev*) build_type=development;;
     *pre*|*alpha*|*beta*|*rc*) build_type=prerelease;;
     *) build_type=release ;;
    esac])
@@ -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)
@@ -322,25 +339,24 @@ AC_DEFUN([LYX_USE_INCLUDED_BOOST],[
 	AC_MSG_RESULT([$lyx_cv_with_included_boost])
 	if test x$lyx_cv_with_included_boost != xyes ; then
 		AC_LANG_PUSH(C++)
-		SAVED_LDFLAGS=$LDFLAGS
+		save_LIBS=$LIBS
 
-		LDFLAGS="$SAVED_LDFLAGS -lboost_signals -lm"
-		AC_LINK_IFELSE([AC_LANG_PROGRAM([#include <boost/signal.hpp>], [boost::signal<void ()> s;])], [lyx_boost_underscore=yes], [])
-		LDFLAGS="$SAVED_LDFLAGS -lboost_signals-mt -lm $LIBTHREAD"
-		AC_LINK_IFELSE([AC_LANG_PROGRAM([#include <boost/signal.hpp>], [boost::signal<void ()> s;])], [lyx_boost_underscore_mt=yes], [])
+		LIBS="$save_LIBS -lboost_signals -lm"
+		AC_LINK_IFELSE([AC_LANG_PROGRAM([#include <boost/signal.hpp>], [boost::signal<void ()> s;])], [lyx_boost_plain=yes], [])
+		LIBS="$save_LIBS -lboost_signals-mt -lm $LIBTHREAD"
+		AC_LINK_IFELSE([AC_LANG_PROGRAM([#include <boost/signal.hpp>], [boost::signal<void ()> s;])], [lyx_boost_mt=yes], [])
 
-		LDFLAGS=$SAVED_LDFLAGS
+		LIBS=$save_LIBS
 		AC_LANG_POP(C++)
 
-		if test x$lyx_boost_underscore_mt = xyes ; then
+		if test x$lyx_boost_mt = xyes ; then
 			BOOST_MT="-mt"
 		else
 			BOOST_MT=""
-			if test x$lyx_boost_plain != xyes -a x$lyx_boost_underscore != xyes ; then
+			if test x$lyx_boost_plain != xyes ; then
 				LYX_ERROR([No suitable boost library found (do not use --without-included-boost)])
 			fi
 		fi
-		AC_SUBST(BOOST_SEP)
 		AC_SUBST(BOOST_MT)
 	fi
 ])
@@ -499,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'
@@ -521,6 +538,7 @@ case $lyx_use_packaging in
 	   default_prefix=$ac_default_prefix
 	   case ${host} in
 	   *cygwin*) lyx_install_cygwin=true ;;
+		*apple-darwin*) lyx_install_macosx=true ;;
 	   esac
 	   lyx_install_posix=true ;;
     *) LYX_ERROR([Unknown packaging type $lyx_use_packaging]) ;;