X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=configure.ac;h=9b87677294c63cb52dc3b66b1df7e00e7a0022de;hb=5a8b8ba8e11360a716465b9c6c7c0dc48f37f552;hp=9b2c17f9f4cca38edec4e241b1fb4e9db73eaac1;hpb=d7e2705228d0580a16046a3f3c19f453a035b99d;p=lyx.git

diff --git a/configure.ac b/configure.ac
index 9b2c17f9f4..9b87677294 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,9 +1,9 @@
 dnl Process with autoconf to generate configure script   -*- sh -*-
 
-AC_INIT(LyX,2.1.0dev,[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, ["2011-04-29"])
+AC_SUBST(LYX_DATE, ["2014-04-14"])
 AC_PREREQ(2.60)
 AC_CONFIG_SRCDIR(src/main.cpp)
 AC_CONFIG_HEADERS([config.h])
@@ -27,7 +27,11 @@ fi
 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
 
@@ -61,11 +65,9 @@ done
 AM_PATH_PYTHON(2.4.0,, :)
 AC_PROG_RANLIB
 
-### we need to know the byte order for unicode conversions
-AC_C_BIGENDIAN
-
 ### Check for a C++ compiler
 LYX_PROG_CXX
+AC_LANG(C++)
 
 ### Objective-C compiler
 AC_PROG_OBJC
@@ -97,6 +99,9 @@ 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
+
 # Needed for our char_type
 AC_CHECK_SIZEOF(wchar_t)
 
@@ -145,12 +150,7 @@ fi
 
 ### Setup po directory
 AM_PO_SUBDIRS
-AC_MSG_CHECKING([whether NLS is requested])
-dnl Default is enabled NLS
-AC_ARG_ENABLE(nls,
-  [  --disable-nls           do not use Native Language Support],
-    USE_NLS=$enableval, USE_NLS=yes)
-AC_MSG_RESULT($USE_NLS)
+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
@@ -167,7 +167,7 @@ AC_TYPE_OFF_T
 AC_TYPE_PID_T
 AC_TYPE_SIZE_T
 AC_TYPE_UID_T
-// Taken from gettext
+# 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';], ,
@@ -178,7 +178,7 @@ 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 setenv strerror unsetenv)
+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
@@ -186,7 +186,7 @@ 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=
@@ -199,7 +199,7 @@ AC_CHECK_FUNCS(fcntl,
 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
@@ -279,6 +279,7 @@ char * strerror(int n);
 #define BOOST_DISABLE_THREADS 1
 #define BOOST_NO_WREGEX 1
 #define BOOST_NO_WSTRING 1
+#define BOOST_SIGNALS_NO_DEPRECATION_WARNING 1
 
 // TR1 regex not supported in GCC <= 4.5
 #ifndef LYX_USE_TR1
@@ -294,17 +295,13 @@ char * strerror(int n);
 #  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