diff options
| author | Michael Stahl <mstahl@redhat.com> | 2012-11-27 15:32:36 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2012-11-27 16:57:19 +0100 |
| commit | 9d921baa17c3ee8d3c7be0cab5980d0f66319891 (patch) | |
| tree | 62f6b0b54e7f1db9a747ffc5a4065a509a0076b8 /configure.ac | |
| parent | 0c8e2ee3b4bf133d59fd956715418196e0922187 (diff) | |
clean up PYTHON related version etc. variables:
- configure defines PYTHON_VERSION, PYTHON_VERSION_MAJOR,
PYTHON_VERSION_MINOR
- remove pyversion.Makefile
Change-Id: I19ac8df18a520ad56bf63ea038dc0769b8249d0b
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/configure.ac b/configure.ac index 71dcd56302fb..a5296e144bd0 100644 --- a/configure.ac +++ b/configure.ac @@ -7422,8 +7422,9 @@ if test $enable_python = system; then # actual distro package? # 2.6.2 currently on OpenSUSE 12.1? # rpm -q mingw32-python => mingw32-python-2.6.2-17.17.noarch - MINGW_PYTHON_MAJOR_VERSION="$python_version" - MINGW_PYVERSION=$python_version.2 + PYTHON_VERSION=$python_version.2 + PYTHON_MAJOR=${python_version%.*} + PYTHON_MINOR=${python_version#*.} break fi done @@ -7464,6 +7465,9 @@ int main(int argc, char **argv) { internal) SYSTEM_PYTHON=NO + PYTHON_VERSION_MAJOR=3 + PYTHON_VERSION_MINOR=3 + PYTHON_VERSION=${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}.0 PYTHON_TARBALL="b3b2524f72409d919a4137826a870a8f-Python-3.3.0.tar.bz2" BUILD_TYPE="$BUILD_TYPE PYTHON" # Embedded Python dies without Home set @@ -7498,12 +7502,13 @@ AC_SUBST(SYSTEM_PYTHON) AC_SUBST(PYTHON_CFLAGS) AC_SUBST(PYTHON_LIBS) AC_SUBST(PYTHON_TARBALL) +AC_SUBST(PYTHON_VERSION) +AC_SUBST(PYTHON_VERSION_MAJOR) +AC_SUBST(PYTHON_VERSION_MINOR) AC_SUBST([MINGW_PYTHON_EXE]) AC_SUBST([MINGW_PYTHON_DLL]) AC_SUBST([MINGW_READLINE_DLL]) AC_SUBST([MINGW_TERMCAP_DLL]) -AC_SUBST(MINGW_PYVERSION) -AC_SUBST(MINGW_PYTHON_MAJOR_VERSION) AC_MSG_CHECKING([whether to build the MySQL Connector extension]) if test "x$enable_ext_mysql_connector" = "xyes" -a "x$enable_extension_integration" != "xno"; then |