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.3.0pre1"
+VERSION="1.4.0cvs"
LYX_CHECK_VERSION
AC_CANONICAL_SYSTEM
#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
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"
;;
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)"
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 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
AC_SUBST(VERSION_INFO)
+AC_SUBST(RPM_FRONTEND)
+AC_SUBST(RPM_FRONTEND_DEPS)
### Finish the work.
AC_CONFIG_SUBDIRS(lib lib/reLyX)
sourcedoc/Makefile \
src/Makefile \
src/version.C \
+ src/tex2lyx/Makefile \
src/mathed/Makefile \
src/graphics/Makefile \
src/insets/Makefile \