Mercurial > pidgin
comparison configure.ac @ 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 | f75c0d35e032 |
children | e856f985a0b9 |
comparison
equal
deleted
inserted
replaced
12583:301e9f0841d7 | 12584:8e15977b9705 |
---|---|
513 dnl This autogenerated code is system-independent, so in principle we | 513 dnl This autogenerated code is system-independent, so in principle we |
514 dnl can generate all of it before shipping. But I thought adding | 514 dnl can generate all of it before shipping. But I thought adding |
515 dnl auto-generated stuff to the CVS is inelegant. Alternatively, | 515 dnl auto-generated stuff to the CVS is inelegant. Alternatively, |
516 dnl these python scripts could be rewritten in C (brrrr ...). | 516 dnl these python scripts could be rewritten in C (brrrr ...). |
517 | 517 |
518 AC_ARG_WITH([python], | |
519 AC_HELP_STRING([--with-python], | |
520 [Which python interpreter to use for dbus code generation]), | |
521 PYTHON=$withval) | |
518 | 522 |
519 if test "x$enable_dbus" = "xyes" ; then | 523 if test "x$enable_dbus" = "xyes" ; then |
520 AC_PATH_PROG([PYTHON], [python], [no]) | 524 if test -z "$PYTHON" ; then |
521 if test "x$PYTHON" = "xno" ; then | 525 AC_PATH_PROG([PYTHON], [python], [no]) |
526 fi | |
527 | |
528 if test x"$python" = x"no" ; then | |
522 AC_MSG_WARN([python interpreter not found in your path]) | 529 AC_MSG_WARN([python interpreter not found in your path]) |
523 enable_dbus=no | 530 enable_dbus=no |
524 fi | 531 fi |
525 fi | 532 fi |
526 | 533 |
527 if test "x$enable_dbus" = "xyes" ; then | 534 if test "x$enable_dbus" = "xyes" ; then |
528 if $PYTHON -c "import sys; sys.exit(sys.version[[:3]] >= '2.4')" ; then | 535 if $PYTHON -c "import sys; sys.exit(sys.version[[:3]] >= '2.4')" ; then |
529 AC_MSG_WARN([python version >= 2.4 required]) | 536 AC_MSG_WARN([python version >= 2.4 required]) |
530 enable_dbus=no | 537 enable_dbus=no |
531 fi | 538 fi |
532 fi | 539 fi |
533 | 540 |
534 dnl Here we locate the directory containing DBus .service files for | 541 dnl Here we locate the directory containing DBus .service files for |
535 dnl the session bus. Adapted from the guifications project. | 542 dnl the session bus. Adapted from the guifications project. |
536 | 543 |
1679 echo Build with Tk support......... : $enable_tk | 1686 echo Build with Tk support......... : $enable_tk |
1680 echo Build with Audio support...... : $enable_audio | 1687 echo Build with Audio support...... : $enable_audio |
1681 echo Build with GtkSpell support... : $enable_gtkspell | 1688 echo Build with GtkSpell support... : $enable_gtkspell |
1682 echo Build with Voice/Video support : $enable_vv | 1689 echo Build with Voice/Video support : $enable_vv |
1683 echo Build with DBUS support....... : $enable_dbus | 1690 echo Build with DBUS support....... : $enable_dbus |
1684 echo Build with Cyrus SASL support. : $enable_cyrus_sasl | |
1685 if test x$enable_dbus = xyes ; then | 1691 if test x$enable_dbus = xyes ; then |
1686 echo DBUS session directory........ : $DBUS_SESSION_DIR | 1692 echo DBUS session directory........ : $DBUS_SESSION_DIR |
1687 fi | 1693 fi |
1694 echo Build with Cyrus SASL support. : $enable_cyrus_sasl | |
1688 echo Has you....................... : yes | 1695 echo Has you....................... : yes |
1689 echo | 1696 echo |
1690 echo | 1697 echo |
1691 echo Use kerberos 4 with zephyr.... : $kerberos | 1698 echo Use kerberos 4 with zephyr.... : $kerberos |
1692 echo Use external libzephyr........ : $zephyr | 1699 echo Use external libzephyr........ : $zephyr |