Mercurial > pidgin.yaz
comparison configure.ac @ 21935:d230e1cfff62
Don't print "no" twice when we can't find a library
| author | Mark Doliner <mark@kingant.net> |
|---|---|
| date | Tue, 25 Dec 2007 04:16:23 +0000 |
| parents | a0b0d20ba15a |
| children | 04345460e9c7 c38d72677c8a 60f5abc6cf0c |
comparison
equal
deleted
inserted
replaced
| 21934:cebfc2263199 | 21935:d230e1cfff62 |
|---|---|
| 676 dnl # Check for Meanwhile headers (for Sametime) | 676 dnl # Check for Meanwhile headers (for Sametime) |
| 677 dnl ####################################################################### | 677 dnl ####################################################################### |
| 678 PKG_CHECK_MODULES(MEANWHILE, [meanwhile >= 1.0.0 meanwhile < 2.0.0], [ | 678 PKG_CHECK_MODULES(MEANWHILE, [meanwhile >= 1.0.0 meanwhile < 2.0.0], [ |
| 679 have_meanwhile="yes" | 679 have_meanwhile="yes" |
| 680 ], [ | 680 ], [ |
| 681 AC_MSG_RESULT(no) | |
| 682 have_meanwhile="no" | 681 have_meanwhile="no" |
| 683 ]) | 682 ]) |
| 684 AC_SUBST(MEANWHILE_CFLAGS) | 683 AC_SUBST(MEANWHILE_CFLAGS) |
| 685 AC_SUBST(MEANWHILE_LIBS) | 684 AC_SUBST(MEANWHILE_LIBS) |
| 686 | 685 |
| 695 dnl Attempt to autodetect Avahi | 694 dnl Attempt to autodetect Avahi |
| 696 PKG_CHECK_MODULES(AVAHI, [avahi-client avahi-glib], [ | 695 PKG_CHECK_MODULES(AVAHI, [avahi-client avahi-glib], [ |
| 697 avahiincludes="yes" | 696 avahiincludes="yes" |
| 698 avahilibs="yes" | 697 avahilibs="yes" |
| 699 ], [ | 698 ], [ |
| 700 AC_MSG_RESULT(no) | |
| 701 avahiincludes="no" | 699 avahiincludes="no" |
| 702 avahilibs="no" | 700 avahilibs="no" |
| 703 ]) | 701 ]) |
| 704 | 702 |
| 705 dnl Override AVAHI_CFLAGS if the user specified an include dir | 703 dnl Override AVAHI_CFLAGS if the user specified an include dir |
| 740 PKG_CHECK_MODULES(SILC, [silcclient >= 1.1], [ | 738 PKG_CHECK_MODULES(SILC, [silcclient >= 1.1], [ |
| 741 have_silc="yes" | 739 have_silc="yes" |
| 742 silcincludes="yes" | 740 silcincludes="yes" |
| 743 silcclient="yes" | 741 silcclient="yes" |
| 744 ], [ | 742 ], [ |
| 745 AC_MSG_RESULT(no) | |
| 746 have_silc="no" | 743 have_silc="no" |
| 747 ]) | 744 ]) |
| 748 if test "x$have_silc" = "xno"; then | 745 if test "x$have_silc" = "xno"; then |
| 749 PKG_CHECK_MODULES(SILC, silcclient, [ | 746 PKG_CHECK_MODULES(SILC, silcclient, [ |
| 750 have_silc="yes" | 747 have_silc="yes" |
| 751 silc10includes="yes" | 748 silc10includes="yes" |
| 752 silc10client="yes" | 749 silc10client="yes" |
| 753 ], [ | 750 ], [ |
| 754 AC_MSG_RESULT(no) | |
| 755 have_silc="no" | 751 have_silc="no" |
| 756 ]) | 752 ]) |
| 757 dnl If silcclient.pc wasn't found, check for just silc.pc | 753 dnl If silcclient.pc wasn't found, check for just silc.pc |
| 758 if test "x$have_silc" = "xno"; then | 754 if test "x$have_silc" = "xno"; then |
| 759 PKG_CHECK_MODULES(SILC, silc, [ | 755 PKG_CHECK_MODULES(SILC, silc, [ |
| 760 have_silc="yes" | 756 have_silc="yes" |
| 761 silc10includes="yes" | 757 silc10includes="yes" |
| 762 silc10client="yes" | 758 silc10client="yes" |
| 763 ], [ | 759 ], [ |
| 764 AC_MSG_RESULT(no) | |
| 765 have_silc="no" | 760 have_silc="no" |
| 766 ]) | 761 ]) |
| 767 fi | 762 fi |
| 768 fi | 763 fi |
| 769 else | 764 else |
| 1152 PKG_CHECK_MODULES(DBUS, [dbus-1 >= 0.35 dbus-glib-1 >= 0.35], [ | 1147 PKG_CHECK_MODULES(DBUS, [dbus-1 >= 0.35 dbus-glib-1 >= 0.35], [ |
| 1153 AC_SUBST(DBUS_CFLAGS) | 1148 AC_SUBST(DBUS_CFLAGS) |
| 1154 AC_SUBST(DBUS_LIBS) | 1149 AC_SUBST(DBUS_LIBS) |
| 1155 enable_dbus=yes | 1150 enable_dbus=yes |
| 1156 ], [ | 1151 ], [ |
| 1157 AC_MSG_RESULT(no) | |
| 1158 enable_dbus=no | 1152 enable_dbus=no |
| 1159 ]) | 1153 ]) |
| 1160 | 1154 |
| 1161 dnl Check for libnm_glib; if we don't have it, oh well | 1155 dnl Check for libnm_glib; if we don't have it, oh well |
| 1162 if test "x$enable_libnm" = "xyes" ; then | 1156 if test "x$enable_libnm" = "xyes" ; then |