X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=configure.ac;h=b572f4980c6d882d0bc22c2c8929f08b54155dd4;hb=06316b7b22923d7a088219212cba962beebfcb2c;hp=8c56ab5c2586dc8eccf2901a70986f99574800d2;hpb=03343bd4e63f946b463fa4e97e70d449cadf6622;p=lyx.git diff --git a/configure.ac b/configure.ac index 8c56ab5c25..b572f4980c 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, ["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]) @@ -27,7 +27,7 @@ fi AM_MAINTAINER_MODE save_PACKAGE=$PACKAGE -AM_INIT_AUTOMAKE([foreign dist-bzip2 no-define 1.8 subdir-objects]) +AM_INIT_AUTOMAKE([foreign dist-bzip2 no-define 1.8]) m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])]) PACKAGE=$save_PACKAGE @@ -290,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