dnl Process with autoconf to generate configure script -*- sh -*-
-AC_INIT(lyx,1.3.0cvs,lyx-devel@lists.lyx.org)
+AC_INIT(lyx,1.3.0pre2,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.3.0pre2"
LYX_CHECK_VERSION
AC_CANONICAL_TARGET
### 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
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"
FRONTEND_GUILIB="xforms/*.lo xforms/forms/*.lo"
FRONTEND_INCLUDES="-I\$(srcdir)/xforms"
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}"
- ;;
+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
FRONTEND="qt2"
LYX_ERROR(Unknown frontend $lyx_use_frontend);;
esac
-# Do this here instead of in the LYX_USE_XFORMS_IMAGE_LOADER macro
-AM_CONDITIONAL(USE_BASIC_IMAGE_LOADER,
- test x$lyx_use_xforms_image_loader = xno)
-
### Check for xforms and xpm (only if X has been found).
if test "$have_x" = no ; then
LYX_ERROR(dnl
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
AC_LANG_POP(C)
dnl Until this is fixed in autoconf we provide our own version
-LYX_FUNC_SELECT_ARGTYPES
+AC_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
real_bindir=`eval "echo \`eval \"echo ${bindir}\"\`"`
real_datadir=`eval "echo \`eval \"echo ${datadir}/${PACKAGE}\"\`"`
## Some config.h stuff
-AH_VERBATIM([HAVE_STRCHR2],
-[
+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
-])
-AH_VERBATIM([HAVE_MEMMOVE2],
-[
#ifndef HAVE_MEMMOVE
# define memmove(a,b,c) bcopy(b,a,c)
#endif
-])
-AH_VERBATIM([HAVE_STRERROR2],
-[
#ifndef HAVE_STRERROR
#if defined(__cplusplus)
extern "C"
#endif
char * strerror(int n);
#endif
-])
-AH_VERBATIM([BROKEN_HEADERS2],
-[
#ifdef BROKEN_HEADERS
#include "broken_headers.h"
#endif
-])
-AH_VERBATIM([HAVE_MKSTEMP2],
-[
#ifdef HAVE_MKSTEMP
#ifndef HAVE_DECL_MKSTEMP
#if defined(__cplusplus)
int mkstemp(char*);
#endif
#endif
-])
-AH_VERBATIM([__EMX__2],
-[
#ifdef __EMX__
#include "support/os2_defines.h"
#endif
-])
-AH_VERBATIM([__CYGWIN__2],
-[
#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
])
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/mathed/Makefile \
projects / lyx.git / blobdiff