X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=configure.ac;h=2f7680d105bdf043219b927a74347eac92a227db;hb=b8dfb6ad26abad340b91e9582052565b35f492d7;hp=ac2ebfcb5ffe7ff6c0749ef26860c46a10f5f5e5;hpb=fdd388d4b705cebc42b0ec7dcc186c531353d7ac;p=lyx.git

diff --git a/configure.ac b/configure.ac
index ac2ebfcb5f..2f7680d105 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,100 +1,77 @@
 dnl Process with autoconf to generate configure script   -*- sh -*-
 
-AC_INIT(lyx,1.4.0cvs,lyx-devel@lists.lyx.org)
+AC_INIT(LyX,2.0.0svn,[lyx-devel@lists.lyx.org],[lyx])
+# Use ISO format only. The frontend needs to parse this
+AC_SUBST(LYX_DATE, ["2010-09-15"])
 AC_PREREQ(2.52)
-AC_CONFIG_SRCDIR(src/main.C)
-AM_CONFIG_HEADER([src/config.h])
+AC_CONFIG_SRCDIR(src/main.cpp)
+AC_CONFIG_HEADERS([config.h])
 
 AC_CONFIG_AUX_DIR(config)
 
-PACKAGE=lyx${program_suffix}
-VERSION="1.4.0cvs"
+# First check the version
 LYX_CHECK_VERSION
+LYX_VERSION_SUFFIX
+# Check how the files should be packaged
+AC_CANONICAL_TARGET
+LYX_USE_PACKAGING
+# We need to define these variables here and the no-define option of
+# AM_INIT_AUTOMAKE above because we alter $PACKAGE in LYX_USE_PACKAGING.
+AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package])
 
-dnl default maintainer mode to true for development versions
+dnl Default maintainer mode to true for development versions
 if test "${enable_maintainer_mode+set}" != set; then
   enable_maintainer_mode=$lyx_devel_version
 fi
 AM_MAINTAINER_MODE
-AC_CANONICAL_TARGET
 
-LYX_VERSION_SUFFIX
-
-AM_INIT_AUTOMAKE($lyxname, $VERSION)
+save_PACKAGE=$PACKAGE
+AM_INIT_AUTOMAKE([foreign dist-bzip2 no-define 1.8])
+m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])])
+PACKAGE=$save_PACKAGE
+
+# Allow to build some parts of the code as one big chunk
+m4_define([ALLPARTS],[boost,client,insets,mathed,core,tex2lyx,frontend_qt4])
+AC_ARG_ENABLE(monolithic-build,
+  AC_HELP_STRING([--enable-monolithic-build@<:@=LIST@:>@],
+		[Use monolithic build for modules in LIST (default: ALLPARTS)]),
+  [test "$enable_monolithic_build" = yes && enable_monolithic_build="ALLPARTS"
+   test "$enable_monolithic_build" = no && enable_monolithic_build=
+   IFS="${IFS=	}"; ac_save_ifs="$IFS"; IFS=" ,"
+   for i in $enable_monolithic_build ; do
+       eval "enable_monolithic_$i=yes"
+   done
+   IFS="$ac_save_ifs"],
+  [enable_monolithic_build=])
+
+AM_CONDITIONAL(MONOLITHIC_BOOST, test "x$enable_monolithic_boost" = "xyes")
+AM_CONDITIONAL(MONOLITHIC_CLIENT, test "x$enable_monolithic_client" = "xyes")
+AM_CONDITIONAL(MONOLITHIC_INSETS, test "x$enable_monolithic_insets" = "xyes")
+AM_CONDITIONAL(MONOLITHIC_MATHED, test "x$enable_monolithic_mathed" = "xyes")
+AM_CONDITIONAL(MONOLITHIC_CORE, test "x$enable_monolithic_core" = "xyes")
+AM_CONDITIONAL(MONOLITHIC_TEX2LYX, test "x$enable_monolithic_tex2lyx" = "xyes")
+AM_CONDITIONAL(MONOLITHIC_FRONTEND_QT4, test "x$enable_monolithic_frontend_qt4" = "xyes")
 
 ### Set the execute permissions of the various scripts correctly
