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)
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
-AC_CHECK_LIB(m, sin)
+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
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
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
* 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
### Finish the work.
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 \
src/Makefile \
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