dnl Process with autoconf to generate configure script -*- sh -*-
-AC_INIT(lyx,1.3.0cvs,lyx-devel@lists.lyx.org)
-AC_PREREQ(2.53)
+AC_INIT(lyx,1.4.0cvs,lyx-devel@lists.lyx.org)
+AC_PREREQ(2.52)
AC_CONFIG_SRCDIR(src/main.C)
AM_CONFIG_HEADER([src/config.h])
AC_CONFIG_AUX_DIR(config)
PACKAGE=lyx${program_suffix}
-VERSION="1.3.0cvs"
+VERSION="1.4.0cvs"
LYX_CHECK_VERSION
+AM_MAINTAINER_MODE
AC_CANONICAL_TARGET
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
### check which frontend we want to use
LYX_USE_FRONTEND
-#old gnome stuff removed by Michael Koziarski 25-05-2002
-
### Check for a C++ compiler
LYX_PROG_CXX
### Some checks on what the C++ compiler can(not) do
#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 whether X is new enough to handle the input method stuff
-AC_CHECK_FUNCS(XOpenIM)
-
-
### check which frontend we want to use
#LYX_USE_FRONTEND
xforms)
LYX_PATH_XPM
LYX_PATH_XFORMS
- LYX_USE_XFORMS_IMAGE_LOADER
+ 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"
;;
- gnome)
- LYX_PATH_XPM
- LYX_PATH_XFORMS
- LYX_USE_XFORMS_IMAGE_LOADER
- PKG_CHECK_MODULES(GNOME_FRONTEND, gtkmm-2.0 libglademm-2.0)
- AC_SUBST(GNOME_FRONTEND_CFLAGS)
- AC_SUBST(GNOME_FRONTEND_LIBS)
-
- FRONTEND="xforms gnome"
- FRONTEND_GUILIB="gnome/*.lo"
- FRONTEND_LDFLAGS="${GNOME_FRONTEND_LIBS}"
- FRONTEND_INCLUDES="-I\${srcdir}/gnome -I\${srcdir}/xforms ${GNOME_FRONTEND_CFLAGS} "
- FRONTEND_LIBS="@XPM_LIB@ @XFORMS_LIB@ ${GNOME_FRONTEND_LIBS}"
- ;;
- qt2)
- QT2_DO_IT_ALL
+dnl gnome)
+dnl LYX_PATH_XPM
+dnl LYX_PATH_XFORMS
+dnl LYX_CHECK_XFORMS_IMAGE_LOADER
+dnl PKG_CHECK_MODULES(GNOME_FRONTEND, gtkmm-2.0 libglademm-2.0)
+dnl AC_SUBST(GNOME_FRONTEND_CFLAGS)
+dnl AC_SUBST(GNOME_FRONTEND_LIBS)
+
+dnl FRONTEND="xforms gnome"
+dnl FRONTEND_GUILIB="gnome/*.lo"
+dnl FRONTEND_LDFLAGS="${GNOME_FRONTEND_LIBS}"
+dnl FRONTEND_INCLUDES="-I\${srcdir}/gnome -I\${srcdir}/xforms ${GNOME_FRONTEND_CFLAGS} "
+dnl FRONTEND_LIBS="@XPM_LIB@ @XFORMS_LIB@ ${GNOME_FRONTEND_LIBS}"
+dnl ;;
+ 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="\$(QT2_LDFLAGS)"
- FRONTEND_INCLUDES="-I\${srcdir}/qt2 \$(QT2_INCLUDES)"
- FRONTEND_LIBS="\$(QT2_LIBS)";;
+ FRONTEND_LDFLAGS="\$(QT_LDFLAGS)"
+ FRONTEND_INCLUDES="-I\${srcdir}/qt2 \$(QT_INCLUDES)"
+ FRONTEND_LIBS="\$(QT_LIB)"
+ FRONTEND_INFO=" Qt version: ${QT_VERSION}\n"
+ ;;
*)
LYX_ERROR(Unknown frontend $lyx_use_frontend);;
esac
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)
+LYX_CHECK_DECL(mkstemp,[unistd.h stdlib.h])
dnl This is a slight hack: the tests generated by autoconf 2.52 do not
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_PUSH(C)
-AC_CHECK_FUNCS(memmove memset strchr putenv setenv mkfifo mkstemp mktemp)
+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
-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])
+AC_FUNC_SELECT_ARGTYPES
### Some information on what just happened
real_bindir=`eval "echo \`eval \"echo ${bindir}\"\`"`
AC_SUBST(VERSION_INFO)
+AC_SUBST(RPM_FRONTEND)
+AC_SUBST(RPM_FRONTEND_DEPS)
+
+## Some config.h stuff
+
+AH_TOP([
+/* -*- C++ -*- */
+/* This is the compilation configuration file for LyX. It was generated by
+ autoconfs configure. You might want to change some of the defaults if
+ something goes wrong during the compilation
+
+ * This file is part of
+ * ======================================================
+ *
+ * LyX, the High Level Word Processor
+ *
+ * Copyright 1995 Matthias Ettrich
+ * Copyright 1995-2001 The LyX Team.
+ *
+ *======================================================*/
+
+#ifndef _CONFIG_H
+#define _CONFIG_H
+])
+
+AH_BOTTOM([
+/************************************************************
+ ** You should not need to change anything beyond this point */
+
+#ifndef HAVE_STRCHR
+# define strchr(a,b) index(a,b)
+#endif
+
+#ifndef HAVE_MEMMOVE
+# define memmove(a,b,c) bcopy(b,a,c)
+#endif
+
+#ifndef HAVE_STRERROR
+#if defined(__cplusplus)
+extern "C"
+#endif
+char * strerror(int n);
+#endif
+
+#ifdef BROKEN_HEADERS
+#include "broken_headers.h"
+#endif
+
+#ifdef HAVE_MKSTEMP
+#ifndef HAVE_DECL_MKSTEMP
+#if defined(__cplusplus)
+extern "C"
+#endif
+int mkstemp(char*);
+#endif
+#endif
+
+#ifdef __EMX__
+#include "support/os2_defines.h"
+#endif
+
+#if defined(__CYGWIN__) || defined(__CYGWIN32__)
+#include "support/nt_defines.h"
+#endif
+
+#if defined(HAVE_OSTREAM) && defined(HAVE_LOCALE) && defined(HAVE_SSTREAM)
+#define USE_BOOST_FORMAT 1
+#else
+#define USE_BOOST_FORMAT 0
+#endif
+
+#endif
+])
### Finish the work.
AC_CONFIG_SUBDIRS(lib lib/reLyX)
boost/libs/signals/Makefile \
boost/libs/signals/src/Makefile \
config/Makefile \
+ development/Makefile \
development/lyx.spec \
lib/Makefile \
intl/Makefile \
po/Makefile.in \
sourcedoc/Doxyfile \
+ sourcedoc/Makefile \
src/Makefile \
src/version.C \
+ src/tex2lyx/Makefile \
src/mathed/Makefile \
src/graphics/Makefile \
src/insets/Makefile \
src/frontends/qt2/ui/moc/Makefile \
src/frontends/gnome/Makefile \
])
+
AC_OUTPUT
# show version information
echo
projects / lyx.git / blobdiff