Changeset 20075 for trunk/FACT++

Timestamp:

04/12/21 20:34:36 (4 years ago)

Author:

tbretz

Message:

Allow for a fallback solution to look for fact++.rc, which is the syscondir.

File:

• trunk/FACT++/src/Configuration.cc (modified) (2 diffs)

trunk/FACT++/src/Configuration.cc

@@ -886 +886 @@
 //!  - (5)  Read and parse the global configuration file, which is compiled
 //!         from the path corresponding to the argument given in the
-//!         constructor + "/fact++.rc", unrecognized options are always
+//!         constructor + "/fact++.rc" (or sysconf-prefix + fact++.rc
+//!         if not found), unrecognized options are always
 //!         allowed. Note that in contradiction to all other options
 //!         the options in this file are not checked at all. Hence,
@@ -1049 +1050 @@
 
     const boost::filesystem::path path(GetName());
-    const string globalfile = (path.parent_path()/boost::filesystem::path("fact++.rc")).string();
-
+    string globalfile = (path.parent_path()/boost::filesystem::path("fact++.rc")).string();
+
+#ifdef PACKAGE_INSTALL_SYSCONFDIR
+    if (!boost::filesystem::exists(globalfile))
+        globalfile = (boost::filesystem::path(PACKAGE_INSTALL_SYSCONFDIR)/boost::filesystem::path("fact++.rc")).string();
+#endif
 
     errno = 0;