]> git.lyx.org Git - lyx.git/blobdiff - configure.ac
Slovak UserGuide.lyx: use the same layout as the other UserGuides, remove references...
[lyx.git] / configure.ac
index 9617e4f0e689f3a59ca888e64bdaee614ceffaba..3fadab088d4d697ce069423b205fe2b9b2b8d9f3 100644 (file)
@@ -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_INIT(LyX,1.6.0rc3,[lyx-devel@lists.lyx.org],[lyx])
+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
@@ -390,11 +390,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 +484,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"