fix wheel handling for xforms

[lyx.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index b4fefe0a7c6f0fd8f8c4e893c64bce140c17e173..57477d899e338e854cb1f624403011bc157ae436 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -74,19 +74,6 @@ 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]),,
@@ -177,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:               ${XPM_VERSION}\n\
-      libforms version:             ${XFORMS_VERSION}\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
@@ -200,16 +188,20 @@ 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`
          LIBGLADEMM_VERSION=`pkg-config --modversion libglademm-2.0`
-         FRONTEND_INFO="    libgtkmm version:             ${GTKMM_VERSION}\n\
-    libglademm version:           ${LIBGLADEMM_VERSION}\n"
+         FRONTEND_INFO="${FRONTEND_INFO}\
+  GTK Frontend:\n\
+    libgtkmm version:\t\t${GTKMM_VERSION}\n\
+    libglademm version:\t\t${LIBGLADEMM_VERSION}\n"
+         gtk_done=1
          ;;
 
     qt)
@@ -220,7 +212,7 @@ for frontend in $FRONTENDS ; do
          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 '$frontend');;
@@ -278,7 +270,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
@@ -372,16 +364,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
@@ -397,9 +387,11 @@ 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 \
+       boost/libs/filesystem/src/Makefile \
        boost/libs/regex/Makefile \
        boost/libs/regex/src/Makefile \
        boost/libs/signals/Makefile \
@@ -408,6 +400,7 @@ AC_CONFIG_FILES([Makefile \
        development/Makefile \
        development/lyx.spec \
        lib/Makefile \
+       lib/doc/Makefile \
        intl/Makefile \
        po/Makefile.in \
        sourcedoc/Doxyfile \
@@ -426,6 +419,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 \