-for file in config/install-sh config/mkinstalldirs lib/configure ; do
+for file in config/install-sh ; do
   chmod 755 ${srcdir}/${file}
 done
 
-### Check for programs
-AC_PROG_MAKE_SET
-AC_PROG_INSTALL
-
-AC_PROG_AWK
-test "$AWK" = gawk && AWK="gawk --posix"
-
-#AC_PROG_RANLIB
-AC_CHECK_PROG(KPSEWHICH, kpsewhich, kpsewhich, :)
-if test "x$KPSEWHICH" = xkpsewhich ; then
-    AC_DEFINE(HAVE_KPSEWHICH, 1,
-    [Define this if you have the kpsewhich program working on your system.])
-fi
-AC_CHECK_PROGS(M4, gm4 gnum4 m4, m4)
-
 # Check for installed python
-AM_PATH_PYTHON(1.5.2,, :)
-
-# Work around a problem in automake 1.4: when invoking install-strip,
-# INSTALL_PROGRAM is changed to 'install -s', and since
-# INSTALL_SCRIPT==INSTALL_PROGRAM, we get errors with fileutils-4.0
-# which returns an error condition when stripping fails.
-INSTALL_SCRIPT='${INSTALL}'
+AM_PATH_PYTHON(2.3.4,, :)
 
-### we will also need a C compiler to compile GNU gettext
-AC_PROG_CC
-
-### check for special systems
-AC_ISC_POSIX
-AC_AIX
+### we need to know the byte order for unicode conversions
+AC_C_BIGENDIAN
 
 ### check which frontend we want to use
 LYX_USE_FRONTENDS
 
 ### Check for a C++ compiler
 LYX_PROG_CXX
-### Some checks on what the C++ compiler can(not) do
-AC_LANG(C++)
-dnl we do not need that currently (and probably all our supported
-dnl compiler allow that)
-dnl LYX_CXX_PARTIAL
-LYX_CXX_EXPLICIT
-LYX_CXX_GLOBAL_CSTD
-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
-
-### and now some special lyx flags.
-AC_ARG_ENABLE(assertions,
-  AC_HELP_STRING([--enable-assertions],[add runtime sanity checks in the program]),,
-  [if test $lyx_devel_version = yes -o $lyx_prerelease = yes ; then
-	enable_assertions=yes;
-    else
-	enable_assertions=no;
-    fi;])
-if test "x$enable_assertions" = xyes ; then
-   lyx_flags="assertions $lyx_flags"
-   AC_DEFINE(ENABLE_ASSERTIONS,1,
-    [Define if you want assertions to be enabled in the code])
-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)
+### Objective-C compiler
+AC_PROG_OBJC
+_AM_DEPENDENCIES([OBJC])
 
 ### Add extra directories to check for libraries.
 LYX_WITH_DIR([extra-lib],[extra library directory],extra_lib, NONE)
@@ -112,114 +89,55 @@ LYX_LOOP_DIR($lyx_cv_extra_prefix,[
 LYX_ADD_INC_DIR(CPPFLAGS,$dir/include)
   LYX_ADD_LIB_DIR(LDFLAGS,$dir/lib)])
 
-AC_ARG_WITH(aiksaurus,
-  [  --without-aiksaurus     do not use the Aiksaurus library],
-  [lyx_use_aiksaurus=$withval])
-if test x$lyx_use_aiksaurus != xno; then
-AC_CHECK_LIB(Aiksaurus, main,
-	[AC_DEFINE(HAVE_LIBAIKSAURUS,1,[Define this if you have the AikSaurus library])
-	 AIKSAURUS_LIBS="-lAiksaurus"
-	 lyx_flags="aiksaurus $lyx_flags"
-	])
-AC_CHECK_HEADER(Aiksaurus.h,[
-  ac_cv_header_aiksaurus_h=yes
-  lyx_cv_aiksaurus_h_location="<Aiksaurus.h>"])
-AC_CHECK_HEADER(Aiksaurus/Aiksaurus.h,[
-  ac_cv_header_aiksaurus_h=yes
-  lyx_cv_aiksaurus_h_location="<Aiksaurus/Aiksaurus.h>"])
-AC_DEFINE_UNQUOTED(AIKSAURUS_H_LOCATION,$lyx_cv_aiksaurus_h_location,[Location of Aiksaurus.h])
-fi
-AC_SUBST(AIKSAURUS_LIBS)
+### These are needed in windows
+AC_CHECK_LIB(shlwapi, main, [LIBSHLWAPI=-lshlwapi])
+AC_SUBST(LIBSHLWAPI)
+AC_CHECK_LIB(psapi, main, [LIBPSAPI=-lpsapi])
+AC_SUBST(LIBPSAPI)
+AC_CHECK_LIB(gdi32, main)
 
 LYX_USE_INCLUDED_BOOST
 
-### Setup libtool
-AC_DISABLE_SHARED
-AC_LIBTOOL_WIN32_DLL
-#AM_PROG_LIBTOOL
-LYX_PROG_LIBTOOL
-
-### Check for some Cygwin-specific details.
-CHECK_WITH_CYGWIN
-
-### Check for X libraries
-AC_PATH_XTRA
-case $have_x in
-  yes) LIBS="$X_PRE_LIBS $LIBS $X_LIBS -lX11 $X_EXTRA_LIBS"
-       CPPFLAGS="$CPPFLAGS $X_CFLAGS";;
-  no) LYX_ERROR(dnl
-[Cannot find X window libraries and/or headers. Check your installation.
-  If you use a Linux system, check that you have installed
-  the development tools.]);;
-  disable) ;;
-esac
-
-### check which frontend we want to use
+# Needed for our char_type
+AC_CHECK_SIZEOF(wchar_t)
 
-dnl if the gtk frontend has been specified, then xforms is needed too
-if echo $FRONTENDS | grep gtk | grep -v xforms ; then
-  FRONTENDS="xforms $FRONTENDS"
-  noxformsbin=yes
+### 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 which frontend we want to use
+
 dnl The code below is not in a macro, because this would cause big
-dnl problems with the AC_REQUIRE contained in QT_DO_IT_ALL.
+dnl problems with the AC_REQUIRE contained in QT4_DO_IT_ALL.
 for frontend in $FRONTENDS ; do
   case "$frontend" in
