[svn] commit: r336 - in /branches/parkinglot: configure.ac src/bin/bigtool/run_bigtool src/bin/bigtool/run_bigtool.in src/bin/bind-cfgd/bind-cfgd.in src/bin/bind10/bind10.in src/bin/pymsgq/msgq.in
BIND 10 source code commits
bind10-changes at lists.isc.org
Thu Dec 3 08:21:02 UTC 2009
Author: mgraff
Date: Thu Dec 3 08:21:01 2009
New Revision: 336
Log:
search for python, python3, and then python3.1. Require version 3.1. Use @PYTHON@ in all .in files, and add run_bigtool.in. This should cover all script wrappers.
Added:
branches/parkinglot/src/bin/bigtool/run_bigtool.in
Removed:
branches/parkinglot/src/bin/bigtool/run_bigtool
Modified:
branches/parkinglot/configure.ac
branches/parkinglot/src/bin/bind-cfgd/bind-cfgd.in
branches/parkinglot/src/bin/bind10/bind10.in
branches/parkinglot/src/bin/pymsgq/msgq.in
Modified: branches/parkinglot/configure.ac
==============================================================================
--- branches/parkinglot/configure.ac (original)
+++ branches/parkinglot/configure.ac Thu Dec 3 08:21:01 2009
@@ -11,6 +11,9 @@
AC_PROG_CXX
AC_PROG_CC
AC_PROG_RANLIB
+
+m4_define([_AM_PYTHON_INTERPRETER_LIST], [python python3 python3.1])
+AM_PATH_PYTHON([3.1])
# Checks for libraries.
@@ -63,10 +66,12 @@
src/lib/dns/Makefile
])
AC_OUTPUT([src/bin/bind-cfgd/bind-cfgd
+ src/bin/bigtool/run_bigtool
src/bin/bind10/bind10
src/bin/pymsgq/msgq
], [
chmod +x src/bin/bind-cfgd/bind-cfgd
+ chmod +x src/bin/bigtool/run_bigtool
chmod +x src/bin/bind10/bind10
chmod +x src/bin/pymsgq/msgq
])
Modified: branches/parkinglot/src/bin/bind-cfgd/bind-cfgd.in
==============================================================================
--- branches/parkinglot/src/bin/bind-cfgd/bind-cfgd.in (original)
+++ branches/parkinglot/src/bin/bind-cfgd/bind-cfgd.in Thu Dec 3 08:21:01 2009
@@ -3,7 +3,7 @@
BINPATH=@abs_top_srcdir@/src/lib/bind-cfgd/python
LIBPATH=@abs_top_srcdir@/src/lib/cc/python
-PYTHON_EXEC=${PYTHON_EXEC:-/usr/bin/python3.0}
+PYTHON_EXEC=${PYTHON_EXEC:- at PYTHON@}
PYTHONPATH=${LIBPATH}:${PYTHONPATH} ${PYTHON_EXEC} ${BINPATH}/bind-cfgd.py
Modified: branches/parkinglot/src/bin/bind10/bind10.in
==============================================================================
--- branches/parkinglot/src/bin/bind10/bind10.in (original)
+++ branches/parkinglot/src/bin/bind10/bind10.in Thu Dec 3 08:21:01 2009
@@ -1,6 +1,6 @@
#! /bin/sh
-PYTHON_EXEC=${PYTHON_EXEC:-/usr/bin/python3.0}
+PYTHON_EXEC=${PYTHON_EXEC:- at PYTHON@}
export PYTHON_EXEC
BIND10_PATH=@abs_top_srcdir@/src/bin/bind10
Modified: branches/parkinglot/src/bin/pymsgq/msgq.in
==============================================================================
--- branches/parkinglot/src/bin/pymsgq/msgq.in (original)
+++ branches/parkinglot/src/bin/pymsgq/msgq.in Thu Dec 3 08:21:01 2009
@@ -1,6 +1,6 @@
#! /bin/sh
-PYTHON_EXEC=${PYTHON_EXEC:-python3.1}
+PYTHON_EXEC=${PYTHON_EXEC:- at PYTHON@}
export PYTHON_EXEC
MYPATH_PATH=@abs_top_srcdir@/src/bin/pymsgq
More information about the bind10-changes
mailing list