fixes to -version stuff

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@2732 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/ChangeLog b/ChangeLog
index 94a3ad03192d59d5ed805decaafeaa1b035d089c..bf2edac9c0bdc2cccf8b1387f74cbe65919fd1c1 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2001-09-12  Jean-Marc Lasgouttes  <Jean-Marc.Lasgouttes@inria.fr>
+
+       * configure.in: do not set FRONTENDS to "xforms" when frontend is
+       xforms; fix the use of "cat <<EOF ... EOF" (bugs introduced by
+       last checkin)
+
 2001-09-10  Jean-Marc Lasgouttes  <Jean-Marc.Lasgouttes@inria.fr>
 
        * lyxinclude.m4: 

diff --git a/configure.in b/configure.in
index d7fe7996900244039f3a6806d7aaa72ddde9fa66..5293f98088f2eac701a8a6ee3ee165a28c221728 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -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,,
@@ -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
@@ -320,11 +321,11 @@ 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)