-    xforms)
-	  XFORMS_DO_IT_ALL
-	  if test -z "$noxformsbin" ; then
-	    FRONTENDS_PROGS="$FRONTENDS_PROGS lyx-xforms\$(EXEEXT)"
-	  fi
-	  FRONTENDS_SUBDIRS="$FRONTENDS_SUBDIRS xforms"
-	  RPM_FRONTEND="xforms"
-	  FRONTEND_INFO="${FRONTEND_INFO}\
-  XForms Frontend:\n\
-      libXpm version:\t\t${XPM_VERSION}\n\
-      libforms version:\t\t${XFORMS_VERSION}\n"
-	  ;;
-  dnl   gnome)
-  dnl     XFORMS_DO_IT_ALL
-  dnl     PKG_CHECK_MODULES(GNOME_FRONTEND, gtkmm-2.0 libglademm-2.0)
-  dnl     AC_SUBST(GNOME_FRONTEND_CFLAGS)
-  dnl     AC_SUBST(GNOME_FRONTEND_LIBS)
-
-  dnl     FRONTEND="xforms gnome"
-  dnl     FRONTEND_GUILIB="gnome/*.lo"
-  dnl     FRONTEND_LDFLAGS="${GNOME_FRONTEND_LIBS}"
-  dnl     FRONTEND_INCLUDES="${GNOME_FRONTEND_CFLAGS}"
-  dnl     FRONTEND_LIBS="@XPM_LIB@ @XFORMS_LIB@ ${GNOME_FRONTEND_LIBS}"
-  dnl	;;
-    gtk)
-	  PKG_CHECK_MODULES(GTK_FRONTEND, gtkmm-2.4 libglademm-2.4)
-	  FRONTENDS_PROGS="$FRONTENDS_PROGS lyx-gtk\$(EXEEXT)"
-	  FRONTENDS_SUBDIRS="$FRONTENDS_SUBDIRS gtk"
-	  RPM_FRONTEND="gtk"
-	  GTKMM_VERSION=`pkg-config --modversion gtkmm-2.4`
-	  LIBGLADEMM_VERSION=`pkg-config --modversion libglademm-2.4`
-	  FRONTEND_INFO="${FRONTEND_INFO}\
-  GTK Frontend:\n\
-    libgtkmm version:\t\t${GTKMM_VERSION}\n\
-    libglademm version:\t\t${LIBGLADEMM_VERSION}\n"
-	  ;;
-
-    qt)
-	  QT_DO_IT_ALL
-	  FRONTENDS_PROGS="$FRONTENDS_PROGS lyx-qt\$(EXEEXT)"
-	  FRONTENDS_SUBDIRS="$FRONTENDS_SUBDIRS qt2"
-	  RPM_FRONTEND="qt"
+    qt4)
+	  QT4_DO_IT_ALL
+	  FRONTENDS_PROGS="$FRONTENDS_PROGS lyx-qt4\$(EXEEXT)"
+	  FRONTENDS_SUBDIRS="$FRONTENDS_SUBDIRS qt4"
+	  RPM_FRONTEND="qt4"
 	  FRONTEND_INFO="${FRONTEND_INFO}\
-  Qt Frontend:\n\
-      Qt version:\t\t${QT_VERSION}\n"
-dnl qt build will fail without moc or uic
-	  if test -z "$MOC"; then
-	    LYX_ERROR([moc binary not found !])
+  Qt 4 Frontend:\n\
+      Qt 4 version:\t\t${QT4_VERSION}\n"
+dnl qt 4 build will fail without moc or uic
+	  if test -z "$MOC4"; then
+	    LYX_ERROR([moc 4 binary not found !])
 	  fi
-	  if test -z "$UIC"; then
-	    LYX_ERROR([uic binary not found !])
+	  if test -z "$UIC4"; then
+	    LYX_ERROR([uic 4 binary not found !])
 	  fi
-	  if test -z "$QT_LIB"; then
-	    LYX_ERROR([qt library not found !])
+	  if test -z "$QT4_LIB"; then
+	    LYX_ERROR([qt 4 library not found !])
 	  fi
       ;;
     *)
@@ -227,8 +145,6 @@ dnl qt build will fail without moc or uic
   esac
 done
 
-### Check how the files should be packaged
-LYX_USE_PACKAGING
 # fix the value of the prefixes.
 test "x$prefix" = xNONE && prefix=$default_prefix
 test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
@@ -241,93 +157,84 @@ if echo $prefix |grep ' ' >/dev/null 2>/dev/null ; then
 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
+dnl Dirty trick ahead: disable macro AC_GNU_SOURCE because it triggers a bug with autoconf 2.62.
+dnl this can be removed if gettext is been updated to avoid that.
+m4_undefine([AC_GNU_SOURCE])
+m4_defun([AC_GNU_SOURCE],[])
+AM_GNU_GETTEXT([no-libtool])
+AM_GNU_GETTEXT_VERSION([0.16.1])
 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)
