X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=configure.in;h=84f5caa80bd33518f9970b9c3f6e510e11fbbdaf;hb=4167bf64069e83132e86754e9a778bcca22cd4cf;hp=5293f98088f2eac701a8a6ee3ee165a28c221728;hpb=bc188c5dab9b3864407771c68b565cf53c3cbe38;p=lyx.git

diff --git a/configure.in b/configure.in
index 5293f98088..84f5caa80b 100644
--- a/configure.in
+++ b/configure.in
@@ -6,7 +6,10 @@ AM_CONFIG_HEADER(src/config.h)
 dnl This is a trick to make autoheader do the right thing
 dnl AM_CONFIG_HEADER(src/config.h)
 AC_CONFIG_AUX_DIR(config)
-LYX_GET_VERSION(${srcdir}/src/version.h)
+
+PACKAGE=lyx${program_suffix}
+VERSION="1.2.0cvs"
+LYX_CHECK_VERSION
 
 AC_CANONICAL_SYSTEM
 AC_VALIDATE_CACHE_SYSTEM_TYPE
@@ -19,8 +22,6 @@ AM_INIT_AUTOMAKE($lyxname, $VERSION)
 # This is needed by GNU gettext
 ALL_LINGUAS="ca cs da de es eu fi fr he hu it nl no pl pt ro ru sl sv tr wa"
 
-AC_PREFIX_PROGRAM(lyx)
-
 # fix the value of the prefixes.
 test "x$prefix" = xNONE && prefix=$ac_default_prefix
 test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
@@ -71,10 +72,9 @@ case "$lyx_use_frontend" in
 esac 
 
 ### Check for a C++ compiler
-AC_LANG_CPLUSPLUS
 LYX_PROG_CXX
-AC_PROG_CXXCPP
 ### Some checks on what the C++ compiler can(not) do
+AC_LANG_CPLUSPLUS
 dnl we do not need that currently (and probably all our supported
 dnl compiler allow that)  
 dnl LYX_CXX_PARTIAL
@@ -260,7 +260,7 @@ AC_LANG_CPLUSPLUS
 # some standard header files
 AC_HEADER_DIRENT
 AC_HEADER_MAJOR
-AC_CHECK_HEADERS(sys/time.h sys/types.h sys/select.h strings.h)
+AC_CHECK_HEADERS(sys/time.h sys/types.h sys/select.h strings.h locale.h)
 
 # some annoying header files
 #LYX_PATH_HEADER(stl_string_fwd.h)
@@ -327,7 +327,7 @@ ${FRONTEND_INFO}\
   LyX files dir:                  ${real_datadir}\n
 `
 
-AC_DEFINE_UNQUOTED(VERSION_INFO, "${VERSION_INFO}", Version information on the current build of LyX)
+AC_SUBST(VERSION_INFO)
 
 ### Finish the work.
 AC_CONFIG_SUBDIRS(sigc++ lib lib/reLyX)
@@ -339,6 +339,7 @@ AC_OUTPUT([Makefile \
        po/Makefile.in \
        sourcedoc/Doxyfile \
        src/Makefile \
+       src/version.C \
        src/mathed/Makefile \
        src/graphics/Makefile \
        src/insets/Makefile \