small tweaks

[lyx.git] / config / configure.in

diff --git a/config/configure.in b/config/configure.in
index 22faf1dae847e2061b9d6e648431a4e407d00bf5..88316514a94cb3004fd3b698bb521c043121bbd6 100644 (file)
--- a/config/configure.in
+++ b/config/configure.in
@@ -6,6 +6,7 @@ AM_CONFIG_HEADER(src/config.h)
 dnl This is a trick to make autoheader do the right thing
 dnl AM_CONFIG_HEADER(src/config.h)
 AC_CONFIG_AUX_DIR(config)
+AM_MAINTAINER_MODE
 
 PACKAGE=lyx${program_suffix}
 VERSION="1.4.0cvs"
@@ -131,8 +132,14 @@ 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.
@@ -155,14 +162,7 @@ case "$lyx_use_frontend" in
         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"
        ;;
@@ -255,10 +255,6 @@ 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
@@ -279,8 +275,8 @@ ${FRONTEND_INFO}\
 
 
 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)