Merge branch 'futatuki-configure-with-2to3-as-different-name'
* futatuki-configure-with-2to3-as-different-name:
Apply patch to configure with 2to3 rename for 3.0.12
diff --git a/Examples/Makefile.in b/Examples/Makefile.in
index e29a760..6d4260d 100644
--- a/Examples/Makefile.in
+++ b/Examples/Makefile.in
@@ -386,7 +386,7 @@
PYSCRIPT = $(RUNME)3.py
endif
-PY2TO3 = 2to3 `2to3 -l | grep -v -E "Available|import$$" | awk '{print "-f "$$0}'`
+PY2TO3 = @PY2TO3PROG@ `@PY2TO3PROG@ -l | grep -v -E "Available|import$$" | awk '{print "-f "$$0}'`
python_run: $(PYSCRIPT)
ifneq (,$(PEP8))
diff --git a/Examples/test-suite/python/Makefile.in b/Examples/test-suite/python/Makefile.in
index b6da00a..f62a318 100644
--- a/Examples/test-suite/python/Makefile.in
+++ b/Examples/test-suite/python/Makefile.in
@@ -16,7 +16,7 @@
#*_runme.py for Python 2.x, *_runme3.py for Python 3.x
PY2SCRIPTSUFFIX = _runme.py
PY3SCRIPTSUFFIX = _runme3.py
-PY2TO3 = 2to3 -x import
+PY2TO3 = @PY2TO3PROG@ -x import
ifeq (,$(PY3))
SCRIPTSUFFIX = $(PY2SCRIPTSUFFIX)
diff --git a/configure.ac b/configure.ac
index ddf7a7d..d2f2c85 100644
--- a/configure.ac
+++ b/configure.ac
@@ -902,6 +902,11 @@
AC_MSG_RESULT($pep8_version)
fi
fi
+AC_ARG_WITH(2to3, AS_HELP_STRING([--with-2to3], [alternate 2to3 executable])
+AS_HELP_STRING([--with-2to3=path], [Specify 2to3 utility path]),[ PY2TO3="$withval"], [PY2TO3="2to3"])
+if [ ! -z "$PYTHON3" ] ; then
+ AC_CHECK_PROGS(PY2TO3PROG, $PY2TO3)
+fi
#----------------------------------------------------------------
# Look for Perl5
