Mercurial > pidgin
changeset 28896:4d7499dc540d
Patch from Gabriel Schulhof to correctly disable all missing dependencies
if --disable-missing-dependencies is passed to configure. In some cases,
this would only result in incorrect output from configure (yes, instead of
no), but I think a few cases would probably not compile.
Fixes #10623.
committer: Elliott Sales de Andrade <qulogic@pidgin.im>
| author | Gabriel Schulhof <nix@go-nix.ca> |
|---|---|
| date | Sun, 17 Jan 2010 00:59:14 +0000 |
| parents | 5c2bbeef2eb8 |
| children | 337ab97fa198 |
| files | ChangeLog configure.ac |
| diffstat | 2 files changed, 15 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Sat Jan 16 23:14:41 2010 +0000 +++ b/ChangeLog Sun Jan 17 00:59:14 2010 +0000 @@ -4,6 +4,10 @@ libpurple: * Fix 'make check' on OS X. (David Fang) + General: + * Correctly disable all missing dependencies when using the + --disable-missing-dependencies option. (Gabriel Schulhof) + Gadu-Gadu: * Fix display of avatars after a server-side change. (Krzysztof Klinikowski)
--- a/configure.ac Sat Jan 16 23:14:41 2010 +0000 +++ b/configure.ac Sun Jan 17 00:59:14 2010 +0000 @@ -426,6 +426,7 @@ X11_LIBS="$x_libpath_add" X11_CFLAGS="$x_incpath_add" else + with_x="no" if test "x$force_deps" = "xyes" ; then AC_MSG_ERROR([ X11 development headers not found. @@ -528,6 +529,7 @@ if test "x$enable_startup_notification" = "xyes"; then PKG_CHECK_MODULES(STARTUP_NOTIFICATION, [libstartup-notification-1.0 >= 0.5], , [ AC_MSG_RESULT(no) + enable_startup_notification="no" if test "x$force_deps" = "xyes" ; then AC_MSG_ERROR([ Startup notification development headers not found. @@ -548,6 +550,7 @@ if test "x$enable_gtkspell" = "xyes" ; then PKG_CHECK_MODULES(GTKSPELL, gtkspell-2.0 >= 2.0.2, , [ AC_MSG_RESULT(no) + enable_gtkspell="no" if test "x$force_deps" = "xyes" ; then AC_MSG_ERROR([ GtkSpell development headers not found. @@ -598,6 +601,7 @@ if test "x$enable_cap" = "xyes"; then PKG_CHECK_MODULES(SQLITE3, sqlite3 >= 3.3,,[ AC_MSG_RESULT(no) + enable_cap="no" if test "x$force_deps" = "xyes" ; then AC_MSG_ERROR([ sqlite3 development headers not found. @@ -746,6 +750,7 @@ [], [$GSTREAMER_LIBS]) ], [ AC_MSG_RESULT(no) + enable_gst="no" if test "x$force_deps" = "xyes" ; then AC_MSG_ERROR([ GStreamer development headers not found. @@ -826,6 +831,7 @@ AC_SUBST(IDN_LIBS) ], [ AC_MSG_RESULT(no) + enable_idn="no" if test "x$force_deps" = "xyes" ; then AC_MSG_ERROR([ GNU Libidn development headers not found. @@ -898,11 +904,14 @@ AC_CHECK_LIB(avahi-client, avahi_client_new, [avahilibs=yes], [avahilibs=no], $AVAHI_LIBS) fi -if test "x$enable_avahi" = "xyes" -a "x$force_deps" = "xyes" -a \( "x$avahiincludes" = "xno" -o "x$avahilibs" = "xno" \); then - AC_MSG_ERROR([ +if test "x$enable_avahi" = "xyes" -a \( "x$avahiincludes" = "xno" -o "x$avahilibs" = "xno" \); then + enable_avahi="no" + if test "x$force_deps" = "xyes"; then + AC_MSG_ERROR([ avahi development headers not found. Use --disable-avahi if you do not need avahi (Bonjour) support. ]) + fi fi AC_SUBST(AVAHI_CFLAGS) AC_SUBST(AVAHI_LIBS)