From 2bbfdca142e79f8afe4f52fce4489b3391f71ea3 Mon Sep 17 00:00:00 2001
From: tchernobog <tchernobog@3ecf2c5c-341e-0410-92b4-d18e462d057c>
Date: Fri, 7 Apr 2006 20:14:04 +0000
Subject: [PATCH] - Make sure pyloader doesn't try to look outside its sandbox

git-svn-id: svn://svn.gna.org/svn/sgpemv2/trunk@564 3ecf2c5c-341e-0410-92b4-d18e462d057c
---
 configure.ac                  | 6 ++++++
 plugins/pyloader/configure.ac | 8 ++++----
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/configure.ac b/configure.ac
index 3bc4a32..9d55cd4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -144,8 +144,14 @@ AM_CONDITIONAL([COND_TESTS], [test "$compile_tests" = "yes"])
 dnl output files
 AC_CONFIG_FILES([config/Doxyfile config/sgpemv2.pc config/sgpemv2-uninstalled.pc])
 AC_CONFIG_HEADERS([config.h:config.h.in])
+
+
+dnl configure plugin directories
+dnl TODO: make this conditional
+AC_CONFIG_FILES([plugins/pyloader/config/sgpemv2-uninstalled.pc:config/sgpemv2-uninstalled.pc.in])
 AC_CONFIG_SUBDIRS([plugins/pyloader])
 
+
 AC_CONFIG_FILES([ 
 Makefile
 po/Makefile.in
diff --git a/plugins/pyloader/configure.ac b/plugins/pyloader/configure.ac
index 7773dd9..f48038a 100644
--- a/plugins/pyloader/configure.ac
+++ b/plugins/pyloader/configure.ac
@@ -79,16 +79,16 @@ SWIG_ENABLE_CXX
 SWIG_PYTHON
 
 dnl add pkg-config search path for sgpemv2-uninstalled.pc 
-dnl if we're building in a subdir of that pkg
+dnl if we're building in a subdir of that pkg it will be 
+dnl in $build_dir/config
 _old_pkg_path=$[]PKG@&t@_CONFIG_PATH
-if test -f "../../config/sgpemv2-uninstalled.pc"; then
-	export PKG_@&t@CONFIG_PATH="../../config:$PKG_CONFIG_PATH"
-fi
+export PKG_@&t@CONFIG_PATH="./config:$PKG_CONFIG_PATH"
 
 dnl check for sgpemv2!
 AC_PROG_SGPEMV2([$SGPEMV2_VERSION])
 
 dnl revert from old var
+dnl FIXME: probably you can safely remove this block:
 if test "x$_old_pkg_path" = "x"; then
 	unset -v PKG@&t@_CONFIG_PATH
 else