Fix optional integration tests configuration use of configure prefix.…

… Fix python quickstart for python 3 use.
CloudI · Dec 7, 2017 · b109fe5 · b109fe5
1 parent 3df0d93
commit b109fe5
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 3 deletions.
diff --git a/doc/README.markdown b/doc/README.markdown
@@ -963,7 +963,7 @@
             def __hello_world(self, command, name, pattern,
                               request_info, request,
                               timeout, priority, trans_id, pid):
-                return 'Hello World!'
+                return b'Hello World!'
         
         if __name__ == '__main__':
             assert API.thread_count() == 1
@@ -974,9 +974,10 @@
 1.  Now it is necessary to create the CloudI service configuration that
     specifies both the initialization and fault-tolerance constraints
     the CloudI service should be executed with
-    (with the proplist format to rely on defaults):
+    (either python2 or python3 will work and the python executable name
+     may instead be "python" on your system):
 
-        export PYTHON=`which python`
+        export PYTHON=`which python3`
         export PWD=`pwd`
         cat << EOF > hello_world.conf
         [[{prefix, "/quickstart/python/"},

diff --git a/src/ChangeLog b/src/ChangeLog
@@ -1,6 +1,11 @@
 # -*- coding: utf-8; tab-width: 4; -*-
 # ex: set fenc=utf-8 sts=4 ts=4 et nomod:
 
+2017-12-07 Michael Truog   <mjtruog [at] gmail (dot) com>
+
+    * Fix optional integration tests configuration use of configure prefix
+    * Fix python quickstart for python 3 use
+
 2017-12-02 Michael Truog   <mjtruog [at] gmail (dot) com>
 
     * Fix the cloudi_service_monitoring aspect functions so they will

diff --git a/src/configure.ac b/src/configure.ac
@@ -39,6 +39,10 @@ AC_SUBST(cloudi_prefix, ["$libdir/cloudi-$VERSION"])
 AC_SUBST(cloudi_logdir, ["$localstatedir/log/cloudi"])
 AC_SUBST(cloudi_confdir, ["$sysconfdir/cloudi"])
 AC_SUBST(cloudi_bindir, ["$cloudi_prefix/bin"])
+if test "x$prefix" = "xNONE"; then
+    # to allow using $prefix in the strings below
+    prefix="/usr/local"
+fi
 
 AC_SUBST(CLOUDI_TMP_BIN_SCRIPT,
          m4_maketemp(/tmp/cloudi_tmp_bin_script_XXXXXX))