Fix #613

[lyx.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 9aa611350e53ea36f6b420a0f498c44f0eb81cb7..65dd7c57a6a80cc84deb01af53999948035da369 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -159,6 +159,11 @@ esac
 
 ### check which frontend we want to use
 
+dnl if the gtk frontend has been specified, then xforms is needed too
+if echo $FRONTENDS | grep gtk | grep -v xforms ; then
+  FRONTENDS="$FRONTENDS xforms"
+fi
+
 dnl The code below is not in a macro, because this would cause big
 dnl problems with the AC_REQUIRE contained in QT_DO_IT_ALL.
 for frontend in $FRONTENDS ; do
@@ -187,10 +192,9 @@ for frontend in $FRONTENDS ; do
   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"
+         FRONTENDS_SUBDIRS="$FRONTENDS_SUBDIRS gtk"
          RPM_FRONTEND="gtk"
          RPM_FRONTEND_DEPS='gtkmm >= 2.2.0'
          GTKMM_VERSION=`pkg-config --modversion gtkmm-2.0`
@@ -267,7 +271,7 @@ if test $use_compression=true ; then
        AC_CHECK_HEADERS(zlib.h, use_compression=true, use_compression=false)
        AC_CHECK_LIB(z, gzopen,[use_compression=true;LIBS="$LIBS -lz"], use_compression=false)
        if test $use_compression = true ; then
-               AC_DEFINE(USE_COMRESSION, 1, [Define as 1 if you want to supprot compressed files.])
+               AC_DEFINE(USE_COMRESSION, 1, [Define as 1 if you want to support compressed files.])
                lyx_flags="$lyx_flags compression"
        fi
 fi
@@ -361,16 +365,14 @@ int mkstemp(char*);
 #include "support/os2_defines.h"
 #endif
 
-#if defined(__CYGWIN__) || defined(__CYGWIN32__)
-#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
 
+#define BOOST_USER_CONFIG <config.h>
+
 #if defined(ENABLE_ASSERTIONS)
 #define BOOST_ENABLE_ASSERT_HANDLER 1
 #else
@@ -386,7 +388,7 @@ int mkstemp(char*);
 
 ### Finish the work.
 AC_CONFIG_SUBDIRS(lib lib/reLyX)
-AC_CONFIG_FILES([Makefile \
+AC_CONFIG_FILES([Makefile  m4/Makefile \
        boost/Makefile \
        boost/libs/Makefile \
        boost/libs/filesystem/Makefile \
@@ -399,6 +401,7 @@ AC_CONFIG_FILES([Makefile \
        development/Makefile \
        development/lyx.spec \
        lib/Makefile \
+       lib/doc/Makefile \
        intl/Makefile \
        po/Makefile.in \
        sourcedoc/Doxyfile \
@@ -417,6 +420,7 @@ AC_CONFIG_FILES([Makefile \
        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/gimages/Makefile \
        src/frontends/gtk/glade/Makefile \
        src/frontends/qt2/Makefile \
        src/frontends/qt2/moc/Makefile \