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])
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
### 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)
])
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
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])
/************************************************************
** 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"
AC_CONFIG_FILES([Makefile \
lyx.1:lyx.1in \
+ autotests/Makefile \
boost/Makefile \
config/Makefile \
development/Makefile \