X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=configure.ac;h=c2d5984e6a9101e6b935c8be85e02527d041f2c8;hb=e977a3e509c95d9460c2523988cf994b1941b543;hp=978babc5726585c70c237453d9c421c0b7982559;hpb=0328dd98ca7a144d428e1575ee7194603ffd99f4;p=lyx.git

diff --git a/configure.ac b/configure.ac
index 978babc572..c2d5984e6a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,6 @@
 dnl Process with autoconf to generate configure script   -*- sh -*-
 
-AC_INIT(LyX,1.4.0svn,[lyx-devel@lists.lyx.org],[lyx])
+AC_INIT(LyX,1.5.0svn,[lyx-devel@lists.lyx.org],[lyx])
 AC_PREREQ(2.52)
 AC_CONFIG_SRCDIR(src/main.C)
 AC_CONFIG_HEADERS([src/config.h])
@@ -28,7 +28,7 @@ AM_INIT_AUTOMAKE([foreign dist-bzip2 tar-ustar no-define 1.9])
 PACKAGE=$save_PACKAGE
 
 ### Set the execute permissions of the various scripts correctly
-for file in config/install-sh config/mkinstalldirs lib/configure ; do
+for file in config/install-sh config/mkinstalldirs ; do
   chmod 755 ${srcdir}/${file}
 done
 
@@ -207,6 +207,25 @@ dnl qt build will fail without moc or uic
 	    LYX_ERROR([qt library not found !])
 	  fi
       ;;
+    qt4)
+	  QT4_DO_IT_ALL
+	  FRONTENDS_PROGS="$FRONTENDS_PROGS lyx-qt4\$(EXEEXT)"
+	  FRONTENDS_SUBDIRS="$FRONTENDS_SUBDIRS qt4"
+	  RPM_FRONTEND="qt4"
+	  FRONTEND_INFO="${FRONTEND_INFO}\
+  Qt 4 Frontend:\n\
+      Qt 4 version:\t\t${QT4_VERSION}\n"
+dnl qt 4 build will fail without moc or uic
+	  if test -z "$MOC4"; then
+	    LYX_ERROR([moc 4 binary not found !])
+	  fi
+	  if test -z "$UIC4"; then
+	    LYX_ERROR([uic 4 binary not found !])
+	  fi
+	  if test -z "$QT4_LIB"; then
+	    LYX_ERROR([qt 4 library not found !])
+	  fi
+      ;;
     *)
 	  LYX_ERROR(Unknown frontend '$frontend');;
   esac
@@ -375,40 +394,38 @@ int mkstemp(char*);
 #endif
 
 #ifdef __EMX__
-#include "support/os2_defines.h"
+#  include "support/os2_defines.h"
 #endif
 
 #if defined(HAVE_OSTREAM) && defined(HAVE_LOCALE) && defined(HAVE_SSTREAM)
-#define USE_BOOST_FORMAT 1
+#  define USE_BOOST_FORMAT 1
 #else
-#define USE_BOOST_FORMAT 0
+#  define USE_BOOST_FORMAT 0
 #endif
 
 #define BOOST_USER_CONFIG <config.h>
 
-#if defined(ENABLE_ASSERTIONS)
-#define BOOST_ENABLE_ASSERT_HANDLER 1
-#else
-#define BOOST_DISABLE_ASSERTS 1
+#if !defined(ENABLE_ASSERTIONS)
+#  define BOOST_DISABLE_ASSERTS 1
 #endif
+#define BOOST_ENABLE_ASSERT_HANDLER 1
 
 #define BOOST_DISABLE_THREADS 1
 #define BOOST_NO_WREGEX 1
 #define BOOST_NO_WSTRING 1
 
 #ifdef __CYGWIN__
-#define BOOST_POSIX 1
+#  define BOOST_POSIX 1
 #endif
 
 #if defined(HAVE_NEWAPIS_H)
-#define WANT_GETFILEATTRIBUTESEX_WRAPPER 1
+#  define WANT_GETFILEATTRIBUTESEX_WRAPPER 1
 #endif
 
 #endif
 ])
 
 ### Finish the work.
-AC_CONFIG_SUBDIRS(lib)
 AC_CONFIG_FILES([Makefile  m4/Makefile \
        boost/Makefile \
        boost/libs/Makefile \
@@ -439,6 +456,7 @@ AC_CONFIG_FILES([Makefile  m4/Makefile \
        src/support/tests/Makefile \
        src/frontends/Makefile \
        src/frontends/controllers/Makefile \
+       src/frontends/controllers/tests/Makefile \
        src/frontends/xforms/Makefile \
        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 \
@@ -450,7 +468,12 @@ AC_CONFIG_FILES([Makefile  m4/Makefile \
        src/frontends/qt2/moc/Makefile \
        src/frontends/qt2/ui/Makefile \
        src/frontends/qt2/ui/moc/Makefile \
+       src/frontends/qt4/Makefile \
+       src/frontends/qt4/moc/Makefile \
+       src/frontends/qt4/ui/Makefile \
 ])
+echo "Running $LYX_ABS_TOP_SRCDIR/lib/configure.py --with-version-suffix=\"$version_suffix\""
+(test -d lib || mkdir lib; cd lib && python $LYX_ABS_TOP_SRCDIR/lib/configure.py --with-version-suffix="$version_suffix")
 
 AC_OUTPUT
 # show version information