Cmake export tests: Handle default output format 'pdf2' in manuals like 'default'

[lyx.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index b22dab092cc4a91b1fc6ff85392ef37bc3e12a9a..afc3de94e77521a2e37dd469697352c2f298c2f9 100644 (file)
--- 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,11 +63,27 @@ 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
+dnl We have to do weird tricks so that autoconf does not touch CXXFLAGS even
+dnl if it is not set. We do not use autoconf defaults.
+lyx_has_CXXFLAGS=${CXXFLAGS+yes}
+if ! test "$lyx_has_CXXFLAGS" = yes; then
+  dnl set to a dummy value so that AC_PROG_CXX does not try to set CXXFLAGS
+  CXXFLAGS=" "
+fi
 LYX_PROG_CXX
+if ! test "$lyx_has_CXXFLAGS" = yes; then
+  unset CXXFLAGS
+fi
 AC_LANG(C++)
 
 ### Objective-C compiler
@@ -82,12 +98,12 @@ test ! x"$lyx_ldflags" = x && LDFLAGS="$lyx_ldflags $LDFLAGS"
 ### Add extra directories to check for include files.
 LYX_WITH_DIR([extra-inc],[extra include directory],extra_inc, NONE)
 LYX_LOOP_DIR($lyx_cv_extra_inc,LYX_ADD_INC_DIR(lyx_cppflags,$dir))
-test ! x"$lyx_cppflags" = x && AM_CPPFLAGS="$lyx_cppflags $AM_CPPFLAGS"
+test ! x"$lyx_cppflags" = x && CPPFLAGS="$lyx_cppflags $CPPFLAGS"
 
 ### Add both includes and libraries
 LYX_WITH_DIR([extra-prefix],[extra lib+include directory],extra_prefix, NONE, ${prefix})
 LYX_LOOP_DIR($lyx_cv_extra_prefix,[
-  LYX_ADD_INC_DIR(AM_CPPFLAGS,$dir/include)
+  LYX_ADD_INC_DIR(CPPFLAGS,$dir/include)
   LYX_ADD_LIB_DIR(LDFLAGS,$dir/lib)
 ])
 
@@ -140,7 +156,7 @@ QT_DO_IT_ALL([4.5.0])
 AC_SUBST([FRONTENDS_SUBDIRS], [qt4])
 FRONTEND_INFO="${FRONTEND_INFO}\
   Qt Frontend:\n\
-      Qt version:\t\t${QTLIB_VERSION}\n"
+      Qt version:\t   ${QTLIB_VERSION}\n"
 
 # fix the value of the prefixes.
 test "x$prefix" = xNONE && prefix=$default_prefix
@@ -154,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
@@ -197,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])
@@ -260,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"
@@ -329,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 \