recognize a few "well known functions"

[lyx.git] / configure.in

diff --git a/configure.in b/configure.in
index 5293f98088f2eac701a8a6ee3ee165a28c221728..409f08939779cdf57321bfce7b968d318a9993f5 100644 (file)
--- 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
@@ -71,10 +74,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 +262,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 +329,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 +341,7 @@ AC_OUTPUT([Makefile \
        po/Makefile.in \
        sourcedoc/Doxyfile \
        src/Makefile \
+       src/version.C \
        src/mathed/Makefile \
        src/graphics/Makefile \
        src/insets/Makefile \