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
# The list of languages known to LyX
# 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)
+ALL_LINGUAS="ca cs da de es eu fi fr he hu it nl no pl pt ro ru sk sl sv tr wa"
# fix the value of the prefixes.
test "x$prefix" = xNONE && prefix=$ac_default_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
AC_CHECK_LIB(m, sin)
AC_CHECK_LIB(c, fopen)
AC_ARG_WITH(aiksaurus,
- [ --without-aiksaurus do not use the AikSaurus library],
+ [ --without-aiksaurus do not use the Aiksaurus library],
[lyx_use_aiksaurus=$withval])
if test x$lyx_use_aiksaurus != xno; then
-AC_CHECK_LIB(AikSaurus, main,
+AC_CHECK_LIB(Aiksaurus, main,
[AC_DEFINE(HAVE_LIBAIKSAURUS,,[Define this if you have the AikSaurus library])
- AIKSAURUS_LIBS="-lAikSaurus -lbz2"
+ AIKSAURUS_LIBS="-lAiksaurus -lbz2"
],,"-lbz2")
fi
AC_SUBST(AIKSAURUS_LIBS)
CHECK_WITH_PSPELL
### Check for X libraries
-# Check for the pt library (for SCO, needed for X)
-AC_CHECK_LIB(pt,ptsname,X_EXTRA_LIBS="-lpt $X_EXTRA_LIBS")
+dnl # Check for the pt library (for SCO, needed for X)
+dnl AC_CHECK_LIB(pt,ptsname,X_EXTRA_LIBS="-lpt $X_EXTRA_LIBS")
# The real thing.
AC_PATH_XTRA
LIBS="$X_PRE_LIBS $LIBS $X_LIBS -lX11 $X_EXTRA_LIBS"
xforms)
# for now don't set it for xforms as this is always entered
FRONTEND=""
- FRONTEND_GUILIB="xforms/libxforms.la";;
+ FRONTEND_GUILIB="xforms/libxforms.o";;
gnome)
AM_PATH_GTKMM(1.2.1,,
AC_MSG_ERROR(Cannot find GTK--: Please install Version 1.2.1+))
FRONTEND="gnome"
FRONTEND_GUILIB="gnome/libgnome.la"
FRONTEND_LDFLAGS="\$(GNOMEMM_LIBDIR)"
- FRONTEND_INCLUDES="-I\${srcdir}/gnome \$(GNOMEMM_INCLUDEDIR) \$(GTKMM_CFLAGS)"
- FRONTEND_LIBS="\$(GNOMEMM_LIBS) \$(GTKMM_LIBS) `gnome-config --libs libglade`";;
+ FRONTEND_INCLUDES="-I\${srcdir}/gnome \$(GNOMEMM_INCLUDEDIR) \$(GTKMM_CFLAGS) `gnome-config --cflags libglade gnomeui`"
+ FRONTEND_LIBS="\$(GNOMEMM_LIBS) \$(GTKMM_LIBS) `gnome-config --libs libglade gnomeui`";;
qt2)
QT2_DO_IT_ALL
FRONTEND="qt2"
# 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)
LyX files dir: ${real_datadir}\n
`
-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 \
src/support/Makefile \
src/frontends/Makefile \
- src/frontends/support/Makefile \
src/frontends/controllers/Makefile \
src/frontends/xforms/Makefile \
src/frontends/qt2/Makefile \