+AC_CHECK_HEADERS(sys/time.h sys/types.h sys/select.h locale.h utime.h sys/utime.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
 AC_TYPE_SIZE_T
 AC_TYPE_UID_T
 
-AC_CHECK_FUNCS(strerror)
-LYX_CHECK_DECL(istreambuf_iterator, iterator)
-LYX_CHECK_DECL(mkstemp,[unistd.h stdlib.h])
+LYX_CHECK_DEF(PATH_MAX, limits.h, [int n = PATH_MAX;])
 
+AC_CHECK_FUNCS(chmod close _close fork getpid _getpid lstat mkfifo open _open pclose _pclose popen _popen readlink strerror)
 # Check the form of mkdir()
 AC_FUNC_MKDIR
-
-AC_ARG_ENABLE(compression-support, AC_HELP_STRING([--enable-compression-support],[Support for compressed files.]),[
-    case "${enableval}" in
-	yes) use_compression=true ;;
-	no) use_compression=false ;;
-	*) AC_MSG_ERROR(bad value ${enableval} for --enable-compression-support) ;;
-    esac
-],[use_compression=true])
-if test $use_compression=true ; then
-	AC_CHECK_HEADERS(zlib.h, use_compression=true, use_compression=false)
-	AC_CHECK_LIB(z, gzopen,[use_compression=true;LIBS="$LIBS -lz"], use_compression=false)
-	if test $use_compression = true ; then
-		AC_DEFINE(USE_COMPRESSION, 1, [Define as 1 if you want to support compressed files.])
-		lyx_flags="compression $lyx_flags"
-	fi
-fi
-AM_CONDITIONAL(USE_COMPRESSION, test x$use_compression = xtrue)
-AC_MSG_CHECKING([whether to support compressed files])
-AC_MSG_RESULT($use_compression)
-
-
-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
-dnl possible with the compiler which will use the functions (JMarc)
-AC_LANG_PUSH(C)
-AC_CHECK_FUNCS(close _close getpid _getpid lstat mkfifo mkstemp mktemp open _open pclose _pclose popen _popen readlink)
-AC_LANG_POP(C)
+AC_FUNC_SELECT_ARGTYPES
 
 LYX_CHECK_SPELL_ENGINES
 
 lyx_client_subdir=true
 AC_LANG_PUSH(C)
-AC_CHECK_FUNCS(fcntl,, [lyx_client_subdir=false])
+dnl LIBS already contains some X extra libs that may interfere.
+save_LIBS="$LIBS"
+LIBS=
+AC_CHECK_FUNCS(fcntl,
+  [AC_SEARCH_LIBS([gethostbyname], [nsl])
+   AC_SEARCH_LIBS([socket], [socket], [],
+     [AC_CHECK_LIB([socket], [socket], [LIBS="-lsocket -lnsl $LIBS"],
+		[], [-lnsl])])],
+  [lyx_client_subdir=false])
+AC_SUBST(SOCKET_LIBS,$LIBS)
+LIBS="$save_LIBS"
 AM_CONDITIONAL(BUILD_CLIENT_SUBDIR, $lyx_client_subdir)
 AC_LANG_POP(C)
 
+lyx_win_res=false;
+case ${host} in
+    *mingw*|*cygwin*) lyx_win_res=true;;
+esac
+AM_CONDITIONAL(LYX_WIN_RESOURCE, $lyx_win_res)
+LYX_SET_VERSION_INFO
 
-AC_FUNC_SELECT_ARGTYPES
 
 ### Some information on what just happened
 real_bindir=`eval "echo \`eval \"echo ${bindir}\"\`"`
-real_datadir=`eval "echo \`eval \"echo ${datadir}/${PACKAGE}\"\`"`
+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\
-  Special build flags:            ${lyx_flags}\n\
-  C   Compiler:                   ${CC} ${CC_VERSION}\n\
-  C   Compiler LyX flags:         ${AM_CPPFLAGS} ${AM_CFLAGS}\n\
-  C   Compiler flags:             ${CPPFLAGS} ${CFLAGS}\n\
-  C++ Compiler:                   ${CXX} ${CXX_VERSION}\n\
-  C++ Compiler LyX flags:         ${AM_CPPFLAGS} ${AM_CXXFLAGS}\n\
-  C++ Compiler flags:             ${CPPFLAGS} ${CXXFLAGS}\n\
-  Linker flags:                   ${AM_LDFLAGS}\n\
-  Linker user flags:              ${LDFLAGS}\n\
+  Host type:                    ${host}\n\
+  Special build flags:          ${lyx_flags}\n\
+  C   Compiler:                 ${CC} ${CC_VERSION}\n\
+  C   Compiler LyX flags:       ${AM_CPPFLAGS} ${AM_CFLAGS}\n\
+  C   Compiler flags:           ${CPPFLAGS} ${CFLAGS}\n\
+  C++ Compiler:                 ${CXX} ${CXX_VERSION}\n\
+  C++ Compiler LyX flags:       ${AM_CPPFLAGS} ${AM_CXXFLAGS}\n\
+  C++ Compiler flags:           ${CPPFLAGS} ${CXXFLAGS}\n\
+  Linker flags:                 ${AM_LDFLAGS}\n\
+  Linker user flags:            ${LDFLAGS}\n\
 ${FRONTEND_INFO}\
