Mercurial > pidgin
changeset 12584:8e15977b9705
[gaim-migrate @ 14912]
Tweaking the python detection for those of use that have both python2.3 and python2.4 installed.
Now instead of depending on python pointing to pyton2.4, you can use --with-python to specify which python interpreter to use.
committer: Tailor Script <tailor@pidgin.im>
| author | Gary Kramlich <grim@reaperworld.com> |
|---|---|
| date | Tue, 20 Dec 2005 23:16:56 +0000 |
| parents | 301e9f0841d7 |
| children | 7bbd410442cb |
| files | configure.ac |
| diffstat | 1 files changed, 11 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/configure.ac Tue Dec 20 22:57:54 2005 +0000 +++ b/configure.ac Tue Dec 20 23:16:56 2005 +0000 @@ -515,10 +515,17 @@ dnl auto-generated stuff to the CVS is inelegant. Alternatively, dnl these python scripts could be rewritten in C (brrrr ...). +AC_ARG_WITH([python], + AC_HELP_STRING([--with-python], + [Which python interpreter to use for dbus code generation]), + PYTHON=$withval) if test "x$enable_dbus" = "xyes" ; then - AC_PATH_PROG([PYTHON], [python], [no]) - if test "x$PYTHON" = "xno" ; then + if test -z "$PYTHON" ; then + AC_PATH_PROG([PYTHON], [python], [no]) + fi + + if test x"$python" = x"no" ; then AC_MSG_WARN([python interpreter not found in your path]) enable_dbus=no fi @@ -528,7 +535,7 @@ if $PYTHON -c "import sys; sys.exit(sys.version[[:3]] >= '2.4')" ; then AC_MSG_WARN([python version >= 2.4 required]) enable_dbus=no - fi + fi fi dnl Here we locate the directory containing DBus .service files for @@ -1681,10 +1688,10 @@ echo Build with GtkSpell support... : $enable_gtkspell echo Build with Voice/Video support : $enable_vv echo Build with DBUS support....... : $enable_dbus -echo Build with Cyrus SASL support. : $enable_cyrus_sasl if test x$enable_dbus = xyes ; then echo DBUS session directory........ : $DBUS_SESSION_DIR fi +echo Build with Cyrus SASL support. : $enable_cyrus_sasl echo Has you....................... : yes echo echo