Remove dependency on TEX2LYX #define in ModuleList.cpp

diff --git a/src/ModuleList.cpp b/src/ModuleList.cpp
index 6b693b16e624a93fa3c71651c9bb5d3ed1f2a63b..d442d204a559cde98c0e15dec3b70f1063a1143e 100644 (file)
--- a/src/ModuleList.cpp
+++ b/src/ModuleList.cpp
@@ -48,21 +48,14 @@ LyXModule::LyXModule(string const & n, string const & i,
 
 vector<string> LyXModule::prerequisites() const
 {
-#ifdef TEX2LYX
-       return vector<string>();
-#else
        if (!checked_)
                isAvailable();
        return prerequisites_;
-#endif
 }
 
 
 bool LyXModule::isAvailable() const
 {
-#ifdef TEX2LYX
-       return true;
-#else
        if (package_list_.empty())
                return true;
        if (checked_)
@@ -79,7 +72,6 @@ bool LyXModule::isAvailable() const
                }
        }
        return available_;
-#endif
 }
 
 

diff --git a/src/tex2lyx/tex2lyx.cpp b/src/tex2lyx/tex2lyx.cpp
index 1f5b14d96b4506c200e22aeccbd859c38a9f77ef..f750f424c26846748ccf8ba34f3afcfb003f0bd1 100644 (file)
--- a/src/tex2lyx/tex2lyx.cpp
+++ b/src/tex2lyx/tex2lyx.cpp
@@ -18,6 +18,7 @@
 #include "Context.h"
 #include "Encoding.h"
 #include "Format.h"
+#include "LaTeXFeatures.h"
 #include "Layout.h"
 #include "LayoutFile.h"
 #include "LayoutModuleList.h"
@@ -101,6 +102,12 @@ bool Formats::isZippedFile(FileName const&) const
 }
 
 
+bool LaTeXFeatures::isAvailable(string const &)
+{
+       return true;
+}
+
+
 // Keep the linker happy on Windows
 void lyx_exit(int)
 {}