handle LFUN_ESCAPE properly in math insets (i.e. go up one level of

[lyx.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 22f641f306515fac38a0c0de11add4af5b14fbf0..d0a64ccdb00c4494d21fbb28eefa3e85f34c66a1 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -78,7 +78,7 @@ AC_ARG_ENABLE(assertions,
        enable_assertions=no;
     fi;])
 if test "x$enable_assertions" = xyes ; then
-   lyx_flags="$lyx_flags assertions"
+   lyx_flags="assertions $lyx_flags"
    AC_DEFINE(ENABLE_ASSERTIONS,1,
     [Define if you want assertions to be enabled in the code])
 fi
@@ -112,7 +112,7 @@ if test x$lyx_use_aiksaurus != xno; then
 AC_CHECK_LIB(Aiksaurus, main,
        [AC_DEFINE(HAVE_LIBAIKSAURUS,1,[Define this if you have the AikSaurus library])
         AIKSAURUS_LIBS="-lAiksaurus"
-        lyx_flags="$lyx_flags aiksaurus"
+        lyx_flags="aiksaurus $lyx_flags"
        ])
 AC_CHECK_HEADER(Aiksaurus.h,[
   ac_cv_header_aiksaurus_h=yes
@@ -152,6 +152,7 @@ esac
 dnl if the gtk frontend has been specified, then xforms is needed too
 if echo $FRONTENDS | grep gtk | grep -v xforms ; then
   FRONTENDS="xforms $FRONTENDS"
+  noxformsbin=yes
 fi
 
 dnl The code below is not in a macro, because this would cause big
@@ -160,7 +161,9 @@ for frontend in $FRONTENDS ; do
   case "$frontend" in
     xforms)
          XFORMS_DO_IT_ALL
-         FRONTENDS_PROGS="$FRONTENDS_PROGS lyx-xforms\$(EXEEXT)"
+         if test -z "$noxformsbin" ; then
+           FRONTENDS_PROGS="$FRONTENDS_PROGS lyx-xforms\$(EXEEXT)"
+         fi
          FRONTENDS_SUBDIRS="$FRONTENDS_SUBDIRS xforms"
          RPM_FRONTEND="xforms"
          FRONTEND_INFO="${FRONTEND_INFO}\
@@ -269,7 +272,7 @@ if test $use_compression=true ; then
        AC_CHECK_LIB(z, gzopen,[use_compression=true;LIBS="$LIBS -lz"], use_compression=false)
        if test $use_compression = true ; then
                AC_DEFINE(USE_COMPRESSION, 1, [Define as 1 if you want to support compressed files.])
-               lyx_flags="$lyx_flags compression"
+               lyx_flags="compression $lyx_flags"
        fi
 fi
 AM_CONDITIONAL(USE_COMPRESSION, test x$use_compression = xtrue)
@@ -301,12 +304,15 @@ real_bindir=`eval "echo \`eval \"echo ${bindir}\"\`"`
 real_datadir=`eval "echo \`eval \"echo ${datadir}/${PACKAGE}\"\`"`
 VERSION_INFO="Configuration\n\
   Host type:                      ${host}\n\
-  Special build flags:           ${lyx_flags}\n\
-  C   Compiler:                   ${CC}\n\
+  Special build flags:            ${lyx_flags}\n\
+  C   Compiler:                   ${CC} ${CC_VERSION}\n\
+  C   Compiler LyX flags:         ${AM_CPPFLAGS} ${AM_CFLAGS}\n\
   C   Compiler flags:             ${CPPFLAGS} ${CFLAGS}\n\
   C++ Compiler:                   ${CXX} ${CXX_VERSION}\n\
+  C++ Compiler LyX flags:         ${AM_CPPFLAGS} ${AM_CXXFLAGS}\n\
   C++ Compiler flags:             ${CPPFLAGS} ${CXXFLAGS}\n\
-  Linker flags:                   ${LDFLAGS}\n\
+  Linker flags:                   ${AM_LDFLAGS}\n\
+  Linker user flags:              ${LDFLAGS}\n\
 ${FRONTEND_INFO}\
   Packaging:                      ${lyx_use_packaging}\n\
   LyX binary dir:                 ${real_bindir}\n\
@@ -315,6 +321,10 @@ ${FRONTEND_INFO}\
 
 AC_SUBST(VERSION_INFO)
 AC_SUBST(RPM_FRONTEND)
+AC_SUBST(AM_CPPFLAGS)
+AC_SUBST(AM_CXXFLAGS)
+AC_SUBST(AM_CFLAGS)
+AC_SUBST(AM_LDFLAGS)
 
 ## Some config.h stuff