]> git.lyx.org Git - lyx.git/blobdiff - configure.ac
Simplify
[lyx.git] / configure.ac
index bfd0412668d00ba549c3249c88a6fe98f9760388..e3fcb8285b6ea48c292d2d7a9cd71a802466aa9a 100644 (file)
@@ -1,16 +1,19 @@
 dnl Process with autoconf to generate configure script   -*- sh -*-
 
-AC_INIT(LyX,1.5.0beta2,[lyx-devel@lists.lyx.org],[lyx])
-AC_SUBST(LYX_DATE, ["Sat, April 21, 2007"])
-AC_PREREQ(2.52)
-AC_CONFIG_SRCDIR(src/main.C)
-AC_CONFIG_HEADERS([src/config.h])
+AC_INIT([LyX],[2.4.0~RC1.devel],[lyx-devel@lists.lyx.org],[lyx])
+AC_PRESERVE_HELP_ORDER
+# Use ISO format only. The frontend needs to parse this
+AC_SUBST(LYX_DATE, ["2023-06-26"])
+AC_PREREQ([2.65])
+AC_CONFIG_SRCDIR(src/main.cpp)
+AC_CONFIG_HEADERS([config.h])
 
 AC_CONFIG_AUX_DIR(config)
 
 # First check the version
 LYX_CHECK_VERSION
 LYX_VERSION_SUFFIX
+LYX_CHECK_QT6
 # Check how the files should be packaged
 AC_CANONICAL_TARGET
 LYX_USE_PACKAGING
@@ -18,92 +21,53 @@ LYX_USE_PACKAGING
 # 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
-
+AM_SILENT_RULES([yes])
+# Automake is pulling the historical V7 format. This tar format supports
+# file names only up to 99 characters. tar-ustar selects the ustar format defined
+# by POSIX 1003.1-1988. This format is believed to be old enough to be portable.
 save_PACKAGE=$PACKAGE
-AM_INIT_AUTOMAKE([foreign dist-bzip2 tar-ustar no-define 1.9])
+AM_INIT_AUTOMAKE([foreign dist-xz no-define 1.14 tar-ustar subdir-objects])
 PACKAGE=$save_PACKAGE
 
 ### Set the execute permissions of the various scripts correctly
-for file in config/install-sh config/mkinstalldirs ; 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(2.3,, :)
-
-# 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}'
-
-### we will also need a C compiler to compile GNU gettext
-AC_PROG_CC
+# Find a suitable python interpreter
+LYX_PATH_PYTHON23([2.7.0], [3.5.0])
+# do the usual python setup stuff
+AM_PATH_PYTHON
 
-### 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
+# Tools for creating libraries (note that we do not use libtool)
+AM_PROG_AR
+AC_PROG_RANLIB
+dnl Recent debian/ubuntu (at least) have built 'ar' so that deterministic mode is the default.
+dnl This means that it does not make sense to use the 'u' flag (default ARFLAGS is 'cru').
+AC_SUBST([ARFLAGS], [cr])
 
 ### Check for a C++ compiler
+dnl We have to do weird tricks so that autoconf does not touch CXXFLAGS even
+dnl if it is not set. We do not use autoconf defaults.
+lyx_has_CXXFLAGS=${CXXFLAGS+yes}
+if ! test "$lyx_has_CXXFLAGS" = yes; then
+  dnl set to a dummy value so that AC_PROG_CXX does not try to set CXXFLAGS
+  CXXFLAGS=" "
+fi
 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])
+if ! test "$lyx_has_CXXFLAGS" = yes; then
+  unset CXXFLAGS
 fi
+AC_LANG(C++)
 
-### 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)
@@ -118,204 +82,177 @@ test ! x"$lyx_cppflags" = x && CPPFLAGS="$lyx_cppflags $CPPFLAGS"
 ### Add both includes and libraries
 LYX_WITH_DIR([extra-prefix],[extra lib+include directory],extra_prefix, NONE, ${prefix})
 LYX_LOOP_DIR($lyx_cv_extra_prefix,[
-LYX_ADD_INC_DIR(CPPFLAGS,$dir/include)
-  LYX_ADD_LIB_DIR(LDFLAGS,$dir/lib)])
+  LYX_ADD_INC_DIR(CPPFLAGS,$dir/include)
+  LYX_ADD_LIB_DIR(LDFLAGS,$dir/lib)
+])
 
 ### 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)
+AC_CHECK_LIB(ole32, main)
 
-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)
-
+LYX_USE_INCLUDED_NOD
 LYX_USE_INCLUDED_BOOST
 
+### we need to know the byte order for unicode conversions
+AC_C_BIGENDIAN
+
+# Nice to have when an assertion triggers
+LYX_CHECK_CALLSTACK_PRINTING
+
+# C++14 only
+LYX_CHECK_DEF(make_unique, memory, [using std::make_unique;])
+
 # Needed for our char_type
 AC_CHECK_SIZEOF(wchar_t)
 
