fix portability problem with OS X

[lyx.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 2e37e68ec2e07a1c8903e803785ede8d3f5b5800..57477d899e338e854cb1f624403011bc157ae436 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -164,15 +164,16 @@ dnl problems with the AC_REQUIRE contained in QT_DO_IT_ALL.
 for frontend in $FRONTENDS ; do
   case "$frontend" in
     xforms)
-         XFORMS_DO_IT_ALL
+         [ x$gtk_done = x1 ] || XFORMS_DO_IT_ALL
          FRONTENDS_PROGS="$FRONTENDS_PROGS lyx-xforms\$(EXEEXT)"
-         FRONTENDS_SUBDIRS="$FRONTENDS_SUBDIRS xforms"
+         [ x$gtk_done = x1 ] || FRONTENDS_SUBDIRS="$FRONTENDS_SUBDIRS xforms"
          RPM_FRONTEND="xforms"
          RPM_FRONTEND_DEPS='libforms >= 1.0'
          FRONTEND_INFO="${FRONTEND_INFO}\
   XForms Frontend:\n\
       libXpm version:\t\t${XPM_VERSION}\n\
       libforms version:\t\t${XFORMS_VERSION}\n"
+         xforms_done=1
          ;;
   dnl   gnome)
   dnl     XFORMS_DO_IT_ALL
@@ -187,10 +188,11 @@ for frontend in $FRONTENDS ; do
   dnl     FRONTEND_LIBS="@XPM_LIB@ @XFORMS_LIB@ ${GNOME_FRONTEND_LIBS}"
   dnl  ;;
     gtk)
-         XFORMS_DO_IT_ALL
+         [ x$xforms_done = x1 ] || 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"
+         [ x$xforms_done = x1 ] || FRONTENDS_SUBDIRS="$FRONTENDS_SUBDIRS xforms"
+         FRONTENDS_SUBDIRS="$FRONTENDS_SUBDIRS gtk"
          RPM_FRONTEND="gtk"
          RPM_FRONTEND_DEPS='gtkmm >= 2.2.0'
          GTKMM_VERSION=`pkg-config --modversion gtkmm-2.0`
@@ -199,6 +201,7 @@ for frontend in $FRONTENDS ; do
   GTK Frontend:\n\
     libgtkmm version:\t\t${GTKMM_VERSION}\n\
     libglademm version:\t\t${LIBGLADEMM_VERSION}\n"
+         gtk_done=1
          ;;
 
     qt)
@@ -361,10 +364,6 @@ 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
@@ -388,7 +387,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 \
@@ -401,6 +400,7 @@ AC_CONFIG_FILES([Makefile \
        development/Makefile \
        development/lyx.spec \
        lib/Makefile \
+       lib/doc/Makefile \
        intl/Makefile \
        po/Makefile.in \
        sourcedoc/Doxyfile \