Provide option to prevent unnecessary font loading.

[lyx.git] / src / support / Package.cpp

diff --git a/src/support/Package.cpp b/src/support/Package.cpp
index 75d6e1a2f87978818d97c34309d8c36642e4465a..f931ddf7059bcbe0c28fba650b2d2aa0e3dede12 100644 (file)
--- a/src/support/Package.cpp
+++ b/src/support/Package.cpp
@@ -55,7 +55,7 @@ namespace {
 Package package_;
 bool initialised_ = false;
 
-} // namespace anon
+} // namespace
 
 
 void init_package(string const & command_line_arg0,
@@ -101,7 +101,7 @@ string const & with_version_suffix();
 
 string const fix_dir_name(string const & name);
 
-} // namespace anon
+} // namespace
 
 
 Package::Package(string const & command_line_arg0,
@@ -193,7 +193,9 @@ void Package::set_temp_dir(FileName const & temp_dir) const
 FileName Package::messages_file(string const & c) const
 {
        if (in_build_dir_) {
-               FileName res = FileName(lyx_dir().absFileName() + "/../po/" + c + ".gmo");
+               FileName res = FileName(lyx_dir().absFileName() + "/po/" + c + ".gmo");
+               if (!res.isReadableFile())
+                       res = FileName(lyx_dir().absFileName() + "../po/" + c + ".gmo");
                if (!res.isReadableFile())
                        res = FileName(top_srcdir().absFileName() + "/po/" + c + ".gmo");
                return res;
@@ -247,7 +249,7 @@ string const & with_version_suffix()
        return program_suffix.empty() ? program_suffix : with_version_suffix;
 }
 
-} // namespace anon
+} // namespace
 
 
 FileName const & Package::top_srcdir()
@@ -302,8 +304,8 @@ bool isBuildDir(FileName const & abs_binary, string const & dir_location,
         return true;
     }
     //  cmake file, no Makefile in lib
-    FileName build_boost_dir = FileName(addPath(search_dir + "/3rdparty", "boost"));
-    if (!fileSearch(build_boost_dir.absFileName(), "cmake_install.cmake").empty()) {
+    FileName build_src_dir = FileName(addPath(search_dir, "src"));
+    if (!fileSearch(build_src_dir.absFileName(), "cmake_install.cmake").empty()) {
         return true;
     }
 
@@ -323,12 +325,12 @@ bool inBuildDir(FileName const & abs_binary,
 
        // Note that the name of the lyx binary may be a symbolic link.
        // If that is the case, then we follow the links too.
-    FileName binary = abs_binary;
+       FileName binary = abs_binary;
        while (true) {
                // Try and find "lyxrc.defaults".
-               if( isBuildDir(binary, "../", build_support_dir) ||
-            isBuildDir(binary, "../../", build_support_dir))
-        {
+               if ( isBuildDir(binary, "../", build_support_dir)
+                   || isBuildDir(binary, "../../", build_support_dir))
+               {
                        // Try and find "chkconfig.ltx".
                        system_support_dir =
                                FileName(addPath(Package::top_srcdir().absFileName(), "lib"));
@@ -357,7 +359,7 @@ bool inBuildDir(FileName const & abs_binary,
        system_support_dir = FileName();
        build_support_dir = FileName();
 
-    return false;
+       return false;
 }
 
 
@@ -506,9 +508,9 @@ FileName const get_binary_path(string const & exe)
                // This will do nothing if *it is already absolute.
                string const exe_dir = makeAbsPath(*it).absFileName();
 
-               FileName const exe_path(addName(exe_dir, exe_name));
-               if (exe_path.exists())
-                       return exe_path;
+               FileName const exe_path2(addName(exe_dir, exe_name));
+               if (exe_path2.exists())
+                       return exe_path2;
        }
 
        // Didn't find anything.
@@ -799,7 +801,7 @@ string const relative_system_support_dir()
        return result;
 }
 
-} // namespace anon
+} // namespace
 
 } // namespace support
 } // namespace lyx