X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=configure.ac;h=c12aff90d2a44a9724fbd244a142cea2cb5d6ad2;hb=e983dba0100f1b8c26635223c9089326bff4eb4b;hp=c19cefc7fd00b9742cc8a20a1eaba954384dbf55;hpb=a5dcff8dd1d10034473ea2f79cd3c6fb2a540106;p=lyx.git

diff --git a/configure.ac b/configure.ac
index c19cefc7fd..c12aff90d2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,9 +1,9 @@
 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, ["Sat, April 21, 2007"])
+AC_SUBST(LYX_DATE, ["Wed, Jun 27, 2007"])
 AC_PREREQ(2.52)
-AC_CONFIG_SRCDIR(src/main.C)
+AC_CONFIG_SRCDIR(src/main.cpp)
 AC_CONFIG_HEADERS([src/config.h])
 
 AC_CONFIG_AUX_DIR(config)
@@ -25,7 +25,7 @@ fi
 AM_MAINTAINER_MODE
 
 save_PACKAGE=$PACKAGE
-AM_INIT_AUTOMAKE([foreign dist-bzip2 no-define 1.9])
+AM_INIT_AUTOMAKE([foreign dist-bzip2 no-define 1.5])
 PACKAGE=$save_PACKAGE
 
 ### Set the execute permissions of the various scripts correctly
@@ -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,15 +380,25 @@ 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
 ])
 
 ### Finish the work.
-AC_CONFIG_FILES([Makefile  m4/Makefile \
+AC_CONFIG_FILES([Makefile
        boost/Makefile \
        boost/libs/Makefile \
        boost/libs/filesystem/Makefile \
@@ -407,17 +414,18 @@ AC_CONFIG_FILES([Makefile  m4/Makefile \
        development/MacOSX/Makefile \
        development/MacOSX/spotlight/Makefile \
        development/lyx.spec \
+       intl/Makefile \
        lib/Makefile \
        lib/doc/Makefile \
        lib/lyx2lyx/lyx2lyx_version.py \
        lib/lyx2lyx/Makefile \
-       intl/Makefile \
+       m4/Makefile \
        po/Makefile.in \
        sourcedoc/Doxyfile \
        sourcedoc/Makefile \
        src/client/Makefile \
        src/Makefile \
-       src/version.C-tmp:src/version.C.in \
+       src/version.cpp-tmp:src/version.cpp.in \
        src/tex2lyx/Makefile \
        src/mathed/Makefile \
        src/graphics/Makefile \