-### Setup libtool
-dnl Dirty trick ahead: disable libtool checking for a fortran compiler
-dnl see http://permalink.gmane.org/gmane.comp.gnu.libtool.general/6699
-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_LIBTOOL_WIN32_DLL
-#AM_PROG_LIBTOOL
-LYX_PROG_LIBTOOL
-
-### 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
+# Taken from gettext, needed for libiconv
+AC_CACHE_CHECK([for wchar_t], [gt_cv_c_wchar_t],
+   [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <stddef.h>
+      wchar_t foo = (wchar_t)'\0';]], [[]])],[gt_cv_c_wchar_t=yes],[gt_cv_c_wchar_t=no])])
+if test $gt_cv_c_wchar_t = yes; then
+  AC_DEFINE([HAVE_WCHAR_T], [1], [Define if you have the 'wchar_t' type.])
+  HAVE_WCHAR_T=1
+else
+  HAVE_WCHAR_T=0
+fi
+AC_SUBST([HAVE_WCHAR_T])
+
+# Needed for Mingw-w64
+AC_TYPE_LONG_LONG_INT
+
+### We need iconv for unicode support (Qt frontend requires it too)
+LYX_USE_INCLUDED_ICONV
 
-### check which frontend we want to use
+### check for compression support
+LYX_USE_INCLUDED_ZLIB
 
+### check whether we build and install the supplied dtl programs
+LYX_BUILD_INCLUDED_DTL
+
+### check for file magic support (currently optional)
+AC_CHECK_HEADERS(magic.h,
+ [AC_CHECK_LIB(magic, magic_open, [LIBS="$LIBS -lmagic"],
+  LYX_WARNING([cannot find libmagic. Please check that the libmagic library
+   is correctly installed on your system.
+   Falling back to builtin file format detection.]))],
+ [LYX_WARNING([cannot find magic.h. Please check that the libmagic library
+   is correctly installed on your system.
+   Falling back to builtin file format detection.])])
+
+### setup the qt frontend.
 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.
-for frontend in $FRONTENDS ; do
-  case "$frontend" in
-    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 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 "$UIC4"; then
-           LYX_ERROR([uic 4 binary not found !])
-         fi
-         if test -z "$QT4_LIB"; then
-           LYX_ERROR([qt 4 library not found !])
-         fi
-      ;;
-    *)
-         LYX_ERROR(Unknown frontend '$frontend');;
-  esac
-done
+QT_DO_IT_ALL([5.0.0])
+AC_SUBST([FRONTENDS_SUBDIRS], [qt])
+FRONTEND_INFO="${FRONTEND_INFO}\
+  Qt Frontend:\n\
+      Qt version:\t   ${QTLIB_VERSION}\n"
 
 # fix the value of the prefixes.
 test "x$prefix" = xNONE && prefix=$default_prefix
 test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
 if echo $prefix |grep ' ' >/dev/null 2>/dev/null ; then
-  LYX_WARNING([The installation prefix \"${prefix}\" contains a space, which
+  LYX_WARNING([the installation prefix \"${prefix}\" contains a space, which
    causes problems with the Makefiles. The installation will be done in
    directory \"`pwd`/installprefix\" instead. Please move its contents to
    the right place after installation.])
   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])
+### Setup po directory
+AM_NLS
+if test $USE_NLS = "yes" ; then
+  AC_DEFINE(ENABLE_NLS, 1,
+    [Define to 1 if translation of program messages to the user's native language
+   is requested.])dnl'
 fi
-
-### Setup GNU gettext
-dnl GNU gettext is written in C
-AC_LANG_PUSH(C)
-AM_GNU_GETTEXT
-AC_LANG_POP(C)
+AM_PO_SUBDIRS
 
 # 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)
-
-# some standard structures
-AC_HEADER_STAT
-AC_HEADER_TIME
+AC_CHECK_HEADERS(sys/time.h sys/types.h sys/select.h locale.h utime.h sys/utime.h)
 
 # some standard types
 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 lockf lstat mkfifo open _open pclose _pclose popen _popen readlink putenv setenv strerror unsetenv)
 # Check the form of mkdir()
 AC_FUNC_MKDIR
+AC_FUNC_SELECT_ARGTYPES
 
-# 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
-dnl possible with the compiler which will use the functions (JMarc)
-AC_LANG_PUSH(C)
-AC_CHECK_FUNCS(chmod close _close getpid _getpid lstat mkfifo mkstemp mktemp open _open pclose _pclose popen _popen readlink)
-AC_LANG_POP(C)
+if test "$lyx_use_packaging" = "macosx" ; then
+  LYX_CHECK_MACOS_DEPLOYMENT_TARGET
+fi
 
 LYX_CHECK_SPELL_ENGINES
+LYX_USE_INCLUDED_MYTHES
+
+LYX_CHECK_WITH_SAXON
+LYX_CHECK_WITH_XSLT_SHEETS
 
 lyx_client_subdir=true
