changed command line processing. -v, -M, -c options are now parsed and

    processed before all other options. Inter-option dependencies have been
    relieved. Among others, permits to specify intial module load path via
    -M only (not the environment) which makes it much easier to work with
    non-standard module library locations. Thanks to varmojfekoj for
    suggesting this change. Matches bugzilla bug 55.

1 files changed, 11 insertions, 0 deletions

diff --git a/modules.c b/modules.c
index 86ee64a5..623a2f10 100644
--- a/modules.c
+++ b/modules.c
@@ -783,6 +783,17 @@ BEGINAbstractObjClassInit(module, 1, OBJ_IS_CORE_MODULE) /* class, version - CHA
 		SetModDir(pModPath);
 	}
 
+	/* now check if another module path was set via the command line (-M)
+	 * if so, that overrides the environment. Please note that we must use
+	 * a global setting here because the command line parser can NOT call
+	 * into the module object, because it is not initialized at that point. So
+	 * instead a global setting is changed and we pick it up as soon as we
+	 * initialize -- rgerhards, 2008-04-04
+	 */
+	if(glblModPath != NULL) {
+		SetModDir(glblModPath);
+	}
+
 	/* request objects we use */
 	CHKiRet(objUse(errmsg, CORE_COMPONENT));
 ENDObjClassInit(module)