-  Packaging:                      ${lyx_use_packaging}\n\
-  LyX binary dir:                 ${real_bindir}\n\
-  LyX files dir:                  ${real_datadir}\n"
-
+  Packaging:                    ${lyx_use_packaging}\n\
+  LyX binary dir:               ${real_bindir}\n\
+  LyX files dir:                ${real_pkgdatadir}\n"
 
 AC_SUBST(VERSION_INFO)
 AC_SUBST(RPM_FRONTEND)
@@ -335,6 +242,7 @@ AC_SUBST(AM_CPPFLAGS)
 AC_SUBST(AM_CXXFLAGS)
 AC_SUBST(AM_CFLAGS)
 AC_SUBST(AM_LDFLAGS)
+AC_SUBST(real_pkgdatadir)
 
 ## Some config.h stuff
 
@@ -366,90 +274,110 @@ extern "C"
 char * strerror(int n);
 #endif
 
-#ifdef HAVE_MKSTEMP
-#ifndef HAVE_DECL_MKSTEMP
-#if defined(__cplusplus)
-extern "C"
-#endif
-int mkstemp(char*);
-#endif
-#endif
-
-#ifdef __EMX__
-#include "support/os2_defines.h"
-#endif
-
 #if defined(HAVE_OSTREAM) && defined(HAVE_LOCALE) && defined(HAVE_SSTREAM)
-#define USE_BOOST_FORMAT 1
+#  define USE_BOOST_FORMAT 1
 #else
-#define USE_BOOST_FORMAT 0
+#  define USE_BOOST_FORMAT 0
 #endif
 
 #define BOOST_USER_CONFIG <config.h>
 
-#if defined(ENABLE_ASSERTIONS)
-#define BOOST_ENABLE_ASSERT_HANDLER 1
-#else
-#define BOOST_DISABLE_ASSERTS 1
+#if !defined(ENABLE_ASSERTIONS)
+#  define BOOST_DISABLE_ASSERTS 1
 #endif
+#define BOOST_ENABLE_ASSERT_HANDLER 1
 
 #define BOOST_DISABLE_THREADS 1
 #define BOOST_NO_WREGEX 1
 #define BOOST_NO_WSTRING 1
 
+// TR1 regex not supported in GCC <= 4.5
+#ifndef LYX_USE_TR1
+#  if __GNUC__ == 4 
+#    define LYX_USE_TR1
+#  endif
+#endif
+
 #ifdef __CYGWIN__
