Use the dispatch_result wrapper class DispatchResult to remove

[lyx.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 1ceca98c21fb7a11146f2bc3dfc672b79ab6f703..b4fefe0a7c6f0fd8f8c4e893c64bce140c17e173 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -66,8 +66,6 @@ dnl we do not need that currently (and probably all our supported
 dnl compiler allow that)
 dnl LYX_CXX_PARTIAL
 LYX_CXX_EXPLICIT
-LYX_CXX_STL_STRING
-LYX_CXX_GOOD_STD_STRING
 LYX_CXX_CHEADERS
 LYX_CXX_GLOBAL_CSTD
 LYX_STD_COUNT
@@ -76,6 +74,19 @@ dnl LYX_CXX_RTTI
 AC_CHECK_HEADERS(ostream istream sstream locale limits ios)
 LYX_CXX_STL_MODERN_STREAMS
 
+###
+AC_ARG_WITH(included-string,
+    AC_HELP_STRING([--with-included-string],[use std::string through namespace lyx]),
+       [lyx_cv_with_included_string=$withval
+       AC_MSG_RESULT([$with_included_string])],
+       [AC_CACHE_CHECK([],lyx_cv_with_included_string,[lyx_cv_with_included_string=no])])
+if test x$lyx_cv_with_included_string = xyes ; then
+    AC_DEFINE(USE_INCLUDED_STRING, 1,
+       [Define to use std::string through namespace lyx.])
+    lyx_flags="$lyx_flags included-string"
+fi
+
+
 ### and now some special lyx flags.
 AC_ARG_ENABLE(assertions,
   AC_HELP_STRING([--enable-assertions],[add runtime sanity checks in the program]),,
@@ -167,7 +178,7 @@ for frontend in $FRONTENDS ; do
   case "$frontend" in
     xforms)
          XFORMS_DO_IT_ALL
-         FRONTENDS_PROGS="$FRONTENDS_PROGS lyx-xforms"
+         FRONTENDS_PROGS="$FRONTENDS_PROGS lyx-xforms\$(EXEEXT)"
          FRONTENDS_SUBDIRS="$FRONTENDS_SUBDIRS xforms"
          RPM_FRONTEND="xforms"
          RPM_FRONTEND_DEPS='libforms >= 1.0'
@@ -188,9 +199,22 @@ for frontend in $FRONTENDS ; do
   dnl     FRONTEND_INCLUDES="${GNOME_FRONTEND_CFLAGS}"
   dnl     FRONTEND_LIBS="@XPM_LIB@ @XFORMS_LIB@ ${GNOME_FRONTEND_LIBS}"
   dnl  ;;
+    gtk)
+         XFORMS_DO_IT_ALL
+         PKG_CHECK_MODULES(GTK_FRONTEND, gtkmm-2.0 libglademm-2.0)
+         FRONTENDS_PROGS="$FRONTENDS_PROGS lyx-gtk\$(EXEEXT)"
+         FRONTENDS_SUBDIRS="$FRONTENDS_SUBDIRS xforms gtk"
+         RPM_FRONTEND="gtk"
+         RPM_FRONTEND_DEPS='gtkmm >= 2.2.0'
+         GTKMM_VERSION=`pkg-config --modversion gtkmm-2.0`
+         LIBGLADEMM_VERSION=`pkg-config --modversion libglademm-2.0`
+         FRONTEND_INFO="    libgtkmm version:             ${GTKMM_VERSION}\n\
+    libglademm version:           ${LIBGLADEMM_VERSION}\n"
+         ;;
+
     qt)
          QT_DO_IT_ALL
-         FRONTENDS_PROGS="$FRONTENDS_PROGS lyx-qt"
+         FRONTENDS_PROGS="$FRONTENDS_PROGS lyx-qt\$(EXEEXT)"
          FRONTENDS_SUBDIRS="$FRONTENDS_SUBDIRS qt2"
          RPM_FRONTEND="qt"
          RPM_FRONTEND_DEPS='qt >= 2.2.1'
@@ -199,7 +223,7 @@ for frontend in $FRONTENDS ; do
       Qt version:                   ${QT_VERSION}\n"
       ;;
     *)
-         LYX_ERROR(Unknown frontend $lyx_use_frontend);;
+         LYX_ERROR(Unknown frontend '$frontend');;
   esac
 done
 
@@ -297,19 +321,16 @@ AC_SUBST(RPM_FRONTEND_DEPS)
 
 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.
-   *
-   *======================================================*/
+/*
+ * \file config.h
+ * This file is part of LyX, the document processor.
+ * Licence details can be found in the file COPYING.
+ *
+ * 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.
+ */
 
 #ifndef _CONFIG_H
 #define _CONFIG_H
@@ -361,8 +382,13 @@ int mkstemp(char*);
 #define USE_BOOST_FORMAT 0
 #endif
 
+#if defined(ENABLE_ASSERTIONS)
+#define BOOST_ENABLE_ASSERT_HANDLER 1
+#else
+#define BOOST_DISABLE_ASSERTS 1
+#endif
+
 #define BOOST_DISABLE_THREADS 1
-#define BOOST_NO_EXCEPTIONS 1
 #define BOOST_NO_WREGEX 1
 #define BOOST_NO_WSTRING 1
 
@@ -399,6 +425,8 @@ AC_CONFIG_FILES([Makefile \
        src/frontends/xforms/lyx_forms.h-tmp:src/frontends/xforms/lyx_forms.h.in \
        src/frontends/xforms/lyx_xpm.h-tmp:src/frontends/xforms/lyx_xpm.h.in \
        src/frontends/xforms/forms/Makefile \
+       src/frontends/gtk/Makefile \
+       src/frontends/gtk/glade/Makefile \
        src/frontends/qt2/Makefile \
        src/frontends/qt2/moc/Makefile \
        src/frontends/qt2/ui/Makefile \