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

diff --git a/configure.ac b/configure.ac
index 81dcdcd52c..9b87677294 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,8 +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])
@@ -26,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
 
@@ -57,17 +62,12 @@ for file in config/install-sh ; do
   chmod 755 ${srcdir}/${file}
 done
 
-# Check for installed python
 AM_PATH_PYTHON(2.4.0,, :)
-
-### we need to know the byte order for unicode conversions
-AC_C_BIGENDIAN
-
-### check which frontend we want to use
-LYX_USE_FRONTENDS
+AC_PROG_RANLIB
 
 ### Check for a C++ compiler
 LYX_PROG_CXX
+AC_LANG(C++)
 
 ### Objective-C compiler
 AC_PROG_OBJC
@@ -99,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)
 
@@ -125,39 +128,14 @@ AC_CHECK_HEADERS(magic.h,
    is correctly installed on your system.
    Falling back to builtin file format detection.])])
 
-
-### check which frontend we want to use
-
+### setup the qt4 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([4.5.0])
-	  FRONTENDS_PROGS="$FRONTENDS_PROGS lyx-qt4\$(EXEEXT)"
-	  FRONTENDS_SUBDIRS="$FRONTENDS_SUBDIRS qt4"
-	  RPM_FRONTEND="qt4"
-	  FRONTEND_INFO="${FRONTEND_INFO}\
+QT4_DO_IT_ALL([4.5.0])
+AC_SUBST([FRONTENDS_SUBDIRS], [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, uic, or bc
-	  if test -z "$MOC4"; then
-	    AC_MSG_ERROR([cannot find moc binary.])
-	  fi
-	  if test -z "$UIC4"; then
-	    AC_MSG_ERROR([cannot find uic binary.!])
-	  fi
-	  if test -z "$QT4_LIB"; then
-	    AC_MSG_ERROR([cannot find qt4 library.])
-	  fi
-	  if test "$bc_found" = "no"; then
-	    AC_MSG_ERROR([cannot find bc program.])
-	  fi
-      ;;
-    *)
-	  AC_MSG_ERROR([unknown frontend '$frontend'.]);;
-  esac
-done
 
 # fix the value of the prefixes.
 test "x$prefix" = xNONE && prefix=$default_prefix
@@ -170,36 +148,37 @@ if echo $prefix |grep ' ' >/dev/null 2>/dev/null ; then
   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 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
@@ -207,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=
@@ -220,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
@@ -248,7 +227,6 @@ ${FRONTEND_INFO}\
   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)
@@ -301,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
@@ -316,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
 
@@ -367,7 +342,6 @@ AC_CONFIG_FILES([Makefile \
       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 \