J�rgen's first go at tooltips etc...

[lyx.git] / configure.in

diff --git a/configure.in b/configure.in
index d7fe7996900244039f3a6806d7aaa72ddde9fa66..1a495887071871027f125c6c8c0a1d7f00070c72 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
@@ -17,9 +20,7 @@ AM_INIT_AUTOMAKE($lyxname, $VERSION)
 
 # The list of languages known to LyX
 # 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)
+ALL_LINGUAS="ca cs da de es eu fi fr he hu it nl no pl pt ro ru sk sl sv tr wa"
 
 # fix the value of the prefixes.
 test "x$prefix" = xNONE && prefix=$ac_default_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
@@ -112,12 +112,12 @@ dnl -lc and -lm as args to the compiler
 AC_CHECK_LIB(m, sin)
 AC_CHECK_LIB(c, fopen)
 AC_ARG_WITH(aiksaurus,
-  [  --without-aiksaurus     do not use the AikSaurus library],
+  [  --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_CHECK_LIB(Aiksaurus, main,
        [AC_DEFINE(HAVE_LIBAIKSAURUS,,[Define this if you have the AikSaurus library])
-        AIKSAURUS_LIBS="-lAikSaurus -lbz2"
+        AIKSAURUS_LIBS="-lAiksaurus -lbz2"
        ],,"-lbz2")
 fi 
 AC_SUBST(AIKSAURUS_LIBS)
@@ -161,8 +161,8 @@ LYX_WITH_SIGC
 CHECK_WITH_PSPELL
 
 ### Check for X libraries
-# Check for the pt library (for SCO, needed for X)
-AC_CHECK_LIB(pt,ptsname,X_EXTRA_LIBS="-lpt $X_EXTRA_LIBS")
+dnl # Check for the pt library (for SCO, needed for X)
+dnl AC_CHECK_LIB(pt,ptsname,X_EXTRA_LIBS="-lpt $X_EXTRA_LIBS")
 # The real thing.
 AC_PATH_XTRA
 LIBS="$X_PRE_LIBS $LIBS $X_LIBS -lX11 $X_EXTRA_LIBS"
@@ -185,7 +185,8 @@ dnl The code below is not in a macro, because this would cause big
 dnl problems with the AC_REQUIRE contained in KDE_DO_IT_ALL.  
 case "$lyx_use_frontend" in 
   xforms) 
-    FRONTEND="xforms"
+  # for now don't set it for xforms as this is always entered
+    FRONTEND=""
     FRONTEND_GUILIB="xforms/libxforms.la";;
   gnome)    
     AM_PATH_GTKMM(1.2.1,,
@@ -207,8 +208,8 @@ dnl Ensure gnome-config is available...
     FRONTEND="gnome"
     FRONTEND_GUILIB="gnome/libgnome.la"
     FRONTEND_LDFLAGS="\$(GNOMEMM_LIBDIR)"
-    FRONTEND_INCLUDES="-I\${srcdir}/gnome \$(GNOMEMM_INCLUDEDIR) \$(GTKMM_CFLAGS)"
-    FRONTEND_LIBS="\$(GNOMEMM_LIBS) \$(GTKMM_LIBS) `gnome-config --libs libglade`";;
+    FRONTEND_INCLUDES="-I\${srcdir}/gnome \$(GNOMEMM_INCLUDEDIR) \$(GTKMM_CFLAGS) `gnome-config --cflags libglade gnomeui`"
+    FRONTEND_LIBS="\$(GNOMEMM_LIBS) \$(GTKMM_LIBS) `gnome-config --libs libglade gnomeui`";;
   qt2)
     QT2_DO_IT_ALL
     FRONTEND="qt2"
@@ -229,7 +230,7 @@ LYX_PATH_XFORMS
 FRONTEND_INFO=`cat <<EOF
     libXpm version:               ${XPM_VERSION}\n\
     libforms version:             ${XFORMS_VERSION}\n
-EOF`
+`
 
 AC_SUBST(LYX_LIBS)
 else
@@ -259,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)
@@ -320,13 +321,13 @@ Configuration\n\
   C++ Compiler:                   ${CXX} ${CXX_VERSION}\n\
   C++ Compiler flags:             ${CXXFLAGS}\n\
   Linker flags:                   ${LDFLAGS}\n\
-  Frontend:                       ${FRONTEND}\n\
+  Frontend:                       ${lyx_use_frontend}\n\
 ${FRONTEND_INFO}\
   LyX binary dir:                 ${real_bindir}\n\
   LyX files dir:                  ${real_datadir}\n
-EOF`
+`
 
-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)
@@ -338,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 \