-AC_LANG_PUSH(C)
 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_SEARCH_LIBS([socket], [socket network], [],
      [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)
 
-AC_FUNC_SELECT_ARGTYPES
+lyx_win_res=false;
+case ${host} in
+    *mingw*|*cygwin*) lyx_win_res=true;;
+    *freebsd*) AC_SEARCH_LIBS(backtrace_symbols, [execinfo])
+esac
+if test "x$lyx_win_res" = "xtrue"; then
+    AC_CHECK_TOOL(RC, windres,)
+    if test -z "$RC"; then
+      AC_MSG_ERROR([Could not find a resource compiler])
+    fi
+fi
+AM_CONDITIONAL(LYX_WIN_RESOURCE, $lyx_win_res)
+LYX_SET_VERSION_INFO
+
 
 ### Some information on what just happened
 real_bindir=`eval "echo \`eval \"echo ${bindir}\"\`"`
 real_pkgdatadir=`eval "echo \`eval \"echo \\\`eval \\\"echo ${pkgdatadir}\\\"\\\`\"\`"`
 real_localedir=`eval "echo \`eval \"echo ${datadir}/locale\"\`"`
+test -z "${lyx_included_libs}" && lyx_included_libs="(none)"
 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\
+  Bundled libraries:       ${lyx_included_libs}\n\
+  C++ Compiler:            ${CXX} ${CXX_VERSION}\n\
+  C++ Compiler flags:      ${AM_CPPFLAGS} ${AM_CXXFLAGS}\n\
+  C++ Compiler user 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_pkgdatadir}\n"
-
-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})
+  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)
 AC_SUBST(AM_CPPFLAGS)
 AC_SUBST(AM_CXXFLAGS)
-AC_SUBST(AM_CFLAGS)
 AC_SUBST(AM_LDFLAGS)
-AC_SUBST(LYX_ABS_TOP_SRCDIR)
-AC_SUBST(LYX_ABS_INSTALLED_LOCALEDIR)
-AC_SUBST(LYX_ABS_INSTALLED_DATADIR)
+AC_SUBST(real_pkgdatadir)
 
 ## Some config.h stuff
 
@@ -347,21 +284,6 @@ 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
-
-#if defined(HAVE_OSTREAM) && defined(HAVE_LOCALE) && defined(HAVE_SSTREAM)
-#  define USE_BOOST_FORMAT 1
-#else
-#  define USE_BOOST_FORMAT 0
-#endif
-
 #define BOOST_USER_CONFIG <config.h>
 
 #if !defined(ENABLE_ASSERTIONS)
@@ -374,66 +296,102 @@ int mkstemp(char*);
 #define BOOST_NO_WSTRING 1
 
 #ifdef __CYGWIN__
+#  define _DEFAULT_SOURCE
+#  define NOMINMAX
 #  define BOOST_POSIX 1
 #  define BOOST_POSIX_API 1
 #  define BOOST_POSIX_PATH 1
 #endif
 
-#if defined(HAVE_NEWAPIS_H)
-#  define WANT_GETFILEATTRIBUTESEX_WRAPPER 1
+#ifdef __sparc__
+#  ifndef __BIG_ENDIAN__
+#    define __BIG_ENDIAN__ 1
+#  endif
 #endif
 
 #if defined(HAVE_WCHAR_T) && SIZEOF_WCHAR_T == 4
-#  define LIBC_WCTYPE_USES_UCS4
+#  define USE_WCHAR_T
 #endif
 
 #endif
 ])
 
-### Finish the work.
-AC_CONFIG_FILES([Makefile  m4/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/lyx.spec \
-       lib/Makefile \
-       lib/doc/Makefile \
-       lib/lyx2lyx/lyx2lyx_version.py \
-       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/controllers/tests/Makefile \
-       src/frontends/qt4/Makefile \
-       src/frontends/qt4/ui/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 \
+      3rdparty/Makefile \
+      3rdparty/boost/Makefile \
+      3rdparty/dtl/Makefile \
+      3rdparty/hunspell/Makefile \
+      3rdparty/mythes/Makefile \
+      3rdparty/nod/Makefile \
+      3rdparty/libiconv/Makefile \
+      $ICONV_ICONV_H_IN \
+      3rdparty/zlib/Makefile \
+      autotests/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 \
+      lib/lyx.desktop-temp:lib/lyx.desktop.in
+      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/convert/Makefile \
+      src/support/Makefile \
+      src/frontends/Makefile \
+      src/frontends/qt/Makefile
 ])
 
+
 AC_OUTPUT
+
 # show version information
 echo
 printf "$VERSION_INFO"
 echo
 
-# Display a final warning if there has been a LYX_ERROR
-LYX_CHECK_ERRORS
+# Display a final warning if there has been a LYX_WARNING
+LYX_CHECK_WARNINGS
+
+cat <<EOF
+Configuration of LyX was successful.
+Type 'make' to compile the program,
+and then 'make install' to install it.
+EOF