X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=config%2Flyxinclude.m4;h=f2def9918244e2b9dce7770092661ecc681477e5;hb=8e23cfdbdc8fb06999ba2c964c86704d15131ecc;hp=e532c54d87e17a576784b0a3ab8a6a3d6e9e7f15;hpb=20359572ed1e68b65c689ae84bc46321dc54a04e;p=lyx.git

diff --git a/config/lyxinclude.m4 b/config/lyxinclude.m4
index e532c54d87..f2def99182 100644
--- a/config/lyxinclude.m4
+++ b/config/lyxinclude.m4
@@ -19,7 +19,7 @@ AC_ARG_ENABLE(build-type,
     prof*)  build_type=profiling;;
     gprof*) build_type=gprof;;
     rel*) build_type=release;;
-    *) AC_ERROR([Bad build type specification \"$enableval\". Please use one of rel(ease), pre(release), dev(elopment), prof(iling), or gprof]);;
+    *) AC_MSG_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*|*dev*) build_type=development;;
@@ -34,7 +34,7 @@ case $build_type in
 		 LYX_DATE="not released yet" ;;
     prerelease) lyx_prerelease=yes ;;
 esac
-    
+
 AC_SUBST(lyx_devel_version)
 ])
 
@@ -61,15 +61,6 @@ AC_MSG_RESULT([$withval])
 ])
 
 
