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 1435eb925ba1229e023127e6da4e649915aaf95e..b76bb7f1292bbd661c3bf88b27a0d021b941d540 100644 (file)
--- a/config/configure.ac
+++ b/config/configure.ac
@@ -150,7 +150,6 @@ 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
@@ -189,17 +188,23 @@ case "$lyx_use_frontend" in
     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
+  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
@@ -283,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 \