dnl Usage LYX_CHECK_VERSION Displays version of LyX being built and
dnl sets variables "lyx_devel_version" and "lyx_prerelease"
AC_DEFUN([LYX_CHECK_VERSION],[
-echo "configuring LyX version $VERSION"
-if echo "$VERSION" | grep 'cvs' >/dev/null ; then
+echo "configuring LyX version" AC_PACKAGE_VERSION
+if echo AC_PACKAGE_VERSION | grep 'svn' >/dev/null ; then
lyx_devel_version=yes
AC_DEFINE(DEVEL_VERSION, 1, [Define if you are building a development version of LyX])
echo "WARNING: This is a development version. Expect bugs."
else
lyx_devel_version=no
fi
-if echo "$VERSION" | grep 'pre' > /dev/null ; then
+if echo AC_PACKAGE_VERSION | grep 'pre' > /dev/null ; then
lyx_prerelease=yes
echo "WARNING: This is a prerelease. Be careful and backup your documents."
else
dnl
dnl
AC_DEFUN([LYX_VERSION_SUFFIX],[
-AC_MSG_CHECKING([for install target ... ])
+AC_MSG_CHECKING([for version suffix])
+dnl We need the literal double quotes in the rpm spec file
RPM_VERSION_SUFFIX='""'
AC_ARG_WITH(version-suffix,
[ --with-version-suffix[=<version>] install lyx files as lyx<version>],
[if test "x$withval" = "xyes";
then
- withval="-$VERSION"
+ withval="-"AC_PACKAGE_VERSION
ac_configure_args=`echo $ac_configure_args | sed "s,--with-version-suffix,--with-version-suffix=$withval,"`
fi
- lyxname="lyx$withval"
- program_suffix=$withval
- RPM_VERSION_SUFFIX="--with-version-suffix=$withval"],
- [lyxname=lyx])
+ version_suffix=$withval
+ RPM_VERSION_SUFFIX="--with-version-suffix=$withval"])
AC_SUBST(RPM_VERSION_SUFFIX)
-AC_MSG_RESULT([$lyxname])
+AC_MSG_RESULT([$withval])
])
AC_ARG_ENABLE(stdlib-debug,
AC_HELP_STRING([--enable-stdlib-debug],[enable debug mode in the standard library]),,
- [ if test $lyx_devel_version = yes -o $lyx_prerelease = yes ; then
+ [ if test $lyx_devel_version = yes ; then
enable_stdlib_debug=yes;
else
enable_stdlib_debug=no;
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]),,
- enable_optimization=yes;)
+ AC_HELP_STRING([--enable-optimization[=value]],[enable compiler optimisation]),,
+ enable_optimization=yes;)
case $enable_optimization in
- yes) lyx_opt=-O;;
- no) lyx_opt=;;
+ yes)
+ if test $lyx_devel_version = yes ; then
+ lyx_opt=-O
+ else
+ lyx_opt=-O2
+ fi;;
+ no) lyx_opt=;;
*) lyx_opt=${enable_optimization};;
esac
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*)
+ 3.1*|3.2*|3.3*)
CPPFLAGS="-W -Wall $CPPFLAGS"
;;
*)
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.1*) AM_CXXFLAGS="-finline-limit=500 ";;
+ 3.2*|3.3*) AM_CXXFLAGS="";;
3.4*|4.0*)
- AM_CXXFLAGS="-fno-exceptions"
+ AM_CXXFLAGS=""
test $enable_pch = yes && lyx_pch_comp=yes
;;
*) AM_CXXFLAGS="";;
])
### end of LYX_PATH_HEADER
-### Check which frontends we want to use. The default is XForms only
+### 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,
[ --with-frontend=THIS Use THIS frontend as main GUI:
- Possible values: xforms, qt, gtk(EXPERIMENTAL)],
- [FRONTENDS="$withval"], [FRONTENDS="xforms"])
+ Possible values: qt3, qt4, gtk],
+ [FRONTENDS="$withval"])
+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_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])
- default_prefix="/Applications/LyX.app"
+ PACKAGE=LyX${version_suffix}
+ default_prefix="/Applications/${PACKAGE}.app"
bindir='${prefix}/Contents/MacOS'
libdir='${prefix}/Contents/Resources'
datadir='${prefix}/Contents/Resources'
- mandir='${prefix}/Contents/Resources/man' ;;
+ pkgdatadir='${datadir}'
+ mandir='${datadir}/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"
+ PACKAGE=LyX${version_suffix}
+ default_prefix="C:/Program Files/${PACKAGE}"
bindir='${prefix}/bin'
libdir='${prefix}/Resources'
datadir='${prefix}/Resources'
+ pkgdatadir='${datadir}'
mandir='${prefix}/Resources/man' ;;
posix) AC_DEFINE(USE_POSIX_PACKAGING, 1, [Define to 1 if LyX should use a POSIX-style file layout])
+ PACKAGE=lyx${version_suffix}
+ program_suffix=$version_suffix
+ pkgdatadir='${datadir}/${PACKAGE}'
default_prefix=$ac_default_prefix ;;
*) LYX_ERROR([Unknown packaging type $lyx_use_packaging]) ;;
esac
+AC_SUBST(pkgdatadir)
+AC_SUBST(program_suffix)
])
ac_save_cflags="$CFLAGS"
CC=$CXX
CFLAGS="$CXXFLAGS"
-AM_PROG_LIBTOOL dnl for libraries
+AC_PROG_LIBTOOL dnl for libraries
CC=$ac_save_cc
CFLAGS="$ac_save_cflags"
])
[Define if mkdir takes only one argument.])
fi
])
+
+
+dnl Set VAR to the canonically resolved absolute equivalent of PATHNAME,
+dnl (which may be a relative path, and need not refer to any existing
+dnl entity).
+
+dnl On Win32-MSYS build hosts, the returned path is resolved to its true
+dnl native Win32 path name, (but with slashes, not backslashes).
+
+dnl On any other system, it is simply the result which would be obtained
+dnl if PATHNAME represented an existing directory, and the pwd command was
+dnl executed in that directory.
+AC_DEFUN([MSYS_AC_CANONICAL_PATH],
+[ac_dir="$2"
+ ( exec 2>/dev/null; cd / && pwd -W ) | grep ':' >/dev/null &&
+ ac_pwd_w="pwd -W" || ac_pwd_w=pwd
+ until ac_val=`exec 2>/dev/null; cd "$ac_dir" && $ac_pwd_w`
+ do
+ ac_dir=`AS_DIRNAME(["$ac_dir"])`
+ done
+ ac_dir=`echo "$ac_dir" | sed 's?^[[./]]*??'`
+ ac_val=`echo "$ac_val" | sed 's?/*$[]??'`
+ $1=`echo "$2" | sed "s?^[[./]]*$ac_dir/*?$ac_val/?"'
+ s?/*$[]??'`
+])
projects / lyx.git / blobdiff