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_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.C)
+AC_CONFIG_SRCDIR(src/main.cpp)
AC_CONFIG_HEADERS([src/config.h])
AC_CONFIG_AUX_DIR(config)
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
dnl we do not need that currently (and probably all our supported
dnl compiler allow that)
dnl LYX_CXX_PARTIAL
-LYX_CXX_EXPLICIT
+dnl LYX_CXX_EXPLICIT
LYX_CXX_GLOBAL_CSTD
-LYX_STD_COUNT
+dnl LYX_STD_COUNT
dnl we disable rtti for now
dnl LYX_CXX_RTTI
-AC_CHECK_HEADERS(ostream istream sstream locale limits ios)
-LYX_CXX_STL_MODERN_STREAMS
+dnl AC_CHECK_HEADERS(ostream istream sstream locale limits ios)
+dnl LYX_CXX_STL_MODERN_STREAMS
### and now some special lyx flags.
AC_ARG_ENABLE(assertions,
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)
+dnl AC_CHECK_LIB(m, sin)
### Add extra directories to check for libraries.
LYX_WITH_DIR([extra-lib],[extra library directory],extra_lib, NONE)
dnl Note that this will reportedly not be needed with libtool 2.0
m4_undefine([AC_PROG_F77])
m4_defun([AC_PROG_F77],[])
-AC_DISABLE_SHARED
+#AC_DISABLE_SHARED
+AC_DISABLE_STATIC
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
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)
# some standard header files
AC_HEADER_DIRENT
AC_HEADER_MAJOR
-AC_CHECK_HEADERS(sys/time.h sys/types.h sys/select.h strings.h locale.h utime.h sys/utime.h io.h process.h NewAPIs.h)
+AC_CHECK_HEADERS(sys/time.h sys/types.h sys/select.h strings.h locale.h io.h process.h NewAPIs.h)
# some standard structures
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
# 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
### 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\
char * strerror(int n);
#endif
-#ifdef HAVE_MKSTEMP
-#ifndef HAVE_DECL_MKSTEMP
-#if defined(__cplusplus)
-extern "C"
-#endif
-int mkstemp(char*);
-#endif
-#endif
-
#if defined(HAVE_OSTREAM) && defined(HAVE_LOCALE) && defined(HAVE_SSTREAM)
# define USE_BOOST_FORMAT 1
#else
# 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 \
- boost/libs/filesystem/src/Makefile \
- boost/libs/iostreams/Makefile \
- boost/libs/iostreams/src/Makefile \
- boost/libs/regex/Makefile \
- boost/libs/regex/src/Makefile \
- boost/libs/signals/Makefile \
- boost/libs/signals/src/Makefile \
config/Makefile \
development/Makefile \
+ development/MacOSX/Makefile \
+ development/MacOSX/Info.plist \
+ development/MacOSX/lyxrc.dist \
+ 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 \
- src/insets/Makefile \
src/support/Makefile \
- src/support/tests/Makefile \
src/frontends/Makefile \
src/frontends/controllers/Makefile \
- src/frontends/controllers/tests/Makefile \
src/frontends/qt4/Makefile \
- src/frontends/qt4/ui/Makefile \
])
AC_OUTPUT
projects / lyx.git / blobdiff