]> git.lyx.org Git - lyx.git/blobdiff - config/configure.ac
fix inset insertion woes
[lyx.git] / config / configure.ac
index 96eba2f6ce72ec1b6669b1d95f4f45c9fc5fcaf0..39aacc85b067aa4d679ab7ec4a9aee7f8969a8b0 100644 (file)
@@ -1,6 +1,6 @@
 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])
@@ -8,7 +8,7 @@ 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
@@ -57,8 +57,6 @@ AC_AIX
 ### 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
@@ -147,10 +145,6 @@ if test -n "$GXX" ; then
 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
@@ -160,7 +154,7 @@ case "$lyx_use_frontend" in
   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"
@@ -175,27 +169,29 @@ case "$lyx_use_frontend" in
        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"
     FRONTEND_GUILIB="qt2/*.lo qt2/ui/*.lo qt2/moc/*.lo qt2/ui/moc/*.lo"
     FRONTEND_LDFLAGS="\$(QT_LDFLAGS)"
     FRONTEND_INCLUDES="-I\${srcdir}/qt2 \$(QT_INCLUDES)"
-    FRONTEND_LIBS="\$(QT_LIB)";;
+    FRONTEND_LIBS="\$(QT_LIB)"
+    FRONTEND_INFO="    Qt version:                   ${QT_VERSION}\n"
+    ;;
   *)
     LYX_ERROR(Unknown frontend $lyx_use_frontend);;
 esac
@@ -246,6 +242,7 @@ AC_CHECK_FUNCS(snprintf vsnprintf)
 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
@@ -256,14 +253,12 @@ AC_CHECK_FUNCS(memmove memset strchr putenv setenv mkfifo mkstemp mktemp)
 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}\"\`"`
@@ -283,6 +278,77 @@ ${FRONTEND_INFO}\
 
 AC_SUBST(VERSION_INFO)
 
+## 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)
 AC_CONFIG_FILES([Makefile \
@@ -293,11 +359,13 @@ AC_CONFIG_FILES([Makefile \
        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 \