jyapayne/swig
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'futatuki-configure-with-2to3-as-different-name'

Browse source 
* futatuki-configure-with-2to3-as-different-name:
  Apply patch to configure with 2to3 rename for 3.0.12
This commit is contained in:
William S Fulton 2017-09-19 08:10:27 +01:00
commit 057e1e44c3
3 changed files with 7 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Examples/Makefile.in
View file

@ -386,7 +386,7 @@ else
PYSCRIPT = $(RUNME)3.py PYSCRIPT = $(RUNME)3.py
endif 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) python_run: $(PYSCRIPT)
ifneq (,$(PEP8)) ifneq (,$(PEP8))

2
Examples/test-suite/python/Makefile.in
View file

@ -16,7 +16,7 @@ PEP8_FLAGS = --ignore=E30,E402,E501,E731,W291,W391
#*_runme.py for Python 2.x, *_runme3.py for Python 3.x #*_runme.py for Python 2.x, *_runme3.py for Python 3.x
PY2SCRIPTSUFFIX = _runme.py PY2SCRIPTSUFFIX = _runme.py
PY3SCRIPTSUFFIX = _runme3.py PY3SCRIPTSUFFIX = _runme3.py
PY2TO3 = 2to3 -x import PY2TO3 = @PY2TO3PROG@ -x import
ifeq (,$(PY3)) ifeq (,$(PY3))
SCRIPTSUFFIX = $(PY2SCRIPTSUFFIX) SCRIPTSUFFIX = $(PY2SCRIPTSUFFIX)

5
configure.ac
View file

@ -902,6 +902,11 @@ if test -n "$PYINCLUDE" || test -n "$PY3INCLUDE" ; then
AC_MSG_RESULT($pep8_version) AC_MSG_RESULT($pep8_version)
fi fi
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 # Look for Perl5