X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=configure.ac;h=9aa611350e53ea36f6b420a0f498c44f0eb81cb7;hb=d8f81752eb871b6c0fe6ee681b5dde7536df3374;hp=edb223f2551ad204464703816b21e96d2412f131;hpb=02aa32e2eb36ba988af300d93d83b10b9e8f8ccd;p=lyx.git

diff --git a/configure.ac b/configure.ac
index edb223f255..9aa611350e 100644
--- 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
@@ -167,14 +165,14 @@ 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'
 	  FRONTEND_INFO="${FRONTEND_INFO}\
   XForms Frontend:\n\
-      libXpm version:               ${XPM_VERSION}\n\
-      libforms version:             ${XFORMS_VERSION}\n"
+      libXpm version:\t\t${XPM_VERSION}\n\
+      libforms version:\t\t${XFORMS_VERSION}\n"
 	  ;;
   dnl   gnome)
   dnl     XFORMS_DO_IT_ALL
@@ -188,18 +186,33 @@ 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="${FRONTEND_INFO}\
+  GTK Frontend:\n\
+    libgtkmm version:\t\t${GTKMM_VERSION}\n\
+    libglademm version:\t\t${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'
 	  FRONTEND_INFO="${FRONTEND_INFO}\
   Qt Frontend:\n\
-      Qt version:                   ${QT_VERSION}\n"
+      Qt version:\t\t${QT_VERSION}\n"
       ;;
     *)
-	  LYX_ERROR(Unknown frontend $lyx_use_frontend);;
+	  LYX_ERROR(Unknown frontend '$frontend');;
   esac
 done
 
@@ -297,19 +310,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 +371,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
 
@@ -374,6 +389,8 @@ AC_CONFIG_SUBDIRS(lib lib/reLyX)
 AC_CONFIG_FILES([Makefile \
        boost/Makefile \
        boost/libs/Makefile \
+       boost/libs/filesystem/Makefile \
+       boost/libs/filesystem/src/Makefile \
        boost/libs/regex/Makefile \
        boost/libs/regex/src/Makefile \
        boost/libs/signals/Makefile \
@@ -387,7 +404,7 @@ AC_CONFIG_FILES([Makefile \
        sourcedoc/Doxyfile \
        sourcedoc/Makefile \
        src/Makefile \
-       src/version.C \
+       src/version.C-tmp:src/version.C.in \
        src/tex2lyx/Makefile \
        src/mathed/Makefile \
        src/graphics/Makefile \
@@ -396,9 +413,11 @@ AC_CONFIG_FILES([Makefile \
        src/frontends/Makefile \
        src/frontends/controllers/Makefile \
        src/frontends/xforms/Makefile \
-       src/frontends/xforms/lyx_forms.h \
-       src/frontends/xforms/lyx_xpm.h \
+       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 \