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

diff --git a/configure.in b/configure.in
index 0823931ca4..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
@@ -115,11 +115,10 @@ 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(bz2, main)
 AC_CHECK_LIB(AikSaurus, main, 
 	[AC_DEFINE(HAVE_LIBAIKSAURUS,,[Define this if you have the AikSaurus library])
-	 AIKSAURUS_LIBS="-lAikSaurus"
-	])
+	 AIKSAURUS_LIBS="-lAikSaurus -lbz2"
+	],,"-lbz2")
 fi 
 AC_SUBST(AIKSAURUS_LIBS)
 
@@ -228,6 +227,11 @@ if test "$have_x" = yes ; then
 # version numbers... 
 LYX_PATH_XPM
 LYX_PATH_XFORMS
+FRONTEND_INFO=`cat <<EOF
+    libXpm version:               ${XPM_VERSION}\n\
+    libforms version:             ${XFORMS_VERSION}\n
+`
+
 AC_SUBST(LYX_LIBS)
 else
 LYX_ERROR(dnl
@@ -256,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)
@@ -305,6 +309,26 @@ AC_REPLACE_FUNCS(strerror atexit)
 
 LYX_CHECK_DECL_HDRS(mkstemp,[unistd.h stdlib.h])
 
+### Some information on what just happened
+real_bindir=`eval "echo \`eval \"echo ${bindir}\"\`"`
+real_datadir=`eval "echo \`eval \"echo ${datadir}/${PACKAGE}\"\`"`
+VERSION_INFO=`cat <<EOF
+Configuration\n\
+  Host type:                      ${host_alias}\n\
+  Special build flags:           ${lyx_flags}\n\
+  C   Compiler:                   ${CC}\n\
+  C   Compiler flags:             ${CFLAGS}\n\
+  C++ Compiler:                   ${CXX} ${CXX_VERSION}\n\
+  C++ Compiler flags:             ${CXXFLAGS}\n\
+  Linker flags:                   ${LDFLAGS}\n\
+  Frontend:                       ${lyx_use_frontend}\n\
+${FRONTEND_INFO}\
+  LyX binary dir:                 ${real_bindir}\n\
+  LyX files dir:                  ${real_datadir}\n
+`
+
+AC_SUBST(VERSION_INFO)
+
 ### Finish the work.
 AC_CONFIG_SUBDIRS(sigc++ lib lib/reLyX)
 AC_OUTPUT([Makefile \
@@ -315,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 \
@@ -324,23 +349,16 @@ AC_OUTPUT([Makefile \
        src/frontends/controllers/Makefile \
        src/frontends/xforms/Makefile \
        src/frontends/qt2/Makefile \
+       src/frontends/qt2/moc/Makefile \
+       src/frontends/qt2/ui/Makefile \
+       src/frontends/qt2/ui/moc/Makefile \
        src/frontends/gnome/Makefile \
 ])
 
-
-cat <<EOF
-
-Configuration:
-  Source code location:       ${srcdir}
-  C++ Compiler:                   ${CXX}
-  C++ Compiler flags:             ${CXXFLAGS}
-  C   Compiler:                   ${CC}
-  C   Compiler flags:             ${CFLAGS}
-  LyX binary dir:             `eval "echo \`eval \"echo ${bindir}\"\`"`
-  LyX files dir:              `eval "echo \`eval \"echo ${datadir}/${PACKAGE}\"\`"`
-  Special flags:              ${lyx_flags}
-
-EOF
+# show version information
+echo
+printf "$VERSION_INFO" 
+echo
 
 # Display a final warning if there has been a LYX_ERROR
 LYX_CHECK_ERRORS