AC_CONFIG_AUX_DIR(config)
PACKAGE=lyx${program_suffix}
-VERSION="1.3.0cvs"
+VERSION="1.4.0cvs"
LYX_CHECK_VERSION
+AM_MAINTAINER_MODE
AC_CANONICAL_SYSTEM
LYX_VERSION_SUFFIX
# The list of languages known to LyX
# This is needed by GNU gettext
-ALL_LINGUAS="bg ca cs da de es eu fi fr he hu it nl no pl pt ro ru sk sl sv tr wa"
+ALL_LINGUAS="bg ca cs da de es eu fi fr he hu it nl nn no pl pt ro ru sk sl sv tr wa"
# fix the value of the prefixes.
test "x$prefix" = xNONE && prefix=$ac_default_prefix
### check which frontend we want to use
LYX_USE_FRONTEND
-#old gnome stuff removed by Michael Koziarski 25-05-2002
-
### Check for a C++ compiler
LYX_PROG_CXX
### Some checks on what the C++ compiler can(not) do
-AC_LANG(C++)
+AC_LANG_CPLUSPLUS
dnl we do not need that currently (and probably all our supported
dnl compiler allow that)
dnl LYX_CXX_PARTIAL
#AM_PROG_LIBTOOL
LYX_PROG_LIBTOOL
-### Check if we want pspell libraries
-CHECK_WITH_PSPELL
+### Check if we want spell libraries, prefer new aspell
+CHECK_WITH_ASPELL
+if test "$USING_ASPELL" != "yes"; then
+ CHECK_WITH_PSPELL
+fi
+
+### Check for some Cygwin-specific details.
+CHECK_WITH_CYGWIN
### Check for X libraries
# The real thing.
AC_PATH_XTRA
LIBS="$X_PRE_LIBS $LIBS $X_LIBS -lX11 $X_EXTRA_LIBS"
-# Since solaris X headers use int as implicit return type and modern
-# gcc's do not like that, let's use -isystem instead of -I.
-# We should test for gcc version and see whether it supports -isystem,
-# but since at least gcc 2.6.x supports it and it is still too old for
-# us, it seems we are safe.
-if test -n "$GXX" ; then
- X_CFLAGS=`echo ${X_CFLAGS} | sed -e 's/-I/-isystem /'`
-fi
CPPFLAGS="$CPPFLAGS $X_CFLAGS"
-## Check whether X is new enough to handle the input method stuff
-AC_CHECK_FUNCS(XOpenIM)
-
### check which frontend we want to use
-# We have to check for xforms anyway
-LYX_PATH_XPM
-LYX_PATH_XFORMS
#LYX_USE_FRONTEND
dnl The code below is not in a macro, because this would cause big
dnl problems with the AC_REQUIRE contained in KDE_DO_IT_ALL.
case "$lyx_use_frontend" in
xforms)
- # for now don't set it for xforms as this is always entered
+ LYX_PATH_XPM
+ LYX_PATH_XFORMS
+ LYX_CHECK_XFORMS_IMAGE_LOADER
FRONTEND="xforms"
+ RPM_FRONTEND="xforms"
+ RPM_FRONTEND_DEPS='libforms >= 1.0'
FRONTEND_GUILIB="xforms/*.lo xforms/forms/*.lo"
FRONTEND_INCLUDES="-I\$(srcdir)/xforms"
- case "$host" in
- *cygwin)
- FRONTEND_LIBS="@XFORMS_LIB@ @XFORMS_IMAGE_LIB@ @XPM_LIB@"
- ;;
- *)
- FRONTEND_LIBS="@XFORMS_IMAGE_LIB@ @XFORMS_LIB@ @XPM_LIB@"
- ;;
- esac
+ FRONTEND_LIBS="@XFORMS_IMAGE_LIB@ @XFORMS_LIB@ @XPM_LIB@"
FRONTEND_INFO=" libXpm version: ${XPM_VERSION}\n\
libforms version: ${XFORMS_VERSION}\n"
;;
- gnome)
- PKG_CHECK_MODULES(GNOME_FRONTEND, gtkmm-2.0 libglademm-2.0)
- AC_SUBST(GNOME_FRONTEND_CFLAGS)
- AC_SUBST(GNOME_FRONTEND_LIBS)
-
- FRONTEND="xforms gnome"
- FRONTEND_GUILIB="gnome/*.lo"
- FRONTEND_LDFLAGS="${GNOME_FRONTEND_LIBS}"
- FRONTEND_INCLUDES="-I\${srcdir}/gnome -I\${srcdir}/xforms ${GNOME_FRONTEND_CFLAGS} "
- FRONTEND_LIBS="@XPM_LIB@ @XFORMS_LIB@ ${GNOME_FRONTEND_LIBS}";;
- qt2)
- QT2_DO_IT_ALL
+dnl gnome)
+dnl # Leaving these tests in means that they are performed twice for the
+dnl # xforms frontend. No, I don't understand why :-(
+dnl # Angus 16 Dec 2002.
+dnl # LYX_PATH_XPM
+dnl # LYX_PATH_XFORMS
+dnl # LYX_CHECK_XFORMS_IMAGE_LOADER
+dnl PKG_CHECK_MODULES(GNOME_FRONTEND, gtkmm-2.0 libglademm-2.0)
+dnl AC_SUBST(GNOME_FRONTEND_CFLAGS)
+dnl AC_SUBST(GNOME_FRONTEND_LIBS)
+
+dnl FRONTEND="xforms gnome"
+dnl FRONTEND_GUILIB="gnome/*.lo"
+dnl FRONTEND_LDFLAGS="${GNOME_FRONTEND_LIBS}"
+dnl FRONTEND_INCLUDES="-I\${srcdir}/gnome -I\${srcdir}/xforms ${GNOME_FRONTEND_CFLAGS} "
+dnl FRONTEND_LIBS="@XPM_LIB@ @XFORMS_LIB@ ${GNOME_FRONTEND_LIBS}";;
+ qt)
+ QT_DO_IT_ALL
+ RPM_FRONTEND="qt"
+ RPM_FRONTEND_DEPS='qt >= 2.2.1'
FRONTEND="qt2"
FRONTEND_GUILIB="qt2/*.lo qt2/ui/*.lo qt2/moc/*.lo qt2/ui/moc/*.lo"
- FRONTEND_LDFLAGS="\$(QT2_LDFLAGS)"
- FRONTEND_INCLUDES="-I\${srcdir}/qt2 \$(QT2_INCLUDES)"
- FRONTEND_LIBS="\$(QT2_LIBS)";;
+ FRONTEND_LDFLAGS="\$(QT_LDFLAGS)"
+ FRONTEND_INCLUDES="-I\${srcdir}/qt2 \$(QT_INCLUDES)"
+ FRONTEND_LIBS="\$(QT_LIB)"
+ FRONTEND_INFO=" Qt version: ${QT_VERSION}\n"
+ ;;
*)
LYX_ERROR(Unknown frontend $lyx_use_frontend);;
esac
the development tools.])
fi
-### Check whether the xforms library has a viable image loader
-### For now, run this test always so config.h is unchanged by a change in
-### frontend
-LYX_USE_XFORMS_IMAGE_LOADER
-
### Setup GNU gettext
dnl GNUÂ gettext is written in C
-AC_LANG(C)
+AC_LANG_C
# Some tests that may be useful for gettext
AC_C_CONST
AC_C_INLINE
AC_SUBST(LINGUAS)
-AC_LANG(C++)
+AC_LANG_CPLUSPLUS
# some standard header files
AC_HEADER_DIRENT
AC_TYPE_SIZE_T
AC_TYPE_UID_T
-AC_CHECK_FUNCS(snprintf vsnprintf)
+AC_CHECK_FUNCS(snprintf vsnprintf strerror)
LYX_CHECK_DECL(snprintf, stdio.h)
LYX_CHECK_DECL(vsnprintf, stdio.h)
LYX_CHECK_DECL(istreambuf_iterator, iterator)
dnl work correctly because of some conflict with stdlib.h with g++ 2.96
dnl We aim to remove this eventually, since we should test as much as
dnl possible with the compiler which will use the functions (JMarc)
-AC_LANG(C)
-AC_CHECK_FUNCS(memmove memset strchr putenv setenv mkfifo mkstemp mktemp)
-AC_LANG(C++)
+AC_LANG_C
+AC_CHECK_FUNCS(memmove memset strchr mkfifo mkstemp mktemp)
+AC_LANG_CPLUSPLUS
dnl Until this is fixed in autoconf we provide our own version
LYX_FUNC_SELECT_ARGTYPES
-dnl check whether we have to work around solaris broken putenv()
-LYX_FUNC_PUTENV_ARGTYPE
-
-
LYX_CHECK_DECL_HDRS(mkstemp,[unistd.h stdlib.h])
### Some information on what just happened
AC_SUBST(VERSION_INFO)
+AC_SUBST(RPM_FRONTEND)
+AC_SUBST(RPM_FRONTEND_DEPS)
### Finish the work.
AC_CONFIG_SUBDIRS(lib lib/reLyX)
boost/libs/signals/Makefile \
boost/libs/signals/src/Makefile \
config/Makefile \
+ development/Makefile \
development/lyx.spec \
lib/Makefile \
intl/Makefile \
po/Makefile.in \
sourcedoc/Doxyfile \
+ sourcedoc/Makefile \
src/Makefile \
src/version.C \
+ src/tex2lyx/Makefile \
src/mathed/Makefile \
src/graphics/Makefile \
src/insets/Makefile \
src/frontends/Makefile \
src/frontends/controllers/Makefile \
src/frontends/xforms/Makefile \
+ src/frontends/xforms/lyx_forms.h \
+ src/frontends/xforms/lyx_xpm.h \
src/frontends/xforms/forms/Makefile \
src/frontends/qt2/Makefile \
src/frontends/qt2/moc/Makefile \
projects / lyx.git / blobdiff