[vala/wip/transform: 82/87] Do not load plugins from libdir. Issue a warning when using --plugindir

[Rico Tzschichholz <ricotz src gnome org>]

commit 07acb6e3b8fbca0dfb2696433bbfeed4dd7b93f5
Author: Luca Bruno <lucabru src gnome org>
Date:   Wed Feb 5 00:10:09 2014 +0100

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

 configure.ac              | 1 -
 vala/Makefile.am          | 1 -
 vala/valacodecontext.vala | 6 ++++--
 vapi/config.vapi          | 1 -
 4 files changed, 4 insertions(+), 5 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 9d1c97417..8fdfd8fe5 100644
--- 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 59b330199..fec06f1bd 100644
--- 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 144cf65e6..9bed74edd 100644
--- a/vala/valacodecontext.vala
+++ b/vala/valacodecontext.vala
@@ -526,12 +526,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 590e4cc06..543a92fa8 100644
--- a/vapi/config.vapi
+++ b/vapi/config.vapi
@@ -23,6 +23,5 @@
 [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;
 }