X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=configure.ac;h=36e00e52bc2ef1af8abdae9ffa41039594a1457a;hb=db8a26847695c03b94e1935fc7fe863066e477e1;hp=cf5b12b9feffd9cfbf77ce75c8882f4670858bac;hpb=51c0f33fd36c0d5a559cc606a44e5ea8436aa14a;p=lyx.git

diff --git a/configure.ac b/configure.ac
index cf5b12b9fe..36e00e52bc 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, ["Wed, Nov 15, 2006"])
+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 tar-ustar 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)
@@ -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,12 +225,6 @@ 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
 AC_LANG_PUSH(C)
@@ -236,7 +241,7 @@ AC_HEADER_STAT
 AC_HEADER_TIME
 
 # some standard types
-AC_TYPE_MODE_T
+AC_CHECK_TYPE(mode_t,[AC_DEFINE(HAVE_MODE_T, 1, [Define this to 1 if your compiler supports the mode_t type.])])
 AC_TYPE_OFF_T
 AC_TYPE_PID_T
 AC_TYPE_SIGNAL
@@ -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
@@ -285,7 +285,7 @@ AC_FUNC_SELECT_ARGTYPES
 
 ### Some information on what just happened
 real_bindir=`eval "echo \`eval \"echo ${bindir}\"\`"`
-real_pkgdatadir=`eval "echo \`eval \"echo ${pkgdatadir}\"\`"`
+real_pkgdatadir=`eval "echo \`eval \"echo \\\`eval \\\"echo ${pkgdatadir}\\\"\\\`\"\`"`
 real_localedir=`eval "echo \`eval \"echo ${datadir}/locale\"\`"`
 VERSION_INFO="Configuration\n\
   Host type:                      ${host}\n\
@@ -383,15 +383,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__) && !defined(__FreeBSD_kernel__)
+#  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 \
@@ -404,18 +414,21 @@ AC_CONFIG_FILES([Makefile  m4/Makefile \
        boost/libs/signals/src/Makefile \
        config/Makefile \
        development/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 \