dnl Process with autoconf to generate configure script -*- sh -*-
-AC_INIT(LyX,2.2.0dev,[lyx-devel@lists.lyx.org],[lyx])
+AC_INIT(LyX,2.2.0,[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, ["2016-05-23"])
AC_PREREQ(2.60)
AC_CONFIG_SRCDIR(src/main.cpp)
AC_CONFIG_HEADERS([config.h])
dnl which are the versions where subdir-objects can beused.
dnl see: https://www.mail-archive.com/lyx-devel@lists.lyx.org/msg181023.html
m4_define([LYX_OBJECTS_LAYOUT], m4_ifdef([_AM_PROG_CC_C_O],[subdir-objects],))
-AM_INIT_AUTOMAKE([foreign dist-bzip2 no-define 1.8] LYX_OBJECTS_LAYOUT)
+# Automake is pulling the historical V7 format. This tar format supports
+# file names only up to 99 characters. tar-ustar selects the ustar format defined
+# by POSIX 1003.1-1988. This format is believed to be old enough to be portable.
+AM_INIT_AUTOMAKE([foreign dist-bzip2 no-define 1.8 tar-ustar] LYX_OBJECTS_LAYOUT)
m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])])
PACKAGE=$save_PACKAGE
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
### 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(CPPFLAGS,$dir/include)
- LYX_ADD_LIB_DIR(LDFLAGS,$dir/lib)])
+ LYX_ADD_INC_DIR(CPPFLAGS,$dir/include)
+ LYX_ADD_LIB_DIR(LDFLAGS,$dir/lib)
+])
### These are needed in windows
AC_CHECK_LIB(shlwapi, main, [LIBSHLWAPI=-lshlwapi])
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
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])
real_pkgdatadir=`eval "echo \`eval \"echo \\\`eval \\\"echo ${pkgdatadir}\\\"\\\`\"\`"`
real_localedir=`eval "echo \`eval \"echo ${datadir}/locale\"\`"`
VERSION_INFO="Configuration\n\
- Host type: ${host}\n\
- Special build flags: ${lyx_flags}\n\
- C++ Compiler: ${CXX} ${CXX_VERSION}\n\
- C++ Compiler LyX flags: ${AM_CPPFLAGS} ${AM_CXXFLAGS}\n\
- C++ Compiler flags: ${CPPFLAGS} ${CXXFLAGS}\n\
- Linker flags: ${AM_LDFLAGS}\n\
- Linker user flags: ${LDFLAGS}\n\
+ Host type: ${host}\n\
+ Special build flags: ${lyx_flags}\n\
+ C++ Compiler: ${CXX} ${CXX_VERSION}\n\
+ C++ Compiler flags: ${AM_CPPFLAGS} ${AM_CXXFLAGS}\n\
+ C++ Compiler user flags: ${CPPFLAGS} ${CXXFLAGS}\n\
+ Linker flags: ${AM_LDFLAGS}\n\
+ Linker user flags: ${LDFLAGS}\n\
${FRONTEND_INFO}\
- Packaging: ${lyx_use_packaging}\n\
- LyX binary dir: ${real_bindir}\n\
- LyX files dir: ${real_pkgdatadir}\n"
+ Packaging: ${lyx_use_packaging}\n\
+ LyX binary dir: ${real_bindir}\n\
+ LyX files dir: ${real_pkgdatadir}\n"
AC_SUBST(VERSION_INFO)
AC_SUBST(AM_CPPFLAGS)
AC_SUBST(AM_CXXFLAGS)
-AC_SUBST(AM_CFLAGS)
AC_SUBST(AM_LDFLAGS)
AC_SUBST(real_pkgdatadir)
/************************************************************
** 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"
#define BOOST_NO_WSTRING 1
#define BOOST_SIGNALS_NO_DEPRECATION_WARNING 1
-// <regex> in gcc is unusable in versions less than 4.9.0
-// see https://gcc.gnu.org/bugzilla/show_bug.cgi?id=53631
-// clang defines __GNUC__ but how do the versions match?
-#ifndef LYX_USE_STD_REGEX
-# if (__GNUC__ == 4 && __GNUC_MINOR__ >= 9) || __GNUC__ > 4 || defined(USE_LLVM_LIBCPP)
-# define LYX_USE_STD_REGEX
-# endif
-#endif
-
#ifdef __CYGWIN__
# define NOMINMAX
# define BOOST_POSIX 1
AC_CONFIG_FILES([Makefile \
lyx.1:lyx.1in \
- boost/Makefile \
+ 3rdparty/Makefile \
+ 3rdparty/boost/Makefile \
+ 3rdparty/hunspell/Makefile \
+ 3rdparty/libiconv/Makefile \
+ 3rdparty/zlib/Makefile \
+ autotests/Makefile \
config/Makefile \
development/Makefile \
development/MacOSX/Makefile \
projects / lyx.git / blobdiff