* temporary fix for the crash of the pixmap cache on Mac with Qt 4.4.

[lyx.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 9617e4f0e689f3a59ca888e64bdaee614ceffaba..fb7cca757364223456c5cff18848ea0b4d553172 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,7 +1,7 @@
 dnl Process with autoconf to generate configure script   -*- sh -*-
 
 AC_INIT(LyX,1.6.0svn,[lyx-devel@lists.lyx.org],[lyx])
-AC_SUBST(LYX_DATE, ["Fri, Aug 1, 2008"])
+AC_SUBST(LYX_DATE, ["Fri, Sep 26, 2008"])
 AC_PREREQ(2.52)
 AC_CONFIG_SRCDIR(src/main.cpp)
 AC_CONFIG_HEADERS([config.h])
@@ -38,7 +38,7 @@ dnl AC_PROG_MAKE_SET
 dnl AC_PROG_INSTALL
 
 # Check for installed python
-AM_PATH_PYTHON(2.3,, :)
+AM_PATH_PYTHON(2.3.4,, :)
 
 # Work around a problem in automake 1.4: when invoking install-strip,
 # INSTALL_PROGRAM is changed to 'install -s', and since
@@ -164,18 +164,6 @@ AC_CHECK_HEADERS(zlib.h,
  [LYX_LIB_ERROR(zlib.h,zlib)])
 
 
-### Check for X libraries
-AC_PATH_XTRA
-case $have_x in
-  yes) LIBS="$X_PRE_LIBS $LIBS $X_LIBS -lX11 $X_EXTRA_LIBS"
-       CPPFLAGS="$CPPFLAGS $X_CFLAGS";;
-  no) LYX_ERROR(dnl
-[Cannot find X window libraries and/or headers. Check your installation.
-  If you use a Linux system, check that you have installed
-  the development tools.]);;
-  disable) ;;
-esac
-
 ### check which frontend we want to use
 
 dnl The code below is not in a macro, because this would cause big
@@ -390,11 +378,6 @@ char * strerror(int n);
 ])
 
 
-AC_ARG_WITH(qmake,
-       AC_HELP_STRING([--with-qmake],
-               [Use qmake instead of automake to generate Makefiles]),,
-       [with_qmake=no])
-
 AC_ARG_ENABLE(monolithic-boost,
   AC_HELP_STRING([--enable-monolithic-boost],
                [Use monolithic boost compilations]),,
@@ -489,30 +472,6 @@ AC_CONFIG_FILES([Makefile \
 
 AC_OUTPUT
 
-if test x$with_qmake = xyes ; then
-       echo "CONFIGURE WITH QMAKE ONLY"
-       if test x$srcdir = x ; then
-               echo "ONLY FOR OUT-OF-TREE-BUILDS POSSIBLE"
-       else
-               rm boost/Makefile
-               rm src/client/Makefile
-               rm src/Makefile
-               rm src/tex2lyx/Makefile
-               rm src/support/Makefile
-               rm src/frontends/Makefile
-               rm src/frontends/qt4/Makefile
-               rm -rf boost/.deps
-               rm -rf src/client/.deps
-               rm -rf src/.deps
-               rm -rf src/tex2lyx/.deps
-               rm -rf src/support/.deps
-               rm -rf src/frontends/.deps
-               rm -rf src/frontends/qt4/.deps
-               ${srcdir}/development/qmake/doit
-       fi
-fi
-
-
 # show version information
 echo
 printf "$VERSION_INFO"