From 6ac3ab6958890db37820fd389f36e34c1eb4ec9d Mon Sep 17 00:00:00 2001
From: Francis Dupont <fdupont@isc.org>
Date: Sun, 12 Mar 2017 00:48:01 +0100
Subject: [PATCH 1/2] [5170] Moved hook library to if HAVE_GTEST

---
 src/bin/agent/tests/Makefile.am | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/bin/agent/tests/Makefile.am b/src/bin/agent/tests/Makefile.am
index f165838b2e..19b1359146 100644
--- a/src/bin/agent/tests/Makefile.am
+++ b/src/bin/agent/tests/Makefile.am
@@ -8,8 +8,6 @@ noinst_SCRIPTS = ca_process_tests.sh
 EXTRA_DIST  = ca_process_tests.sh.in
 EXTRA_DIST += testdata/get_config.json
 
-noinst_LTLIBRARIES = libbasic.la
-
 # test using command-line arguments, so use check-local target instead of TESTS
 check-local:
 	for shtest in $(SHTESTS) ; do \
@@ -43,6 +41,8 @@ TESTS_ENVIRONMENT = \
 TESTS =
 if HAVE_GTEST
 
+noinst_LTLIBRARIES = libbasic.la
+
 TESTS += ca_unittests
 
 ca_unittests_SOURCES  = ca_cfg_mgr_unittests.cc

From 8d4a4511c8100e00bfb4264a43526b860697fa3b Mon Sep 17 00:00:00 2001
From: Francis Dupont <fdupont@isc.org>
Date: Sun, 12 Mar 2017 02:41:53 +0100
Subject: [PATCH 2/2] [5170] Done

---
 configure.ac               |  9 +++++++++
 src/bin/shell/Makefile.am  | 11 ++---------
 src/bin/shell/kea-shell.in |  3 +++
 3 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/configure.ac b/configure.ac
index 80506f5fe7..445750dc04 100644
--- a/configure.ac
+++ b/configure.ac
@@ -519,6 +519,7 @@ AC_ARG_ENABLE(shell, [AC_HELP_STRING([--enable-shell],
   [enable kea-shell, a text management client for Control Agent [default=no]])],
   enable_shell=$enableval, enable_shell=no)
 
+PKGPYTHONDIR=
 if test "x$enable_shell" != xno ; then
 # If kea-shell is enabled, we really need python. 2.7 or anything newer will do.
 # We try to find 3.x first. If not found, we can do with 2.7.
@@ -526,12 +527,20 @@ if test "x$enable_shell" != xno ; then
   if test "x$found" = xno ; then
     AM_PATH_PYTHON([2.7])
   fi
+  # pkgpythondir needs to be expanded
+  PKGPYTHONDIR="$pkgpythondir"
+  OLD=
+  while test "x$OLD" != "x$PKGPYTHONDIR"; do
+    OLD="$PKGPYTHONDIR"
+    eval PKGPYTHONDIR="\"$OLD\""
+  done
 else
   PYTHON=no
 fi
 
 # Export to makefiles the info whether we have shell enabled or not
 AM_CONDITIONAL(KEA_SHELL, test x$enable_shell != xno)
+AC_SUBST(PKGPYTHONDIR)
 
 # produce PIC unless we disable shared libraries. need this for python bindings.
 if test $enable_shared != "no" -a "X$GXX" = "Xyes"; then
diff --git a/src/bin/shell/Makefile.am b/src/bin/shell/Makefile.am
index 94e1402f56..69a1fe4924 100644
--- a/src/bin/shell/Makefile.am
+++ b/src/bin/shell/Makefile.am
@@ -5,10 +5,9 @@ EXTRA_DIST =
 if KEA_SHELL
 
 # Kea-shell is enabled, here are proper rules for it.
-kea_shell_PYTHON = kea_conn.py kea_connector2.py kea_connector3.py
-kea_shelldir = @localstatedir@/@PACKAGE@
+pkgpython_PYTHON = kea_conn.py kea_connector2.py kea_connector3.py
 
-bin_SCRIPTS = kea-shell
+sbin_SCRIPTS = kea-shell
 
 else
 
@@ -37,12 +36,6 @@ $(man_MANS):
 
 endif
 
-install-data-local:
-	$(mkinstalldirs) $(DESTDIR)/@localstatedir@/@PACKAGE@
-
-install-data-hook:
-	-chmod 2770 $(DESTDIR)/@localstatedir@/@PACKAGE@
-
 CLEANDIRS = __pycache__
 
 clean-local:
diff --git a/src/bin/shell/kea-shell.in b/src/bin/shell/kea-shell.in
index e86c53c733..619f936cd0 100644
--- a/src/bin/shell/kea-shell.in
+++ b/src/bin/shell/kea-shell.in
@@ -17,10 +17,13 @@ Text client for Control Agent process
 # that's a stand alone package that requires separate installation. One of
 # the design requirements was to not require any additional packages, so
 # the code uses standard libraries available in python. Hence two versions.
+import os
 import sys
 import signal
 import argparse
 
+sys.path.append('@PKGPYTHONDIR@')
+
 from kea_conn import CARequest # CAResponse
 
 if sys.version_info[0] == 2: