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