fix some document dialog ui and add some FIXMEs

[lyx.git] / config / configure.ac

diff --git a/config/configure.ac b/config/configure.ac
index 3eefd1d08bc3853e09733d300e2ba24704de8359..b76bb7f1292bbd661c3bf88b27a0d021b941d540 100644 (file)
--- a/config/configure.ac
+++ b/config/configure.ac
@@ -1,7 +1,7 @@
 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_PREREQ(2.52)
 AC_CONFIG_SRCDIR(src/main.C)
 AM_CONFIG_HEADER([src/config.h])
 
@@ -12,7 +12,6 @@ VERSION="1.3.0cvs"
 LYX_CHECK_VERSION
 
 AC_CANONICAL_TARGET
-# AC_VALIDATE_CACHE_SYSTEM_TYPE
 
 LYX_VERSION_SUFFIX
 
@@ -55,9 +54,6 @@ AC_PROG_CC
 AC_ISC_POSIX
 AC_AIX
 
-### Check for program extensions (.exe or nothing)
-# AC_EXEEXT
-
 ### check which frontend we want to use
 LYX_USE_FRONTEND
 
@@ -155,16 +151,15 @@ CPPFLAGS="$CPPFLAGS $X_CFLAGS"
 AC_CHECK_FUNCS(XOpenIM)
 
 ### check which frontend we want to use
-# We have to check for xforms anyway
-LYX_PATH_XPM
-LYX_PATH_XFORMS
 
 #LYX_USE_FRONTEND
 dnl The code below is not in a macro, because this would cause big
 dnl problems with the AC_REQUIRE contained in KDE_DO_IT_ALL.
 case "$lyx_use_frontend" in
   xforms)
-  # for now don't set it for xforms as this is always entered
+       LYX_PATH_XPM
+       LYX_PATH_XFORMS
+       LYX_USE_XFORMS_IMAGE_LOADER
        FRONTEND="xforms"
        FRONTEND_GUILIB="xforms/*.lo xforms/forms/*.lo"
        FRONTEND_INCLUDES="-I\$(srcdir)/xforms"
@@ -180,6 +175,9 @@ case "$lyx_use_frontend" in
     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)
@@ -188,18 +186,25 @@ case "$lyx_use_frontend" in
     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
+    FRONTEND_LIBS="@XPM_LIB@ @XFORMS_LIB@ ${GNOME_FRONTEND_LIBS}"
+       ;;
+  qt)
+    QT_DO_IT_ALL
     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
 
+# 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
@@ -208,14 +213,9 @@ LYX_ERROR(dnl
    the development tools.])
 fi
 
-### Check whether the xforms library has a viable image loader
-### For now, run this test always so config.h is unchanged by a change in
-### frontend
-LYX_USE_XFORMS_IMAGE_LOADER
-
 ### Setup GNU gettext
 dnl GNU gettext is written in C
-AC_LANG(C)
+AC_LANG_PUSH(C)
 # Some tests that may be useful for gettext
 AC_C_CONST
 AC_C_INLINE
@@ -228,7 +228,7 @@ esac
 
 AC_SUBST(LINGUAS)
 
-AC_LANG(C++)
+AC_LANG_POP(C)
 
 # some standard header files
 AC_HEADER_DIRENT
@@ -256,9 +256,9 @@ 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(C)
+AC_LANG_PUSH(C)
 AC_CHECK_FUNCS(memmove memset strchr putenv setenv mkfifo mkstemp mktemp)
-AC_LANG(C++)
+AC_LANG_POP(C)
 
 dnl Until this is fixed in autoconf we provide our own version
 LYX_FUNC_SELECT_ARGTYPES
@@ -288,6 +288,71 @@ ${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
+   autoconf's 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
+
+#endif
+])
+
 ### Finish the work.
 AC_CONFIG_SUBDIRS(lib lib/reLyX)
 AC_CONFIG_FILES([Makefile \