Add sysconfdir to search path for config files

Author: Mr-Dave

Makefile.am

@@ -21,6 +21,7 @@ ACLOCAL_AMFLAGS = -I m4
 
 SUBDIRS = src po
 
+pkgsysconfdir = $(sysconfdir)/@PACKAGE@
 libstatedir = @localstatedir@/lib/@PACKAGE@
 
 dist_libstate_DATA = \

doc/motionplus_config.html

@@ -2896,6 +2896,11 @@ <h2><a name="config_files"></a>  The Configuration Files </h2>
           by --localstatedir=DIR during the configure step of installation. If this was
           not defined, it will default to /var/lib/motionplus or /usr/local/var/lib/motionplus
           depending upon your system</li>
+        <li> The directory defined by --sysconfdir=DIR during the configure step of installation.
+          If this was not defined, it will default to /etc/motionplus or /usr/local/etc/motionplus
+          depending upon your system.  Please note that the use of this directory for the configuration
+          files is deprecated.  Some significant functionality of Motionplus will not be available
+          if the configuration files are in this directory.</li>
       </ol>
       <p></p>
       The motionplus.conf file specifies parameters for the entire MotionPlus application and defaults for

src/Makefile.am

@@ -17,7 +17,10 @@
 # */
 
 
-AM_CPPFLAGS= -Dconfigdir=\"$(localstatedir)/lib/@PACKAGE@\" -DLOCALEDIR=\"$(localedir)\"
+AM_CPPFLAGS= \
+	-Dconfigdir=\"$(localstatedir)/lib/@PACKAGE@\" \
+	-Dsysconfdir=\"$(sysconfdir)/motionplus\" \
+	-DLOCALEDIR=\"$(localedir)\"
 
 LDADD = $(LIBINTL)
 

src/conf.cpp

@@ -4310,6 +4310,21 @@ void cls_config::init()
         }
     }
 
+    if (filename == "") {
+        filename = std::string( sysconfdir ) + std::string("/motionplus.conf");
+        if (stat(filename.c_str(), &statbuf) != 0) {
+            filename = "";
+        }
+        if (filename != "") {
+            MOTPLS_LOG(WRN, TYPE_ALL, SHOW_ERRNO
+                ,_("The configuration file location '%s' is deprecated.")
+                , sysconfdir );
+            MOTPLS_LOG(WRN, TYPE_ALL, SHOW_ERRNO
+                ,_("The new default configuration file location is '%s'")
+                , configdir );
+        }
+    }
+
     if (filename == "") {
         MOTPLS_LOG(ALR, TYPE_ALL, SHOW_ERRNO
             ,_("Could not open configuration file"));