Do not load plugins from libdir. Issue a warning when using --plugindir

diff --git a/configure.ac b/configure.ac
index 16ebd1f810e85ce9c4e59675b3b54efae85fe437..1c2b6f81a76c1a2821741d1a175cd41fb3296bc6 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -32,7 +32,6 @@ AC_DEFINE_UNQUOTED(PACKAGE_SUFFIX, "$PACKAGE_SUFFIX", [Define to the suffix of t
 program_transform_name="s,\$\$,${PACKAGE_SUFFIX},"
 
 AC_SUBST(pkgdatadir, [${datadir}/vala${PACKAGE_SUFFIX}])
-AC_SUBST(pkglibdir, [${libdir}/vala${PACKAGE_SUFFIX}])
 
 # Checks for programs.
 AC_PROG_CC

diff --git a/vala/Makefile.am b/vala/Makefile.am
index 774c7bb12b29f355526cf8542425da04b4536eef..2c13f48d63d90d9339aab2d00d8f405ac2fd32d9 100644 (file)
--- a/vala/Makefile.am
+++ b/vala/Makefile.am
@@ -8,7 +8,6 @@ AM_CPPFLAGS = \
        $(GLIB_CFLAGS) \
        $(GMODULE_CFLAGS) \
        -DPACKAGE_DATADIR=\"$(pkgdatadir)\" \
-       -DPACKAGE_LIBDIR=\"$(pkglibdir)\"       \
        $(NULL)
 
 BUILT_SOURCES = vala.vala.stamp $(srcdir)/valaversion.vala

diff --git a/vala/valacodecontext.vala b/vala/valacodecontext.vala
index b7fa6ed35f9dd29a57dd15819286247d5f753c23..705f9c79f569ded289eb9f48d17b4bd308c35274 100644 (file)
--- a/vala/valacodecontext.vala
+++ b/vala/valacodecontext.vala
@@ -521,12 +521,14 @@ public class Vala.CodeContext {
                }
 
                if (plugin_directories != null) {
+                       if (!experimental) {
+                               Report.warning (null, "plugins are experimental and their API is unstable");
+                       }
+
                        foreach (string dir in plugin_directories) {
                                load_plugins_in_directory (dir);
                        }
                }
-
-               load_plugins_in_directory (Config.PACKAGE_LIBDIR);
        }
 
        public void load_plugins_in_directory (string dirname) {

diff --git a/vapi/config.vapi b/vapi/config.vapi
index 5ae26aab384d7d75606a38a5d24c12da8e7c69c5..c8b5d58a1aea0387371c8baa1fe6f025810b863f 100644 (file)
--- a/vapi/config.vapi
+++ b/vapi/config.vapi
@@ -23,7 +23,6 @@
 [CCode (cprefix = "", lower_case_cprefix = "", cheader_filename = "config.h")]
 namespace Config {
        public const string PACKAGE_DATADIR;
-       public const string PACKAGE_LIBDIR;
        public const string PACKAGE_SUFFIX;
        public const string PACKAGE_VALADOC_LIBDIR;
        public const string PACKAGE_VALADOC_ICONDIR;