dnl Process with autoconf to generate configure script -*- sh -*-
-AC_INIT(LyX,2.0.0alpha4,[lyx-devel@lists.lyx.org],[lyx])
+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, ["2010-06-1"])
-AC_PREREQ(2.52)
+AC_SUBST(LYX_DATE, ["2014-04-14"])
+AC_PREREQ(2.60)
AC_CONFIG_SRCDIR(src/main.cpp)
AC_CONFIG_HEADERS([config.h])
AM_MAINTAINER_MODE
save_PACKAGE=$PACKAGE
-AM_INIT_AUTOMAKE([foreign dist-bzip2 no-define 1.8])
+dnl The test for _AM_PROG_CC_C_O intends to test for automake 1.14 or newer,
+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)
m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])])
PACKAGE=$save_PACKAGE
# Allow to build some parts of the code as one big chunk
-m4_define([ALLPARTS],[boost,client,insets,mathed,core,tex2lyx,frontend_qt4])
+m4_define([ALLPARTS],[boost,client,insets,mathed,core,tex2lyx,frontend_qt])
AC_ARG_ENABLE(monolithic-build,
AC_HELP_STRING([--enable-monolithic-build@<:@=LIST@:>@],
[Use monolithic build for modules in LIST (default: ALLPARTS)]),
AM_CONDITIONAL(MONOLITHIC_MATHED, test "x$enable_monolithic_mathed" = "xyes")
AM_CONDITIONAL(MONOLITHIC_CORE, test "x$enable_monolithic_core" = "xyes")
AM_CONDITIONAL(MONOLITHIC_TEX2LYX, test "x$enable_monolithic_tex2lyx" = "xyes")
-AM_CONDITIONAL(MONOLITHIC_FRONTEND_QT4, test "x$enable_monolithic_frontend_qt4" = "xyes")
+AM_CONDITIONAL(MONOLITHIC_FRONTEND_QT, test "x$enable_monolithic_frontend_qt" = "xyes")
### Set the execute permissions of the various scripts correctly
for file in config/install-sh ; do
chmod 755 ${srcdir}/${file}
done
-# Check for installed python
-AM_PATH_PYTHON(2.3.4,, :)
-
-### we need to know the byte order for unicode conversions
-AC_C_BIGENDIAN
-
-### check which frontend we want to use
-LYX_USE_FRONTENDS
+AM_PATH_PYTHON(2.4.0,, :)
+AC_PROG_RANLIB
### Check for a C++ compiler
LYX_PROG_CXX
+AC_LANG(C++)
### Objective-C compiler
AC_PROG_OBJC
AC_CHECK_LIB(gdi32, main)
LYX_USE_INCLUDED_BOOST
+LYX_USE_INCLUDED_MYTHES
+
+### we need to know the byte order for unicode conversions
+AC_C_BIGENDIAN
+
+# Nice to have when an assertion triggers
+LYX_CHECK_CALLSTACK_PRINTING
# Needed for our char_type
AC_CHECK_SIZEOF(wchar_t)
### We need iconv for unicode support (Qt4 frontend requires it too)
AM_ICONV
if test "$am_cv_func_iconv" = no; then
- LYX_ERROR([Cannot find required library iconv])
+ AC_MSG_ERROR([cannot find required library iconv.])
else
LIBS="$LIBS $LIBICONV"
fi
[AC_CHECK_LIB(z, gzopen, [LIBS="$LIBS -lz"], LYX_LIB_ERROR(libz,zlib))],
[LYX_LIB_ERROR(zlib.h,zlib)])
-
-### check which frontend we want to use
-
+### check for file magic support (currently optional)
+AC_CHECK_HEADERS(magic.h,
+ [AC_CHECK_LIB(magic, magic_open, [LIBS="$LIBS -lmagic"],
+ LYX_WARNING([cannot find libmagic. Please check that the libmagic library
+ is correctly installed on your system.
+ Falling back to builtin file format detection.]))],
+ [LYX_WARNING([cannot find magic.h. Please check that the libmagic library
+ is correctly installed on your system.
+ Falling back to builtin file format detection.])])
+
+### setup the qt frontend.
dnl The code below is not in a macro, because this would cause big
-dnl problems with the AC_REQUIRE contained in QT4_DO_IT_ALL.
-for frontend in $FRONTENDS ; do
- case "$frontend" in
- qt4)
- QT4_DO_IT_ALL
- FRONTENDS_PROGS="$FRONTENDS_PROGS lyx-qt4\$(EXEEXT)"
- FRONTENDS_SUBDIRS="$FRONTENDS_SUBDIRS qt4"
- RPM_FRONTEND="qt4"
- FRONTEND_INFO="${FRONTEND_INFO}\
- Qt 4 Frontend:\n\
- Qt 4 version:\t\t${QT4_VERSION}\n"
-dnl qt 4 build will fail without moc or uic
- if test -z "$MOC4"; then
- LYX_ERROR([moc 4 binary not found !])
- fi
- if test -z "$UIC4"; then
- LYX_ERROR([uic 4 binary not found !])
- fi
- if test -z "$QT4_LIB"; then
- LYX_ERROR([qt 4 library not found !])
- fi
- ;;
- *)
- LYX_ERROR(Unknown frontend '$frontend');;
- esac
-done
+dnl problems with the AC_REQUIRE contained in QT_DO_IT_ALL.
+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"
# fix the value of the prefixes.
test "x$prefix" = xNONE && prefix=$default_prefix
test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
if echo $prefix |grep ' ' >/dev/null 2>/dev/null ; then
- LYX_WARNING([The installation prefix \"${prefix}\" contains a space, which
+ LYX_WARNING([the installation prefix \"${prefix}\" contains a space, which
causes problems with the Makefiles. The installation will be done in
directory \"`pwd`/installprefix\" instead. Please move its contents to
the right place after installation.])
prefix=`pwd`/installprefix
fi
-### Setup GNU gettext
-dnl GNU gettext is written in C
-AC_LANG_PUSH(C)
-dnl Dirty trick ahead: disable macro AC_GNU_SOURCE because it triggers a bug with autoconf 2.62.
-dnl this can be removed if gettext is been updated to avoid that.
-m4_undefine([AC_GNU_SOURCE])
-m4_defun([AC_GNU_SOURCE],[])
-AM_GNU_GETTEXT([no-libtool])
-AM_GNU_GETTEXT_VERSION([0.16.1])
-AC_LANG_POP(C)
+### 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
# some standard header files
AC_HEADER_MAJOR
AC_CHECK_HEADERS(sys/time.h sys/types.h sys/select.h locale.h utime.h sys/utime.h)
-# some standard structures
-AC_HEADER_STAT
-AC_HEADER_TIME
-
# some standard types
AC_CHECK_TYPE(mode_t,[AC_DEFINE(HAVE_MODE_T, 1, [Define this to 1 if your compiler supports the mode_t type.])])
AC_TYPE_OFF_T
AC_TYPE_PID_T
-AC_TYPE_SIGNAL
AC_TYPE_SIZE_T
AC_TYPE_UID_T
+# Taken from gettext
+AC_CACHE_CHECK([for wchar_t], [gt_cv_c_wchar_t],
+ [AC_TRY_COMPILE([#include <stddef.h>
+ wchar_t foo = (wchar_t)'\0';], ,
+ [gt_cv_c_wchar_t=yes], [gt_cv_c_wchar_t=no])])
+if test $gt_cv_c_wchar_t = yes; then
+ AC_DEFINE([HAVE_WCHAR_T], [1], [Define if you have the 'wchar_t' type.])
+fi
+
+LYX_CHECK_DEF(PATH_MAX, limits.h, [int n = PATH_MAX;])
-AC_CHECK_FUNCS(chmod close _close fork getpid _getpid lstat mkfifo open _open pclose _pclose popen _popen readlink strerror)
+AC_CHECK_FUNCS(chmod close _close fork getpid _getpid lockf lstat mkfifo open _open pclose _pclose popen _popen readlink putenv setenv strerror unsetenv)
# Check the form of mkdir()
AC_FUNC_MKDIR
AC_FUNC_SELECT_ARGTYPES
LYX_CHECK_SPELL_ENGINES
lyx_client_subdir=true
-AC_LANG_PUSH(C)
+dnl AC_LANG_PUSH(C)
dnl LIBS already contains some X extra libs that may interfere.
save_LIBS="$LIBS"
LIBS=
AC_SUBST(SOCKET_LIBS,$LIBS)
LIBS="$save_LIBS"
AM_CONDITIONAL(BUILD_CLIENT_SUBDIR, $lyx_client_subdir)
-AC_LANG_POP(C)
+dnl AC_LANG_POP(C)
lyx_win_res=false;
case ${host} in
real_localedir=`eval "echo \`eval \"echo ${datadir}/locale\"\`"`
VERSION_INFO="Configuration\n\
Host type: ${host}\n\
- Special build flags: ${lyx_flags}\n\
- C Compiler: ${CC} ${CC_VERSION}\n\
- C Compiler LyX flags: ${AM_CPPFLAGS} ${AM_CFLAGS}\n\
- C Compiler flags: ${CPPFLAGS} ${CFLAGS}\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\
LyX files dir: ${real_pkgdatadir}\n"
AC_SUBST(VERSION_INFO)
-AC_SUBST(RPM_FRONTEND)
AC_SUBST(AM_CPPFLAGS)
AC_SUBST(AM_CXXFLAGS)
AC_SUBST(AM_CFLAGS)
#define BOOST_DISABLE_THREADS 1
#define BOOST_NO_WREGEX 1
#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_PATH 1
#endif
-/*
- * the FreeBSD libc uses UCS4, but libstdc++ has no proper wchar_t
- * support compiled in:
- * http://gcc.gnu.org/onlinedocs/libstdc++/faq/index.html#3_9
- * And we are not interested at all what libc
- * does: What we need is a 32bit wide wchar_t, and a libstdc++ that
- * has the needed wchar_t support and uses UCS4. Whether it
- * implements this with the help of libc, or whether it has own code
- * does not matter for us, because we do not use libc directly (Georg)
-*/
-#if defined(HAVE_WCHAR_T) && SIZEOF_WCHAR_T == 4 && !defined(__FreeBSD__) && !defined(__FreeBSD_kernel__)
+#ifdef __sparc__
+# ifndef __BIG_ENDIAN__
+# define __BIG_ENDIAN__ 1
+# endif
+#endif
+
+#if defined(HAVE_WCHAR_T) && SIZEOF_WCHAR_T == 4
# define USE_WCHAR_T
#endif
development/cygwin/Makefile \
development/cygwin/lyxrc.dist \
development/lyx.spec \
- intl/Makefile \
+ lib/lyx.desktop-temp:lib/lyx.desktop.in
lib/Makefile \
lib/doc/Makefile \
lib/lyx2lyx/lyx2lyx_version.py \
printf "$VERSION_INFO"
echo
-# Display a final warning if there has been a LYX_ERROR
-LYX_CHECK_ERRORS
+# Display a final warning if there has been a LYX_WARNING
+LYX_CHECK_WARNINGS
+
+cat <<EOF
+Configuration of LyX was successful.
+Type 'make' to compile the program,
+and then 'make install' to install it.
+EOF
projects / lyx.git / blobdiff