matteo/sgpemv2
matteo
/
sgpemv2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- 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
This commit is contained in:
tchernobog 2006-04-07 20:14:04 +00:00
parent 38a7990e26
commit 2bbfdca142
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
configure.ac
View File

@ -144,8 +144,14 @@ AM_CONDITIONAL([COND_TESTS], [test "$compile_tests" = "yes"])
dnl output files dnl output files
AC_CONFIG_FILES([config/Doxyfile config/sgpemv2.pc config/sgpemv2-uninstalled.pc]) AC_CONFIG_FILES([config/Doxyfile config/sgpemv2.pc config/sgpemv2-uninstalled.pc])
AC_CONFIG_HEADERS([config.h:config.h.in]) 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_SUBDIRS([plugins/pyloader])
AC_CONFIG_FILES([ AC_CONFIG_FILES([
Makefile Makefile
po/Makefile.in po/Makefile.in

8
plugins/pyloader/configure.ac
View File

@ -79,16 +79,16 @@ SWIG_ENABLE_CXX
SWIG_PYTHON SWIG_PYTHON
dnl add pkg-config search path for sgpemv2-uninstalled.pc 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 _old_pkg_path=$[]PKG@&t@_CONFIG_PATH
if test -f "../../config/sgpemv2-uninstalled.pc"; then export PKG_@&t@CONFIG_PATH="./config:$PKG_CONFIG_PATH"
export PKG_@&t@CONFIG_PATH="../../config:$PKG_CONFIG_PATH"
fi
dnl check for sgpemv2! dnl check for sgpemv2!
AC_PROG_SGPEMV2([$SGPEMV2_VERSION]) AC_PROG_SGPEMV2([$SGPEMV2_VERSION])
dnl revert from old var dnl revert from old var
dnl FIXME: probably you can safely remove this block:
if test "x$_old_pkg_path" = "x"; then if test "x$_old_pkg_path" = "x"; then
unset -v PKG@&t@_CONFIG_PATH unset -v PKG@&t@_CONFIG_PATH
else else