upkg: Support UOBJECT_MODULE_PATH to add library search paths.

diff --git a/src/package.c b/src/package.c
index 1de609644b10f95ad4a6abd53ab02d6c68f31db3..a0957563bb4246985456542556794420325cb0cd 100644 (file)
--- a/src/package.c
+++ b/src/package.c
@@ -101,11 +101,19 @@ static void u_pkg_init(UPkg *pkg)
 
 static void u_pkg_class_init(UPkgClass *class)
 {
+       GTypeModuleClass *modclass = G_TYPE_MODULE_CLASS(class);
+       const char *modpath = getenv("UOBJECT_MODULE_PATH");
+
        g_type_class_add_private(class, sizeof (struct upkg_priv));
 
-       GTypeModuleClass *modclass = G_TYPE_MODULE_CLASS(class);
+       if (lt_dlinit() != 0) {
+               dl_print_errors(__func__);
+       }
 
-       if (lt_dlinit() != 0 || lt_dlsetsearchpath(PKGLIBDIR) != 0) {
+       if (modpath && lt_dlsetsearchpath(modpath) != 0) {
+               dl_print_errors(__func__);
+       }
+       if (lt_dladdsearchdir(PKGLIBDIR) != 0) {
                dl_print_errors(__func__);
        }