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
[AC_DEFINE(HAVE_LIBAIKSAURUS,,[Define this if you have the AikSaurus library])
AIKSAURUS_LIBS="-lAiksaurus -lbz2"
],,"-lbz2")
+AC_CHECK_HEADER(Aiksaurus.h,[
+ ac_cv_header_aiksaurus_h=yes
+ lyx_cv_aiksaurus_h_location="<Aiksaurus.h>"])
+AC_CHECK_HEADER(Aiksaurus/Aiksaurus.h,[
+ ac_cv_header_aiksaurus_h=yes
+ lyx_cv_aiksaurus_h_location="<Aiksaurus/Aiksaurus.h>"])
+AC_DEFINE_UNQUOTED(AIKSAURUS_H_LOCATION,$lyx_cv_aiksaurus_h_location,[Location of Aiksaurus.h])
fi
AC_SUBST(AIKSAURUS_LIBS)
#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"
-CPPFLAGS="$CPPFLAGS $X_CFLAGS"
+case $have_x in
+ yes) LIBS="$X_PRE_LIBS $LIBS $X_LIBS -lX11 $X_EXTRA_LIBS"
+ CPPFLAGS="$CPPFLAGS $X_CFLAGS";;
+ no) LYX_ERROR(dnl
+[Cannot find X window libraries and/or headers. Check your installation.
+ If you use a Linux system, check that you have installed
+ the development tools.]);;
+ disable) ;;
+esac
### check which frontend we want to use
LYX_ERROR(Unknown frontend $lyx_use_frontend);;
esac
-### Check for xforms and xpm (only if X has been found).
-if test "$have_x" = no ; then
-LYX_ERROR(dnl
-[Cannot find X window libraries and/or headers. Check your installation.
- If you use a Linux system, check that you have installed
- the development tools.])
-fi
-
### Setup GNU gettext
dnl GNUÂ gettext is written in C
AC_LANG_C
AC_SUBST(VERSION_INFO)
-AC_SUBST(RPM_FRONTEND, 'xforms')
-AC_SUBST(RPM_FRONTEND_DEPS, 'libforms >= 1.0')
+AC_SUBST(RPM_FRONTEND)
+AC_SUBST(RPM_FRONTEND_DEPS)
### Finish the work.
AC_CONFIG_SUBDIRS(lib lib/reLyX)
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 \