X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=configure.ac;h=afc3de94e77521a2e37dd469697352c2f298c2f9;hb=3ed174cc03b9ca14f1c8e09dd990d9eb0b4461b4;hp=5f5d562f79fc74e0b19b4dd84f9695fe4aed5aad;hpb=8fcbba8596f62fdbb1a87b1ee3ba5af1f1571487;p=lyx.git

diff --git a/configure.ac b/configure.ac
index 5f5d562f79..afc3de94e7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3,7 +3,7 @@ dnl Process with autoconf to generate configure script   -*- sh -*-
 AC_INIT(LyX,2.2.0dev,[lyx-devel@lists.lyx.org],[lyx])
 AC_PRESERVE_HELP_ORDER
 # Use ISO format only. The frontend needs to parse this
-AC_SUBST(LYX_DATE, ["2014-04-14"])
+AC_SUBST(LYX_DATE, ["2015-11-27"])
 AC_PREREQ(2.60)
 AC_CONFIG_SRCDIR(src/main.cpp)
 AC_CONFIG_HEADERS([config.h])
@@ -63,7 +63,13 @@ for file in config/install-sh ; do
   chmod 755 ${srcdir}/${file}
 done
 
-AM_PATH_PYTHON(2.4.0,, :)
+# Find a suitable python interpreter
+LYX_PATH_PYTHON23([2.7.0], [3.3.0])
+# do the usual python setup stuff
+AM_PATH_PYTHON
+
+# Tools for creating libraries (note that we do not use libtool)
+m4_ifdef([AM_PROG_AR], [AM_PROG_AR]) dnl AM_PROG_AR requires automake 1.12
 AC_PROG_RANLIB
 
 ### Check for a C++ compiler
@@ -164,13 +170,13 @@ if echo $prefix |grep ' ' >/dev/null 2>/dev/null ; then
 fi
 
 ### Setup po directory
-AM_PO_SUBDIRS
 AM_NLS
 if test $USE_NLS = "yes" ; then
   AC_DEFINE(ENABLE_NLS, 1,
     [Define to 1 if translation of program messages to the user's native language
    is requested.])dnl'
 fi
+AM_PO_SUBDIRS
 
 # some standard header files
 AC_HEADER_MAJOR
@@ -207,7 +213,7 @@ save_LIBS="$LIBS"
 LIBS=
 AC_CHECK_FUNCS(fcntl,
   [AC_SEARCH_LIBS([gethostbyname], [nsl])
-   AC_SEARCH_LIBS([socket], [socket], [],
+   AC_SEARCH_LIBS([socket], [socket network], [],
      [AC_CHECK_LIB([socket], [socket], [LIBS="-lsocket -lnsl $LIBS"],
 		[], [-lnsl])])],
   [lyx_client_subdir=false])
@@ -270,6 +276,10 @@ AH_BOTTOM([
 /************************************************************
  ** You should not need to change anything beyond this point */
 
+#if __cplusplus >= 201103L || defined(__GXX_EXPERIMENTAL_CXX0X__)
+#define LYX_USE_CXX11
+#endif
+
 #ifndef HAVE_STRERROR
 #if defined(__cplusplus)
 extern "C"
@@ -339,6 +349,7 @@ AC_DEFINE_UNQUOTED([LYX_RELEASE_PATCH],$lyx_patch,[Patch version number])
 
 AC_CONFIG_FILES([Makefile \
       lyx.1:lyx.1in \
+      autotests/Makefile \
       boost/Makefile \
       config/Makefile \
       development/Makefile \