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*) build_type=development;;
+ *svn*|*dev*) build_type=development;;
*pre*|*alpha*|*beta*|*rc*) build_type=prerelease;;
*) build_type=release ;;
esac])
LYX_DATE="not released yet" ;;
prerelease) lyx_prerelease=yes ;;
esac
-
+
AC_SUBST(lyx_devel_version)
])
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])
])
-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],[
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])
[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]),,
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],
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 $build_type = gprof ; then
+ CFLAGS="-pg $CFLAGS"
+ CXXFLAGS="-pg $CXXFLAGS"
+ LDFLAGS="-pg $LDFLAGS"
fi
- if test x$enable_gprof = xyes ; then
- CFLAGS="-pg $CFLAGS"
- CXXFLAGS="-pg $CXXFLAGS"
- LDFLAGS="-pg $LDFLAGS"
+ 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
;;
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)
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
- LYX_ERROR([No suitable boost library found (do not use --without-included-boost)])
+ if test x$lyx_boost_plain != xyes ; then
+ AC_MSG_ERROR([cannot find suitable boost library (do not use --without-included-boost)])
fi
fi
- AC_SUBST(BOOST_SEP)
AC_SUBST(BOOST_MT)
fi
])
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])
])
### 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],
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'
default_prefix=$ac_default_prefix
case ${host} in
*cygwin*) lyx_install_cygwin=true ;;
- esac ;;
- *) LYX_ERROR([Unknown packaging type $lyx_use_packaging]) ;;
+ *apple-darwin*) lyx_install_macosx=true ;;
+ esac
+ lyx_install_posix=true ;;
+ *) AC_MSG_ERROR([unknown packaging type $lyx_use_packaging.]) ;;
esac
AM_CONDITIONAL(INSTALL_MACOSX, $lyx_install_macosx)
-AM_CONDITIONAL(INSTALL_CYGWIN, $lyx_install_cygwin)
AM_CONDITIONAL(INSTALL_WINDOWS, $lyx_install_windows)
-dnl Next two lines are only for autoconf <= 2.59
-datadir='${datarootdir}'
-AC_SUBST(datarootdir)
+AM_CONDITIONAL(INSTALL_CYGWIN, $lyx_install_cygwin)
+AM_CONDITIONAL(INSTALL_POSIX, $lyx_install_posix)
AC_SUBST(pkgdatadir)
AC_SUBST(program_suffix)
])
projects / lyx.git / blobdiff