-dnl Usage: LYX_ERROR(message)  Displays the warning "message" and sets the
-dnl flag lyx_error to yes.
-AC_DEFUN([LYX_ERROR],[
-lyx_error_txt="$lyx_error_txt
-** $1
-"
-lyx_error=yes])
-
-
 dnl Usage: LYX_WARNING(message)  Displays the warning "message" and sets the
 dnl flag lyx_warning to yes.
 AC_DEFUN([LYX_WARNING],[
@@ -82,36 +73,20 @@ lyx_warning=yes])
 dnl Usage: LYX_LIB_ERROR(file,library)  Displays an error message indication
 dnl  that 'file' cannot be found because 'lib' may be uncorrectly installed.
 AC_DEFUN([LYX_LIB_ERROR],[
-LYX_ERROR([Cannot find $1. Please check that the $2 library
+AC_MSG_ERROR([cannot find $1. Please check that the $2 library
    is correctly installed on your system.])])
 
 
-dnl Usage: LYX_CHECK_ERRORS  Displays a warning message if a LYX_ERROR
+dnl Usage: LYX_CHECK_WARNINGS  Displays a warning message if a LYX_WARNING
 dnl   has occured previously.
-AC_DEFUN([LYX_CHECK_ERRORS],[
+AC_DEFUN([LYX_CHECK_WARNINGS],[
 if test x$lyx_warning = xyes; then
 cat <<EOF
 === The following minor problems have been detected by configure.
 === Please check the messages below before running 'make'.
 === (see the section 'Problems' in the INSTALL file)
 $lyx_warning_txt
-EOF
-fi
-if test x$lyx_error = xyes; then
-cat <<EOF
-**** The following problems have been detected by configure.
-**** Please check the messages below before running 'make'.
-**** (see the section 'Problems' in the INSTALL file)
-$lyx_error_txt
-$lyx_warning_txt
-EOF
-exit 1
-else
 
-cat <<EOF
-Configuration of LyX was successful.
-Type 'make' to compile the program,
-and then 'make install' to install it.
 EOF
 fi])
 
@@ -207,11 +182,6 @@ AC_ARG_ENABLE(concept-checks,
 	  [enable_concept_checks=no])]
 )
 
-AC_ARG_ENABLE(gprof,
-  AC_HELP_STRING([--enable-gprof],[enable profiling using gprof]),,
-  [AS_CASE([$build_type], [gprof], [enable_gprof=yes], [enable_gprof=no])]
-)
-
 ### set up optimization
 AC_ARG_ENABLE(optimization,
     AC_HELP_STRING([--enable-optimization[=value]],[enable compiler optimisation]),,
@@ -232,6 +202,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],
@@ -252,16 +226,20 @@ if test x$GXX = xyes; then
   if test "$ac_test_CXXFLAGS" = set; then
     CXXFLAGS="$ac_save_CXXFLAGS"
   else
-      CFLAGS="$lyx_opt"
-      CXXFLAGS="$lyx_opt"
+    CFLAGS="$lyx_opt"
+    CXXFLAGS="$lyx_opt"
     if test x$enable_debug = xyes ; then
-        CFLAGS="-g $CFLAGS"
-	CXXFLAGS="-g $CXXFLAGS"
+      CFLAGS="-g $CFLAGS"
+      CXXFLAGS="-g $CXXFLAGS"
     fi
-    if test x$enable_gprof = xyes ; then
-        CFLAGS="-pg $CFLAGS"
-        CXXFLAGS="-pg $CXXFLAGS"
-        LDFLAGS="-pg $LDFLAGS"
+    if test $build_type = gprof ; then
+      CFLAGS="-pg $CFLAGS"
+      CXXFLAGS="-pg $CXXFLAGS"
+      LDFLAGS="-pg $LDFLAGS"
+    fi
+    if test $build_type = profiling ; then
+      CFLAGS="$CFLAGS -fno-omit-frame-pointer"
+      CXXFLAGS="$CXXFLAGS -fno-omit-frame-pointer"
     fi
   fi
   if test "$ac_env_CPPFLAGS_set" != set; then
@@ -306,6 +284,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)
@@ -338,7 +328,7 @@ AC_DEFUN([LYX_USE_INCLUDED_BOOST],[
 		else
 			BOOST_MT=""
 			if test x$lyx_boost_plain != xyes ; then
-				LYX_ERROR([No suitable boost library found (do not use --without-included-boost)])
+				AC_MSG_ERROR([cannot find suitable boost library (do not use --without-included-boost)])
 			fi
 		fi
 		AC_SUBST(BOOST_MT)
@@ -368,7 +358,7 @@ AC_DEFUN([LYX_USE_INCLUDED_MYTHES],[
 		fi
 		AC_LANG_POP(C++)
 		if test x$lyx_mythes != xyes -o x$ac_cv_header_mythes_h != xyes; then
-			LYX_ERROR([No suitable MyThes library found (do not use --without-included-mythes)])
+			AC_MSG_ERROR([cannot find suitable MyThes library (do not use --without-included-mythes)])
 		fi
 		AC_DEFINE(USE_EXTERNAL_MYTHES, 1, [Define as 1 to use an external MyThes library])
 		AC_DEFINE_UNQUOTED(MYTHES_H_LOCATION,$lyx_cv_mythes_h_location,[Location of mythes.hxx])
@@ -459,25 +449,6 @@ rm -f conftest*])
 ])
 ### end of LYX_PATH_HEADER
 
-### Check which frontends we want to use.
-###
-AC_DEFUN([LYX_USE_FRONTENDS],
-[AC_MSG_CHECKING([what frontend should be used for the GUI])
-AC_ARG_WITH(frontend,
-  [AC_HELP_STRING([--with-frontend=THIS], [use THIS frontend as main GUI:
-			    Possible values: qt4])],
-  [FRONTENDS="$withval"],[FRONTENDS="qt4"])
-if test "x$FRONTENDS" = x ; then
-  AC_MSG_RESULT(none)
-  AC_ERROR("Please select a frontend using --with-frontend")
-fi
-AC_MSG_RESULT($FRONTENDS)
-AC_SUBST(FRONTENDS)
-AC_SUBST(FRONTENDS_SUBDIRS)
-AC_SUBST(FRONTENDS_PROGS)
-])
-
-
 ## Check what kind of packaging should be used at install time.
 ## The default is autodetected.
 AC_DEFUN([LYX_USE_PACKAGING],
@@ -525,15 +496,12 @@ case $lyx_use_packaging in
 		*apple-darwin*) lyx_install_macosx=true ;;
 	   esac
 	   lyx_install_posix=true ;;
-    *) LYX_ERROR([Unknown packaging type $lyx_use_packaging]) ;;
+    *) AC_MSG_ERROR([unknown packaging type $lyx_use_packaging.]) ;;
 esac
 AM_CONDITIONAL(INSTALL_MACOSX, $lyx_install_macosx)
 AM_CONDITIONAL(INSTALL_WINDOWS, $lyx_install_windows)
 AM_CONDITIONAL(INSTALL_CYGWIN, $lyx_install_cygwin)
 AM_CONDITIONAL(INSTALL_POSIX, $lyx_install_posix)
-dnl Next two lines are only for autoconf <= 2.59
-datadir='${datarootdir}'
-AC_SUBST(datarootdir)
 AC_SUBST(pkgdatadir)
 AC_SUBST(program_suffix)
 ])