[libpeas] Do not add pyexecdir to Python's paths at runtime

[Garrett Regier <gregier src gnome org>]

commit f0ceed9a8fe85698a8e510e473279b2712643be1
Author: Garrett Regier <garrett regier riftio com>
Date:   Mon Sep 21 20:51:00 2015 -0700

    Do not add pyexecdir to Python's paths at runtime
    
    This seems to be a bugfix for jhbuild from 2009
    and is no longer needed. It has also been known
    to cause issues for some.

 configure.ac                           |    4 ----
 loaders/python/Makefile.am             |    1 -
 loaders/python/peas-python-internal.c  |    2 --
 loaders/python/peas-python-internal.py |    1 -
 loaders/python3/Makefile.am            |    1 -
 5 files changed, 0 insertions(+), 9 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 112054a..c838361 100644
--- a/configure.ac
+++ b/configure.ac
@@ -400,12 +400,10 @@ else
                     PYTHON2_CFLAGS=`${PYTHON2_CONFIG} --includes`
                     PYTHON2_LIBS=`${PYTHON2_CONFIG} --libs`
                     PYTHON2_LDFLAGS=`${PYTHON2_CONFIG} --ldflags`
-                    PYTHON2_PYEXECDIR=`$PYTHON2 -c "from distutils import sysconfig; 
print(sysconfig.get_python_lib(1, 0, prefix='\\$' '{exec_prefix}'))"`
                     AC_SUBST(PYTHON2_BIN)
                     AC_SUBST(PYTHON2_CFLAGS)
                     AC_SUBST(PYTHON2_LIBS)
                     AC_SUBST(PYTHON2_LDFLAGS)
-                    AC_SUBST(PYTHON2_PYEXECDIR)
                     AC_DEFINE(ENABLE_PYTHON2, 1, [Define to compile with Python 2 support])
                 ], [
                     found_python2="no (PyGObject not found)"
@@ -446,12 +444,10 @@ else
                 PYTHON3_CFLAGS=`${PYTHON3_CONFIG} --includes`
                 PYTHON3_LIBS=`${PYTHON3_CONFIG} --libs`
                 PYTHON3_LDFLAGS=`${PYTHON3_CONFIG} --ldflags`
-                PYTHON3_PYEXECDIR="${pyexecdir}"
                 AC_SUBST(PYTHON3_BIN)
                 AC_SUBST(PYTHON3_CFLAGS)
                 AC_SUBST(PYTHON3_LIBS)
                 AC_SUBST(PYTHON3_LDFLAGS)
-                AC_SUBST(PYTHON3_PYEXECDIR)
                 AC_DEFINE(ENABLE_PYTHON3, 1, [Define to compile with Python 3 support])
             ], [
                 found_python3="no (PyGObject not found)"
diff --git a/loaders/python/Makefile.am b/loaders/python/Makefile.am
index 3ec9aef..ac3997e 100644
--- a/loaders/python/Makefile.am
+++ b/loaders/python/Makefile.am
@@ -10,7 +10,6 @@ AM_CPPFLAGS = \
        $(DISABLE_DEPRECATED)           \
        $(PYGOBJECT_CFLAGS)             \
        $(PYTHON2_CFLAGS)               \
-       -DPEAS_PYEXECDIR=\""$(PYTHON2_PYEXECDIR)"\" \
        -DPEAS_LOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale"\"
 
 loader_LTLIBRARIES = libpythonloader.la
diff --git a/loaders/python/peas-python-internal.c b/loaders/python/peas-python-internal.c
index cb06eea..5889188 100644
--- a/loaders/python/peas-python-internal.c
+++ b/loaders/python/peas-python-internal.c
@@ -127,8 +127,6 @@ peas_python_internal_setup (gboolean already_initialized)
                                                     "PRGNAME",
                                                     prgname) == 0);
   goto_error_if_failed (PyModule_AddStringMacro (internal_module,
-                                                 PEAS_PYEXECDIR) == 0);
-  goto_error_if_failed (PyModule_AddStringMacro (internal_module,
                                                  GETTEXT_PACKAGE) == 0);
   goto_error_if_failed (PyModule_AddStringMacro (internal_module,
                                                  PEAS_LOCALEDIR) == 0);
diff --git a/loaders/python/peas-python-internal.py b/loaders/python/peas-python-internal.py
index f672daf..1a0a745 100644
--- a/loaders/python/peas-python-internal.py
+++ b/loaders/python/peas-python-internal.py
@@ -42,7 +42,6 @@ class Hooks(object):
                 signal.signal(signal.SIGINT, signal.SIG_DFL)
 
         sys.argv = [PRGNAME]
-        sys.path.insert(0, PEAS_PYEXECDIR)
 
         gettext.install(GETTEXT_PACKAGE, PEAS_LOCALEDIR)
 
diff --git a/loaders/python3/Makefile.am b/loaders/python3/Makefile.am
index f304e8f..8348d1f 100644
--- a/loaders/python3/Makefile.am
+++ b/loaders/python3/Makefile.am
@@ -10,7 +10,6 @@ AM_CPPFLAGS = \
        $(DISABLE_DEPRECATED)           \
        $(PYGOBJECT_CFLAGS)             \
        $(PYTHON3_CFLAGS)               \
-       -DPEAS_PYEXECDIR=\""$(PYTHON3_PYEXECDIR)"\" \
        -DPEAS_LOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale"\"
 
 loader_LTLIBRARIES = libpython3loader.la