fix inset insertion woes

[lyx.git] / config / configure.ac

diff --git a/config/configure.ac b/config/configure.ac
index b76bb7f1292bbd661c3bf88b27a0d021b941d540..39aacc85b067aa4d679ab7ec4a9aee7f8969a8b0 100644 (file)
--- a/config/configure.ac
+++ b/config/configure.ac
@@ -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,9 +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
@@ -159,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"
@@ -174,20 +169,20 @@ 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"
@@ -201,10 +196,6 @@ case "$lyx_use_frontend" in
     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
@@ -251,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
@@ -261,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}\"\`"`
@@ -293,7 +283,7 @@ AC_SUBST(VERSION_INFO)
 AH_TOP([
 /* -*- C++ -*- */
 /* This is the compilation configuration file for LyX. It was generated by
-   autoconf's configure. You might want to change some of the defaults if
+   autoconfs configure. You might want to change some of the defaults if
    something goes wrong during the compilation
 
    * This file is part of
@@ -350,6 +340,12 @@ int mkstemp(char*);
 #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
 ])
 
@@ -363,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 \