X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=configure.ac;h=fb19a9a96d1ca9793be927c57048248e14b2fe29;hb=04e2a40f5ba564a0b2398c2371268d8045073662;hp=4a26576b6138747b5ba274e53c20902d98bc41ea;hpb=4ef33baee95accfcfe3c590db80593806d2c9612;p=lyx.git

diff --git a/configure.ac b/configure.ac
index 4a26576b61..fb19a9a96d 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_INIT(LyX,1.6.0svn,[lyx-devel@lists.lyx.org],[lyx])
+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)
@@ -161,6 +158,20 @@ AC_LIBTOOL_WIN32_DLL
 #AM_PROG_LIBTOOL
 LYX_PROG_LIBTOOL
 
+### We need iconv for unicode support (Qt4 frontend requires it too)
+AM_ICONV
+if test "$am_cv_func_iconv" = no; then
+  LYX_ERROR([Cannot find required library iconv])
+else
+  LIBS="$LIBS $LIBICONV"
+fi
+
+### check for compression support
+AC_CHECK_HEADERS(zlib.h,
+ [AC_CHECK_LIB(z, gzopen, [LIBS="$LIBS -lz"], LYX_LIB_ERROR(libz,zlib))],
+ [LYX_LIB_ERROR(zlib.h,zlib)])
+
+
 ### Check for X libraries
 AC_PATH_XTRA
 case $have_x in
@@ -214,14 +225,8 @@ if echo $prefix |grep ' ' >/dev/null 2>/dev/null ; then
   prefix=`pwd`/installprefix
 fi
 
-### We need iconv for unicode support
-AM_ICONV
-if test "$am_cv_func_iconv" = no; then
-  LYX_ERROR([Cannot find required library iconv])
-fi
-
 ### Setup GNU gettext
-dnl GNU gettext is written in C
+dnl GNU gettext is written in C
 AC_LANG_PUSH(C)
 AM_GNU_GETTEXT
 AC_LANG_POP(C)
@@ -250,11 +255,6 @@ LYX_CHECK_DECL(mkstemp,[unistd.h stdlib.h])
 # Check the form of mkdir()
 AC_FUNC_MKDIR
 
-# check for compression support
-AC_CHECK_HEADERS(zlib.h,
- [AC_CHECK_LIB(z, gzopen, [LIBS="$LIBS -lz"], LYX_LIB_ERROR(libz,zlib))],
- [LYX_LIB_ERROR(zlib.h,zlib)])
-
 dnl This is a slight hack: the tests generated by autoconf 2.52 do not
 dnl work correctly because of some conflict with stdlib.h with g++ 2.96
 dnl We aim to remove this eventually, since we should test as much as
@@ -383,8 +383,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__) && !defined(__FreeBSD_kernel__)
+#  define USE_WCHAR_T
 #endif
 
 #endif