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

diff --git a/configure.ac b/configure.ac
index c12aff90d2..fb19a9a96d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,6 @@
 dnl Process with autoconf to generate configure script   -*- sh -*-
 
-AC_INIT(LyX,1.5.0svn,[lyx-devel@lists.lyx.org],[lyx])
+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)
@@ -158,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
@@ -211,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)
@@ -247,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
@@ -390,7 +393,7 @@ int mkstemp(char*);
  * 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__)
+#if defined(HAVE_WCHAR_T) && SIZEOF_WCHAR_T == 4 && !defined(__FreeBSD__) && !defined(__FreeBSD_kernel__)
 #  define USE_WCHAR_T
 #endif