enable_warnings=no;
fi;])
if test x$enable_warnings = xyes ; then
- lyx_flags="$lyx_flags warnings"
+ lyx_flags="warnings $lyx_flags"
AC_DEFINE(WITH_WARNINGS, 1,
[Define this if you want to see the warning directives put here and
there by the developpers to get attention])
enable_concept_checks=no;
fi;])
+AC_ARG_ENABLE(profiling,
+ AC_HELP_STRING([--enable-profiling],[enable profiling]),,
+ enable_profiling=no;)
+
### set up optimization
AC_ARG_ENABLE(optimization,
AC_HELP_STRING([--enable-optimization[=value]],[enable compiler optimisation]),,
if test "$ac_test_CXXFLAGS" = set; then
CXXFLAGS="$ac_save_CXXFLAGS"
else
- case $gxx_version in
- 2.95.1) CXXFLAGS="$lyx_opt -fpermissive -ftemplate-depth-30";;
- 2.95.*) CXXFLAGS="$lyx_opt -Wno-non-template-friend -ftemplate-depth-30";;
- 2.96*) CXXFLAGS="$lyx_opt -fno-exceptions -ftemplate-depth-30 -Wno-non-template-friend";;
- 3.1*) CXXFLAGS="$lyx_opt -finline-limit=500 -fno-exceptions";;
- 3.2*|3.3*) CXXFLAGS="$lyx_opt -fno-exceptions";;
- 3.4*|4.0*)
- CXXFLAGS="$lyx_opt -fno-exceptions"
- test $enable_pch = yes && lyx_pch_comp=yes
- ;;
- *) CXXFLAGS="$lyx_opt";;
- esac
+ CFLAGS="$lyx_opt"
+ CXXFLAGS="$lyx_opt"
if test x$enable_debug = xyes ; then
+ CFLAGS="-g $CFLAGS"
CXXFLAGS="-g $CXXFLAGS"
fi
+ if test x$enable_profiling = xyes ; then
+ CFLAGS="-pg $CFLAGS"
+ CXXFLAGS="-pg $CXXFLAGS"
+ LDFLAGS="-pg $LDFLAGS"
+ fi
+ if test x$enable_warnings = xyes ; then
+ case $gxx_version in
+ 2.*|3.1*|3.2*|3.3*)
+ CPPFLAGS="-W -Wall $CPPFLAGS"
+ ;;
+ *)
+ CPPFLAGS="-Wextra -Wall $CPPFLAGS "
+ ;;
+ esac
+ fi
fi
+ case $gxx_version in
+ 2.95.1) AM_CXXFLAGS="-fpermissive -ftemplate-depth-30";;
+ 2.95.*) AM_CXXFLAGS="-Wno-non-template-friend -ftemplate-depth-30";;
+ 2.96*) AM_CXXFLAGS="-fno-exceptions -ftemplate-depth-30 -Wno-non-template-friend";;
+ 3.1*) AM_CXXFLAGS="-finline-limit=500 -fno-exceptions";;
+ 3.2*|3.3*) AM_CXXFLAGS="-fno-exceptions";;
+ 3.4*|4.0*)
+ AM_CXXFLAGS="-fno-exceptions"
+ test $enable_pch = yes && lyx_pch_comp=yes
+ ;;
+ *) AM_CXXFLAGS="";;
+ esac
if test x$enable_stdlib_debug = xyes ; then
case $gxx_version in
3.4*|4.0*)
- lyx_flags="$lyx_flags stdlib-debug"
+ lyx_flags="stdlib-debug $lyx_flags"
AC_DEFINE(_GLIBCXX_DEBUG, 1, [libstdc++ debug mode])
AC_DEFINE(_GLIBCXX_DEBUG_PEDANTIC, 1, [libstdc++ pedantic debug mode])
;;
if test x$enable_concept_checks = xyes ; then
case $gxx_version in
3.3*)
- lyx_flags="$lyx_flags concept-checks"
+ lyx_flags="concept-checks $lyx_flags"
AC_DEFINE(_GLIBCPP_CONCEPT_CHECKS, 1, [libstdc++ concept checking])
;;
3.4*|4.0*)
- lyx_flags="$lyx_flags concept-checks"
+ lyx_flags="concept-checks $lyx_flags"
AC_DEFINE(_GLIBCXX_CONCEPT_CHECKS, 1, [libstdc++ concept checking])
;;
esac
fi
- if test x$enable_warnings = xyes ; then
- case $gxx_version in
- 2.*|3.1*|3.2*|3.3*)
- CPPFLAGS="$CPPFLAGS -W -Wall"
- ;;
- *)
- CPPFLAGS="$CPPFLAGS -Wextra -Wall"
- ;;
- esac
- fi
fi
-test "$lyx_pch_comp" = yes && lyx_flags="$lyx_flags pch"
+test "$lyx_pch_comp" = yes && lyx_flags="pch $lyx_flags"
AM_CONDITIONAL(LYX_BUILD_PCH, test "$lyx_pch_comp" = yes)
])dnl
])
-## Check what kind of packaging should be used at install time.
-## The default is autodetected.
+## Check what kind of packaging should be used at install time.
+## The default is autodetected.
AC_DEFUN([LYX_USE_PACKAGING],
[AC_MSG_CHECKING([what packaging should be used])
AC_ARG_WITH(packaging,
*) lyx_use_packaging=posix;;
esac])
AC_MSG_RESULT($lyx_use_packaging)
-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])
+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])
default_prefix="/Applications/LyX.app"
bindir='${prefix}/Contents/MacOS'
+ libdir='${prefix}/Contents/Resources'
datadir='${prefix}/Contents/Resources'
mandir='${prefix}/Contents/Resources/man' ;;
- windows) AC_DEFINE(USE_WINDOWS_PACKAGING, 1, [Define to 1 if LyX should use a Windows-style file layout])
- default_prefix="'C:Program Files/LyX'"
+ windows) AC_DEFINE(USE_WINDOWS_PACKAGING, 1, [Define to 1 if LyX should use a Windows-style file layout])
+ default_prefix="C:/Program Files/LyX"
bindir='${prefix}/bin'
+ libdir='${prefix}/Resources'
datadir='${prefix}/Resources'
mandir='${prefix}/Resources/man' ;;
- posix) AC_DEFINE(USE_POSIX_PACKAGING, 1, [Define to 1 if LyX should use a POSIX-style file layout])
+ posix) AC_DEFINE(USE_POSIX_PACKAGING, 1, [Define to 1 if LyX should use a POSIX-style file layout])
default_prefix=$ac_default_prefix ;;
*) LYX_ERROR([Unknown packaging type $lyx_use_packaging]) ;;
esac