-#define BOOST_POSIX 1
+#  define NOMINMAX
+#  define BOOST_POSIX 1
+#  define BOOST_POSIX_API 1
+#  define BOOST_POSIX_PATH 1
+#endif
+
+/*
+ * 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 do not 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_SUBDIRS(lib)
-AC_CONFIG_FILES([Makefile  m4/Makefile \
-       boost/Makefile \
-       boost/libs/Makefile \
-       boost/libs/filesystem/Makefile \
-       boost/libs/filesystem/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/lyx.spec \
-       lib/Makefile \
-       lib/doc/Makefile \
-       lib/lyx2lyx/Makefile \
-       intl/Makefile \
-       po/Makefile.in \
-       sourcedoc/Doxyfile \
-       sourcedoc/Makefile \
-       src/client/Makefile \
-       src/Makefile \
-       src/version.C-tmp:src/version.C.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/xforms/Makefile \
-       src/frontends/xforms/lyx_forms.h-tmp:src/frontends/xforms/lyx_forms.h.in \
-       src/frontends/xforms/lyx_xpm.h-tmp:src/frontends/xforms/lyx_xpm.h.in \
-       src/frontends/xforms/forms/Makefile \
-       src/frontends/gtk/Makefile \
-       src/frontends/gtk/gimages/Makefile \
-       src/frontends/gtk/glade/Makefile \
-       src/frontends/qt2/Makefile \
-       src/frontends/qt2/moc/Makefile \
-       src/frontends/qt2/ui/Makefile \
-       src/frontends/qt2/ui/moc/Makefile \
+MSYS_AC_CANONICAL_PATH(lyx_abs_top_srcdir, ${srcdir})
+MSYS_AC_CANONICAL_PATH(lyx_abs_installed_localedir, ${real_localedir})
+MSYS_AC_CANONICAL_PATH(lyx_abs_installed_datadir, ${real_pkgdatadir})
+
+AC_DEFINE_UNQUOTED([LYX_ABS_TOP_SRCDIR],
+	"${lyx_abs_top_srcdir}", [Top source directory])
+AC_DEFINE_UNQUOTED([LYX_ABS_INSTALLED_LOCALEDIR],
+	"${lyx_abs_installed_localedir}",[Hard coded locale directory])
+AC_DEFINE_UNQUOTED([LYX_ABS_INSTALLED_DATADIR],
+	"${lyx_abs_installed_datadir}",[Hard system support directory])
+AC_DEFINE_UNQUOTED([PROGRAM_SUFFIX],
+	"${version_suffix}",[Program version suffix])
+
+AC_DEFINE_UNQUOTED([LYX_DATE],"$LYX_DATE",[Date of release])
+AC_DEFINE_UNQUOTED([VERSION_INFO],"$VERSION_INFO",[Full version info])
+AC_DEFINE_UNQUOTED([LYX_DIR_VER],"$lyx_dir_ver",[Versioned env var for system dir])
+AC_DEFINE_UNQUOTED([LYX_USERDIR_VER],"$lyx_userdir_ver",[Versioned env var for user dir])
+AC_DEFINE_UNQUOTED([LYX_MAJOR_VERSION],$lyx_major,[Major version number])
+AC_DEFINE_UNQUOTED([LYX_MINOR_VERSION],$lyx_minor,[Minor version number])
+AC_DEFINE_UNQUOTED([LYX_RELEASE_LEVEL],$lyx_release,[Release version number])
+AC_DEFINE_UNQUOTED([LYX_RELEASE_PATCH],$lyx_patch,[Patch version number])
+
+AC_CONFIG_FILES([Makefile \
+      lyx.1:lyx.1in \
+      boost/Makefile \
+      config/Makefile \
+      development/Makefile \
+      development/MacOSX/Makefile \
+      development/MacOSX/Info.plist \
+      development/MacOSX/lyxrc.dist \
+      development/MacOSX/spotlight/Makefile \
+      development/cygwin/Makefile \
+      development/cygwin/lyxrc.dist \
+      development/lyx.spec \
+      intl/Makefile \
+      lib/Makefile \
+      lib/doc/Makefile \
+      lib/lyx2lyx/lyx2lyx_version.py \
+      lib/lyx2lyx/Makefile \
+      m4/Makefile \
+      po/Makefile.in \
+      sourcedoc/Doxyfile \
+      sourcedoc/Makefile \
+      src/client/Makefile \
+      src/client/lyxclient.1:src/client/lyxclient.1in \
+      src/Makefile \
+      src/tex2lyx/Makefile \
+      src/tex2lyx/tex2lyx.1:src/tex2lyx/tex2lyx.1in \
+      src/support/Makefile \
+      src/frontends/Makefile \
+      src/frontends/qt4/Makefile
 ])
 
+
 AC_OUTPUT
+
 # show version information
 echo
 printf "$VERSION_INFO"