From c0c175c947dd4348126b467434731d81aea0cbb0 Mon Sep 17 00:00:00 2001
From: cvvergara <vicky@georepublic.de>
Date: Thu, 29 Nov 2018 12:16:20 -0600
Subject: [PATCH] Fix for issue #1165

* Notes & news
	modified:   NEWS
	modified:   doc/src/release_notes.rst
* Fix
	modified:   cmake/FindSphinx.cmake
	modified:   tools/testers/algorithm-tester.pl
* Version typo fix
	modified:   doc/queries/doc-pgr_version.queries
---
 NEWS                                |  1 +
 cmake/FindSphinx.cmake              | 10 ++++++++--
 doc/queries/doc-pgr_version.queries |  2 +-
 doc/src/release_notes.rst           |  1 +
 tools/testers/algorithm-tester.pl   |  4 +++-
 5 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/NEWS b/NEWS
index 504fa0939b9..5d63a73d157 100644
--- a/NEWS
+++ b/NEWS
@@ -80,6 +80,7 @@ To see the issues closed by this release see the [Git closed milestone for 2.5.5
 
 * Fixes driving distance when vertex is not part of the graph
 * Fixes windows test
+* Fixes build for python3 and perl5
 
 
 pgRouting 2.5.4 Release Notes
diff --git a/cmake/FindSphinx.cmake b/cmake/FindSphinx.cmake
index 23dcb940bd0..24c50797a4e 100644
--- a/cmake/FindSphinx.cmake
+++ b/cmake/FindSphinx.cmake
@@ -7,6 +7,10 @@
 #   SPHINX_VERSION    - the version of Sphinx which was found, e.g. "1.0.7"
 
 #=============================================================================
+#
+# Copyright (C) 2018 Vicky Vergara
+# Modification for python3
+#
 # Copyright (C) 2011 Marie Rognes and Johannes Ring
 # All rights reserved.
 #
@@ -52,10 +56,13 @@ find_program(SPHINX_EXECUTABLE sphinx-build
 if (SPHINX_EXECUTABLE)
   # Try to check Sphinx version by importing Sphinx
   execute_process(
-    COMMAND ${PYTHON_EXECUTABLE} -c "import sphinx; print sphinx.__version__"
+    COMMAND ${SPHINX_EXECUTABLE} --version
     OUTPUT_VARIABLE SPHINX_VERSION
     OUTPUT_STRIP_TRAILING_WHITESPACE)
 
+  message(STATUS "SPHINX_VERSION ${SPHINX_VERSION}")
+  string(REGEX MATCH "[0-9]+\.[0-9]+.\[0-9]+" SPHINX_VERSION "${SPHINX_VERSION}")
+  message(STATUS "SPHINX_VERSION ${SPHINX_VERSION}")
   if (Sphinx_FIND_VERSION)
     # Check if version found is >= required version
     if (NOT "${SPHINX_VERSION}" VERSION_LESS "${Sphinx_FIND_VERSION}")
@@ -76,4 +83,3 @@ mark_as_advanced(
 include(FindPackageHandleStandardArgs)
 find_package_handle_standard_args(Sphinx DEFAULT_MSG
   SPHINX_EXECUTABLE SPHINX_VERSION_OK)
-
diff --git a/doc/queries/doc-pgr_version.queries b/doc/queries/doc-pgr_version.queries
index 41ad6628dc1..455601dbbbe 100644
--- a/doc/queries/doc-pgr_version.queries
+++ b/doc/queries/doc-pgr_version.queries
@@ -6,7 +6,7 @@ SET
 SELECT version FROM pgr_version();
  version
 ---------
- 2.6.1
+ 2.6.2
 (1 row)
 
 -- q2
diff --git a/doc/src/release_notes.rst b/doc/src/release_notes.rst
index 8b6b2461770..21ac7e1e84f 100644
--- a/doc/src/release_notes.rst
+++ b/doc/src/release_notes.rst
@@ -129,6 +129,7 @@ To see the issues closed by this release see the `Git closed milestone for 2.5.5
 
 * Fixes driving distance when vertex is not part of the graph
 * Fixes windows test
+* Fixes build for python3 and perl5
 
 .. _changelog_2_5_4:
 
diff --git a/tools/testers/algorithm-tester.pl b/tools/testers/algorithm-tester.pl
index 9b386afebd4..adddf141d48 100755
--- a/tools/testers/algorithm-tester.pl
+++ b/tools/testers/algorithm-tester.pl
@@ -35,7 +35,7 @@
 if 0; #$running_under_some_shell
 
 use strict;
-use warnings;
+use lib './';
 use File::Find ();
 use File::Basename;
 use Data::Dumper;
@@ -198,6 +198,7 @@ sub Usage {
 
 # cfgs = SET of configuration file names
 # c  one file in cfgs
+# print join("\n",@cfgs),"\n";
 for my $c (@cfgs) {
     my $found = 0;
 
@@ -575,6 +576,7 @@ sub want_tests {
 #    ||
     /^test\.conf\z/s &&
     push @cfgs, $name;
+    #print join("\n",@cfgs),"\n";
 }