The Character Style and XML short element inset.

[lyx.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index b4fefe0a7c6f0fd8f8c4e893c64bce140c17e173..25c22a1dd5d0a6e2d2ee0bb3d1963b03ac34be9a 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -74,19 +74,6 @@ dnl LYX_CXX_RTTI
 AC_CHECK_HEADERS(ostream istream sstream locale limits ios)
 LYX_CXX_STL_MODERN_STREAMS
 
-###
-AC_ARG_WITH(included-string,
-    AC_HELP_STRING([--with-included-string],[use std::string through namespace lyx]),
-       [lyx_cv_with_included_string=$withval
-       AC_MSG_RESULT([$with_included_string])],
-       [AC_CACHE_CHECK([],lyx_cv_with_included_string,[lyx_cv_with_included_string=no])])
-if test x$lyx_cv_with_included_string = xyes ; then
-    AC_DEFINE(USE_INCLUDED_STRING, 1,
-       [Define to use std::string through namespace lyx.])
-    lyx_flags="$lyx_flags included-string"
-fi
-
-
 ### and now some special lyx flags.
 AC_ARG_ENABLE(assertions,
   AC_HELP_STRING([--enable-assertions],[add runtime sanity checks in the program]),,
@@ -184,8 +171,8 @@ for frontend in $FRONTENDS ; do
          RPM_FRONTEND_DEPS='libforms >= 1.0'
          FRONTEND_INFO="${FRONTEND_INFO}\
   XForms Frontend:\n\
-      libXpm version:               ${XPM_VERSION}\n\
-      libforms version:             ${XFORMS_VERSION}\n"
+      libXpm version:\t\t${XPM_VERSION}\n\
+      libforms version:\t\t${XFORMS_VERSION}\n"
          ;;
   dnl   gnome)
   dnl     XFORMS_DO_IT_ALL
@@ -208,8 +195,10 @@ for frontend in $FRONTENDS ; do
          RPM_FRONTEND_DEPS='gtkmm >= 2.2.0'
          GTKMM_VERSION=`pkg-config --modversion gtkmm-2.0`
          LIBGLADEMM_VERSION=`pkg-config --modversion libglademm-2.0`
-         FRONTEND_INFO="    libgtkmm version:             ${GTKMM_VERSION}\n\
-    libglademm version:           ${LIBGLADEMM_VERSION}\n"
+         FRONTEND_INFO="${FRONTEND_INFO}\
+  GTK Frontend:\n\
+    libgtkmm version:\t\t${GTKMM_VERSION}\n\
+    libglademm version:\t\t${LIBGLADEMM_VERSION}\n"
          ;;
 
     qt)
@@ -220,7 +209,7 @@ for frontend in $FRONTENDS ; do
          RPM_FRONTEND_DEPS='qt >= 2.2.1'
          FRONTEND_INFO="${FRONTEND_INFO}\
   Qt Frontend:\n\
-      Qt version:                   ${QT_VERSION}\n"
+      Qt version:\t\t${QT_VERSION}\n"
       ;;
     *)
          LYX_ERROR(Unknown frontend '$frontend');;