Some real easy ones.

[lyx.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 38b20870b4308519b5f09efc33ee51fcd8d1c529..054da29f9a25771a6537d02f23ed8f225de4cedf 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -112,46 +112,10 @@ LYX_ADD_INC_DIR(CPPFLAGS,$dir/include)
 ### These are needed in windows
 AC_CHECK_LIB(shlwapi, main, [LIBSHLWAPI=-lshlwapi])
 AC_SUBST(LIBSHLWAPI)
+AC_CHECK_LIB(psapi, main, [LIBPSAPI=-lpsapi])
+AC_SUBST(LIBPSAPI)
 AC_CHECK_LIB(gdi32, main)
 
-AC_ARG_WITH(mythes,
-  [  --without-mythes        do not use the MyThes library],
-  [lyx_use_mythes=$withval])
-if test x$lyx_use_mythes != xno; then
-AC_CHECK_LIB(mythes, main,
-       [AC_DEFINE(HAVE_LIBMYTHES,1,[Define this if you have the MyThes library])
-        MYTHES_LIBS="-lmythes"
-        lyx_flags="mythes $lyx_flags"
-       ])
-AC_CHECK_HEADER(mythes.hxx,[
-  ac_cv_header_mythes_h=yes
-  lyx_cv_mythes_h_location="<mythes.hxx>"])
-AC_CHECK_HEADER(mythes/mythes.hxx,[
-  ac_cv_header_mythes_h=yes
-  lyx_cv_mythes_h_location="<mythes/mythes.hxx>"])
-AC_DEFINE_UNQUOTED(MYTHES_H_LOCATION,$lyx_cv_mythes_h_location,[Location of mythes.hxx])
-fi
-AC_SUBST(MYTHES_LIBS)
-
-AC_ARG_WITH(aiksaurus,
-  [  --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_DEFINE(HAVE_LIBAIKSAURUS,1,[Define this if you have the AikSaurus library])
-        AIKSAURUS_LIBS="-lAiksaurus"
-        lyx_flags="aiksaurus $lyx_flags"
-       ])
-AC_CHECK_HEADER(Aiksaurus.h,[
-  ac_cv_header_aiksaurus_h=yes
-  lyx_cv_aiksaurus_h_location="<Aiksaurus.h>"])
-AC_CHECK_HEADER(Aiksaurus/Aiksaurus.h,[
-  ac_cv_header_aiksaurus_h=yes
-  lyx_cv_aiksaurus_h_location="<Aiksaurus/Aiksaurus.h>"])
-AC_DEFINE_UNQUOTED(AIKSAURUS_H_LOCATION,$lyx_cv_aiksaurus_h_location,[Location of Aiksaurus.h])
-fi
-AC_SUBST(AIKSAURUS_LIBS)
-
 LYX_USE_INCLUDED_BOOST
 
 # Needed for our char_type
@@ -398,13 +362,13 @@ AC_ARG_ENABLE(monolithic-build,
    IFS="$ac_save_ifs"],
   [enable_monolithic_build=])
 
-AM_CONDITIONAL(MONOLITHIC_BOOST, test -n "$enable_monolithic_boost")
-AM_CONDITIONAL(MONOLITHIC_CLIENT, test -n "$enable_monolithic_client")
-AM_CONDITIONAL(MONOLITHIC_INSETS, test -n "$enable_monolithic_insets")
-AM_CONDITIONAL(MONOLITHIC_MATHED, test -n "$enable_monolithic_mathed")
-AM_CONDITIONAL(MONOLITHIC_CORE, test -n "$enable_monolithic_core")
-AM_CONDITIONAL(MONOLITHIC_TEX2LYX, test -n "$enable_monolithic_tex2lyx")
-AM_CONDITIONAL(MONOLITHIC_FRONTEND_QT4, test -n "$enable_monolithic_frontend_qt4")
+AM_CONDITIONAL(MONOLITHIC_BOOST, test "x$enable_monolithic_boost" = "xyes")
+AM_CONDITIONAL(MONOLITHIC_CLIENT, test "x$enable_monolithic_client" = "xyes")
+AM_CONDITIONAL(MONOLITHIC_INSETS, test "x$enable_monolithic_insets" = "xyes")
+AM_CONDITIONAL(MONOLITHIC_MATHED, test "x$enable_monolithic_mathed" = "xyes")
+AM_CONDITIONAL(MONOLITHIC_CORE, test "x$enable_monolithic_core" = "xyes")
+AM_CONDITIONAL(MONOLITHIC_TEX2LYX, test "x$enable_monolithic_tex2lyx" = "xyes")
+AM_CONDITIONAL(MONOLITHIC_FRONTEND_QT4, test "x$enable_monolithic_frontend_qt4" = "xyes")
 
 MSYS_AC_CANONICAL_PATH(lyx_abs_top_srcdir, ${srcdir})
 MSYS_AC_CANONICAL_PATH(lyx_abs_installed_localedir, ${real_localedir})