dnl This is a trick to make autoheader do the right thing
dnl AM_CONFIG_HEADER(src/config.h)
AC_CONFIG_AUX_DIR(config)
-LYX_GET_VERSION(${srcdir}/src/version.h)
+
+PACKAGE=lyx${program_suffix}
+VERSION="1.2.0cvs"
+LYX_CHECK_VERSION
AC_CANONICAL_SYSTEM
AC_VALIDATE_CACHE_SYSTEM_TYPE
# This is needed by GNU gettext
ALL_LINGUAS="ca cs da de es eu fi fr he hu it nl no pl pt ro ru sl sv tr wa"
-AC_PREFIX_PROGRAM(lyx)
-
# fix the value of the prefixes.
test "x$prefix" = xNONE && prefix=$ac_default_prefix
test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
esac
### Check for a C++ compiler
-AC_LANG_CPLUSPLUS
LYX_PROG_CXX
-AC_PROG_CXXCPP
### Some checks on what the C++ compiler can(not) do
+AC_LANG_CPLUSPLUS
dnl we do not need that currently (and probably all our supported
dnl compiler allow that)
dnl LYX_CXX_PARTIAL
dnl problems with the AC_REQUIRE contained in KDE_DO_IT_ALL.
case "$lyx_use_frontend" in
xforms)
- FRONTEND="xforms"
+ # for now don't set it for xforms as this is always entered
+ FRONTEND=""
FRONTEND_GUILIB="xforms/libxforms.la";;
gnome)
AM_PATH_GTKMM(1.2.1,,
FRONTEND_INFO=`cat <<EOF
libXpm version: ${XPM_VERSION}\n\
libforms version: ${XFORMS_VERSION}\n
-EOF`
+`
AC_SUBST(LYX_LIBS)
else
# some standard header files
AC_HEADER_DIRENT
AC_HEADER_MAJOR
-AC_CHECK_HEADERS(sys/time.h sys/types.h sys/select.h strings.h)
+AC_CHECK_HEADERS(sys/time.h sys/types.h sys/select.h strings.h locale.h)
# some annoying header files
#LYX_PATH_HEADER(stl_string_fwd.h)
C++ Compiler: ${CXX} ${CXX_VERSION}\n\
C++ Compiler flags: ${CXXFLAGS}\n\
Linker flags: ${LDFLAGS}\n\
- Frontend: ${FRONTEND}\n\
+ Frontend: ${lyx_use_frontend}\n\
${FRONTEND_INFO}\
LyX binary dir: ${real_bindir}\n\
LyX files dir: ${real_datadir}\n
-EOF`
+`
-AC_DEFINE_UNQUOTED(VERSION_INFO, "${VERSION_INFO}", Version information on the current build of LyX)
+AC_SUBST(VERSION_INFO)
### Finish the work.
AC_CONFIG_SUBDIRS(sigc++ lib lib/reLyX)
po/Makefile.in \
sourcedoc/Doxyfile \
src/Makefile \
+ src/version.C \
src/mathed/Makefile \
src/graphics/Makefile \
src/insets/Makefile \