move some selection related stuff over to textcursor.C

[lyx.git] / config / configure.in

diff --git a/config/configure.in b/config/configure.in
index 594230516713a343ec67d5bae0e3f8cec83044b2..0a4782547687b0c67e240823d29675036e203aa3 100644 (file)
--- a/config/configure.in
+++ b/config/configure.in
@@ -11,6 +11,7 @@ PACKAGE=lyx${program_suffix}
 VERSION="1.4.0cvs"
 LYX_CHECK_VERSION
 
+AM_MAINTAINER_MODE
 AC_CANONICAL_SYSTEM
 
 LYX_VERSION_SUFFIX
@@ -19,7 +20,7 @@ AM_INIT_AUTOMAKE($lyxname, $VERSION)
 
 # 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
@@ -131,21 +132,19 @@ AC_LIBTOOL_WIN32_DLL
 #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 which frontend we want to use
@@ -159,16 +158,11 @@ case "$lyx_use_frontend" in
        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"
        ;;
@@ -190,6 +184,8 @@ dnl     FRONTEND_INCLUDES="-I\${srcdir}/gnome -I\${srcdir}/xforms ${GNOME_FRONTE
 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="\$(QT_LDFLAGS)"
@@ -253,16 +249,12 @@ 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_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
@@ -283,6 +275,8 @@ ${FRONTEND_INFO}\
 
 
 AC_SUBST(VERSION_INFO)
+AC_SUBST(RPM_FRONTEND)
+AC_SUBST(RPM_FRONTEND_DEPS)
 
 ### Finish the work.
 AC_CONFIG_SUBDIRS(lib lib/reLyX)
@@ -311,6 +305,8 @@ AC_OUTPUT([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 \