small tweaks

[lyx.git] / config / configure.ac

diff --git a/config/configure.ac b/config/configure.ac
index e94f30f46e8ff0372b68cf89a1204f2fe7acfc6f..24bdddad2de21a725f6def57f08fe4d990246dd3 100644 (file)
--- a/config/configure.ac
+++ b/config/configure.ac
@@ -6,6 +6,7 @@ AC_CONFIG_SRCDIR(src/main.C)
 AM_CONFIG_HEADER([src/config.h])
 
 AC_CONFIG_AUX_DIR(config)
+AM_MAINTAINER_MODE
 
 PACKAGE=lyx${program_suffix}
 VERSION="1.4.0cvs"
@@ -128,8 +129,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.
@@ -152,14 +159,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"
        ;;
@@ -248,13 +248,8 @@ AC_LANG_PUSH(C)
 AC_CHECK_FUNCS(memmove memset strchr mkfifo mkstemp mktemp)
 AC_LANG_POP(C)
 
-dnl Until this is fixed in autoconf we provide our own version
 AC_FUNC_SELECT_ARGTYPES
 
-dnl check whether we have to work around solaris broken putenv()
-LYX_FUNC_PUTENV_ARGTYPE
-
-
 ### Some information on what just happened
 real_bindir=`eval "echo \`eval \"echo ${bindir}\"\`"`
 real_datadir=`eval "echo \`eval \"echo ${datadir}/${PACKAGE}\"\`"`
@@ -273,6 +268,8 @@ ${FRONTEND_INFO}\
 
 
 AC_SUBST(VERSION_INFO)
+AC_SUBST(RPM_FRONTEND)
+AC_SUBST(RPM_FRONTEND_DEPS)
 
 ## Some config.h stuff
 
@@ -380,9 +377,6 @@ AC_CONFIG_FILES([Makefile \
        src/frontends/gnome/Makefile \
 ])
 
-AC_SUBST(RPM_FRONTEND, 'xforms')
-AC_SUBST(RPM_FRONTEND_DEPS, 'libforms >= 1.0')
-
 AC_OUTPUT
 # show version information
 echo