X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=configure.ac;h=1fe6d9d69155a5b6d77c33cc9c97f1c7dfc87849;hb=878cdcd25df8845400eea6fa1c41c03e8c0a3566;hp=6393ef4637ec14c2e20d8abd884e66b5415b04ed;hpb=290f3af8625052ac47183fda0d3695d8057a880d;p=lyx.git

diff --git a/configure.ac b/configure.ac
index 6393ef4637..1fe6d9d691 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.0beta1,[lyx-devel@lists.lyx.org],[lyx])
+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, ["2013-07-13"])
+AC_SUBST(LYX_DATE, ["2013-11-10"])
 AC_PREREQ(2.60)
 AC_CONFIG_SRCDIR(src/main.cpp)
 AC_CONFIG_HEADERS([config.h])
@@ -61,11 +61,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 +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)
 
@@ -173,7 +174,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
@@ -181,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=
@@ -194,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
@@ -289,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