X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=configure.ac;h=90b7ffa37ccc05e579dc376b860c6329e806fc76;hb=faa87bf9f30b943397429a04254d96963bbf38bc;hp=bab727feeffe5ecfb59a7c9d926d8d5a896c58f8;hpb=3ef4db2ce461249d0e8da45ddce684ddbb7a15cc;p=lyx.git

diff --git a/configure.ac b/configure.ac
index bab727feef..90b7ffa37c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3,7 +3,7 @@ dnl Process with autoconf to generate configure script   -*- sh -*-
 AC_INIT(LyX,2.1.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-03-24"])
 AC_PREREQ(2.60)
 AC_CONFIG_SRCDIR(src/main.cpp)
 AC_CONFIG_HEADERS([config.h])
@@ -58,14 +58,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
+AC_PROG_RANLIB
 
 ### Check for a C++ compiler
 LYX_PROG_CXX
+AC_LANG(C++)
 
 ### Objective-C compiler
 AC_PROG_OBJC
@@ -97,6 +95,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)
 
@@ -143,16 +144,14 @@ 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
@@ -164,10 +163,18 @@ AC_TYPE_OFF_T
 AC_TYPE_PID_T
 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
@@ -175,7 +182,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=
@@ -188,7 +195,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
@@ -283,17 +290,7 @@ 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__)
+#if defined(HAVE_WCHAR_T) && SIZEOF_WCHAR_T == 4
 #  define USE_WCHAR_T
 #endif
 
@@ -334,7 +331,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 \