| author | Stefan Teleman <stefan.teleman@oracle.com> |
| Thu, 28 Oct 2010 22:15:43 -0700 | |
| changeset 1029 | 2433d5075f1f |
| permissions | -rw-r--r-- |
|
1029
2433d5075f1f
6667057 Introduce libXcb in Solaris [PSARC 2010/109]
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
1 |
--- aclocal.m4 2010-08-13 04:46:51.000000000 -0700 |
|
2433d5075f1f
6667057 Introduce libXcb in Solaris [PSARC 2010/109]
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
2 |
+++ aclocal.m4 2010-10-12 11:20:55.270006000 -0700 |
|
2433d5075f1f
6667057 Introduce libXcb in Solaris [PSARC 2010/109]
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
3 |
@@ -8911,7 +8911,7 @@ |
|
2433d5075f1f
6667057 Introduce libXcb in Solaris [PSARC 2010/109]
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
4 |
am_display_PYTHON=python |
|
2433d5075f1f
6667057 Introduce libXcb in Solaris [PSARC 2010/109]
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
5 |
], [ |
|
2433d5075f1f
6667057 Introduce libXcb in Solaris [PSARC 2010/109]
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
6 |
dnl A version check is needed. |
|
2433d5075f1f
6667057 Introduce libXcb in Solaris [PSARC 2010/109]
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
7 |
- if test -n "$PYTHON"; then |
|
2433d5075f1f
6667057 Introduce libXcb in Solaris [PSARC 2010/109]
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
8 |
+ if [ "x$PYTHON" = "x" ] ; then |
|
2433d5075f1f
6667057 Introduce libXcb in Solaris [PSARC 2010/109]
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
9 |
# If the user set $PYTHON, use it and don't search something else. |
|
2433d5075f1f
6667057 Introduce libXcb in Solaris [PSARC 2010/109]
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
10 |
AC_MSG_CHECKING([whether $PYTHON version >= $1]) |
|
2433d5075f1f
6667057 Introduce libXcb in Solaris [PSARC 2010/109]
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
11 |
AM_PYTHON_CHECK_VERSION([$PYTHON], [$1], |
|
2433d5075f1f
6667057 Introduce libXcb in Solaris [PSARC 2010/109]
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
12 |
@@ -8929,7 +8929,7 @@ |
|
2433d5075f1f
6667057 Introduce libXcb in Solaris [PSARC 2010/109]
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
13 |
done]) |
|
2433d5075f1f
6667057 Introduce libXcb in Solaris [PSARC 2010/109]
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
14 |
# Set $PYTHON to the absolute path of $am_cv_pathless_PYTHON. |
|
2433d5075f1f
6667057 Introduce libXcb in Solaris [PSARC 2010/109]
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
15 |
if test "$am_cv_pathless_PYTHON" = none; then |
|
2433d5075f1f
6667057 Introduce libXcb in Solaris [PSARC 2010/109]
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
16 |
- PYTHON=: |
|
2433d5075f1f
6667057 Introduce libXcb in Solaris [PSARC 2010/109]
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
17 |
+ PYTHON=/usr/bin/python2.6 |
|
2433d5075f1f
6667057 Introduce libXcb in Solaris [PSARC 2010/109]
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
18 |
else |
|
2433d5075f1f
6667057 Introduce libXcb in Solaris [PSARC 2010/109]
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
19 |
AC_PATH_PROG([PYTHON], [$am_cv_pathless_PYTHON]) |
|
2433d5075f1f
6667057 Introduce libXcb in Solaris [PSARC 2010/109]
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
20 |
fi |