Add library install directory to ltdl search directory list.

svn path=/trunk/yasm/; revision=908

diff --git a/Makefile.am b/Makefile.am
index c9d1f21356a6d0afebb6d71b5d883165c826b020..b552a45bfcabe8e43ac171819c1d130f648a7f31 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -6,6 +6,7 @@ AM_YFLAGS = -d
 AM_CFLAGS = @MORE_CFLAGS@
 AM_CPPFLAGS = \
        -I$(top_srcdir)/check \
+       -DYASM_MODULEDIR="\"${libdir}\"" \
        @INCLTDL@
 
 bin_PROGRAMS =

diff --git a/frontends/yasm/yasm.c b/frontends/yasm/yasm.c
index 164d74a52a02776ea69f80326fcca43ac3a6581e..25c508e97af776e4be810be4419d3ce1fa919ca4 100644 (file)
--- a/frontends/yasm/yasm.c
+++ b/frontends/yasm/yasm.c
@@ -209,6 +209,10 @@ main(int argc, char *argv[])
        const char *path = getenv(YASM_MODULE_PATH_ENV);
        if (path)
            errors = lt_dladdsearchdir(path);
+#if defined(YASM_MODULEDIR)
+       if (errors == 0)
+           errors = lt_dladdsearchdir(YASM_MODULEDIR);
+#endif
     }
     if (errors != 0) {
        print_error(_("Module loader initialization failed"));