X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=configure.in;h=d9fe16d7ece0e2501ecdf26918c38201bace0487;hb=13dcd3f8e29352d6234b4ee93b16e4aab645cadb;hp=58601e916ebe945e426174ad869117c45d08865b;hpb=f28db60cca02b0e0df73bda2ff466dd5131be906;p=lyx.git diff --git a/configure.in b/configure.in index 58601e916e..d9fe16d7ec 100644 --- a/configure.in +++ b/configure.in @@ -76,24 +76,22 @@ LYX_PROG_CXX AC_PROG_CXXCPP AC_DISABLE_SHARED AC_LIBTOOL_WIN32_DLL -AC_PROG_LIBTOOL +#AM_PROG_LIBTOOL +LYX_PROG_LIBTOOL ### Some checks on what the C++ compiler can(not) do -LYX_CXX_MUTABLE -LYX_CXX_PARTIAL +dnl we do not need that currently (and probably all our supported +dnl compiler allow that) +dnl LYX_CXX_PARTIAL LYX_CXX_EXPLICIT -dnl we do not use stl stack, or at least not on gcc 2.7, which was the -dnl cause for this test. -dnl LYX_CXX_STL_STACK LYX_CXX_STL_STRING LYX_CXX_GOOD_STD_STRING -LYX_CXX_NAMESPACES LYX_CXX_CHEADERS LYX_CXX_GLOBAL_CSTD LYX_STD_COUNT dnl we disable rtti for now dnl LYX_CXX_RTTI -AC_CHECK_HEADERS(ostream istream sstream locale) +AC_CHECK_HEADERS(ostream istream sstream locale limits) LYX_CXX_STL_MODERN_STREAMS ### We need a regex implementation, so we provide our own if none is found. @@ -161,13 +159,6 @@ AC_CHECK_FUNCS(XOpenIM) 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 - kde) - KDE_DO_IT_ALL - FRONTEND="kde" - FRONTEND_GUILIB="kde/libkde.la" - FRONTEND_LDFLAGS="\$(QT_LDFLAGS) \$(KDE_LDFLAGS)" - FRONTEND_INCLUDES="-I\${srcdir}/kde \$(QT_INCLUDES) \$(KDE_INCLUDES)" - FRONTEND_LIBS="\$(KDE_LIBS)";; xforms) # for now don't set it for xforms as this is always entered FRONTEND="" @@ -321,10 +312,6 @@ AC_OUTPUT([Makefile \ src/frontends/controllers/Makefile \ src/frontends/xforms/Makefile \ src/frontends/qt2/Makefile \ - src/frontends/kde/Makefile \ - src/frontends/kde/moc/Makefile \ - src/frontends/kde/dlg/Makefile \ - src/frontends/kde/dlg/moc/Makefile \ src/frontends/gnome/Makefile \ ], [sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile])