X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=configure.ac;h=fa631bb063f1987ec85b702ac59c0a899769344c;hb=0cfc9133bb381503f3fb48f824f3ad1e32b4f960;hp=639066417dd315ab59e5ac1a05b082128db85c75;hpb=08265598c53d40128b71382b3760225c11a83bde;p=lyx.git

diff --git a/configure.ac b/configure.ac
index 639066417d..fa631bb063 100644
--- a/configure.ac
+++ b/configure.ac
@@ -11,6 +11,10 @@ PACKAGE=lyx${program_suffix}
 VERSION="1.4.0cvs"
 LYX_CHECK_VERSION
 
+dnl default maintainer mode to true for development versions
+if test "${enable_maintainer_mode+set}" != set; then
+  enable_maintainer_mode=$lyx_devel_version
+fi
 AM_MAINTAINER_MODE
 AC_CANONICAL_TARGET
 
@@ -74,19 +78,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]),,
@@ -172,6 +163,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
@@ -181,7 +177,6 @@ for frontend in $FRONTENDS ; do
 	  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:\t\t${XPM_VERSION}\n\
@@ -200,14 +195,12 @@ 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)
+	  PKG_CHECK_MODULES(GTK_FRONTEND, gtkmm-2.4 libglademm-2.4)
 	  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`
-	  LIBGLADEMM_VERSION=`pkg-config --modversion libglademm-2.0`
+	  GTKMM_VERSION=`pkg-config --modversion gtkmm-2.4`
+	  LIBGLADEMM_VERSION=`pkg-config --modversion libglademm-2.4`
 	  FRONTEND_INFO="${FRONTEND_INFO}\
   GTK Frontend:\n\
     libgtkmm version:\t\t${GTKMM_VERSION}\n\
@@ -219,10 +212,16 @@ for frontend in $FRONTENDS ; do
 	  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:\t\t${QT_VERSION}\n"
+dnl qt build will fail without moc or uic
+	  if test -z "$MOC"; then
+	    LYX_ERROR([moc binary not found !])
+	  fi
+	  if test -z "$UIC"; then
+	    LYX_ERROR([uic binary not found !])
+	  fi
       ;;
     *)
 	  LYX_ERROR(Unknown frontend '$frontend');;
@@ -280,7 +279,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
@@ -317,7 +316,6 @@ ${FRONTEND_INFO}\
 
 AC_SUBST(VERSION_INFO)
 AC_SUBST(RPM_FRONTEND)
-AC_SUBST(RPM_FRONTEND_DEPS)
 
 ## Some config.h stuff
 
@@ -374,16 +372,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
@@ -399,9 +395,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 \
@@ -410,10 +408,12 @@ AC_CONFIG_FILES([Makefile \
        development/Makefile \
        development/lyx.spec \
        lib/Makefile \
+       lib/doc/Makefile \
        intl/Makefile \
        po/Makefile.in \
        sourcedoc/Doxyfile \
        sourcedoc/Makefile \
+       src/client/Makefile \
        src/Makefile \
        src/version.C-tmp:src/version.C.in \
        src/tex2lyx/Makefile \
@@ -428,6 +428,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 \