X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=configure.ac;h=c12aff90d2a44a9724fbd244a142cea2cb5d6ad2;hb=e983dba0100f1b8c26635223c9089326bff4eb4b;hp=4a26576b6138747b5ba274e53c20902d98bc41ea;hpb=4ef33baee95accfcfe3c590db80593806d2c9612;p=lyx.git diff --git a/configure.ac b/configure.ac index 4a26576b61..c12aff90d2 100644 --- a/configure.ac +++ b/configure.ac @@ -1,7 +1,7 @@ dnl Process with autoconf to generate configure script -*- sh -*- AC_INIT(LyX,1.5.0svn,[lyx-devel@lists.lyx.org],[lyx]) -AC_SUBST(LYX_DATE, ["Fri, May 18, 2007"]) +AC_SUBST(LYX_DATE, ["Wed, Jun 27, 2007"]) AC_PREREQ(2.52) AC_CONFIG_SRCDIR(src/main.cpp) AC_CONFIG_HEADERS([src/config.h]) @@ -100,10 +100,7 @@ if test "x$enable_assertions" = xyes ; then fi ### Library Files -dnl by testing these we check if it is ok to have -dnl -lc and -lm as args to the compiler AC_CHECK_LIB(m, sin) -AC_CHECK_LIB(c, fopen) ### Add extra directories to check for libraries. LYX_WITH_DIR([extra-lib],[extra library directory],extra_lib, NONE) @@ -383,8 +380,18 @@ int mkstemp(char*); # define WANT_GETFILEATTRIBUTESEX_WRAPPER 1 #endif -#if defined(HAVE_WCHAR_T) && SIZEOF_WCHAR_T == 4 -# define LIBC_WCTYPE_USES_UCS4 +/* + * 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 don't use libc directly (Georg) +*/ +#if defined(HAVE_WCHAR_T) && SIZEOF_WCHAR_T == 4 && ! defined(__FREEBSD__) +# define USE_WCHAR_T #endif #endif