Mercurial > pidgin.yaz
diff configure.ac @ 30954:48f70e888c04
propagate from branch 'im.pidgin.pidgin' (head 8cc16fcb41111aae817fe10168b40d82990895c5)
to branch 'im.pidgin.cpw.malu.xmpp.google_relay' (head 72d65c944b0cad18592ac527559d320f9fd32e58)
author | Marcus Lundblad <ml@update.uu.se> |
---|---|
date | Sun, 14 Feb 2010 22:26:14 +0000 |
parents | 6288bbd53f44 |
children | d77ecfe2b2c9 1eeeb20f0b9f 5dec9d90fb51 1e4781fb144b |
line wrap: on
line diff
--- a/configure.ac Fri Jan 08 23:33:51 2010 +0000 +++ b/configure.ac Sun Feb 14 22:26:14 2010 +0000 @@ -144,7 +144,7 @@ ;; esac -ALL_LINGUAS="af am ar az be@latin bg bn bs ca ca@valencia cs da de dz el en_AU en_CA en_GB eo es et eu fa fi fr ga gl gu he hi hu hy id it ja ka km kn ko ku lo lt mk mn ms_MY my_MM nb ne nl nn oc pa pl pt_BR pt ps ro ru si sk sl sq sr sr@latin sv sw ta te th tr uk ur vi xh zh_CN zh_HK zh_TW" +ALL_LINGUAS="af am ar az be@latin bg bn bs ca ca@valencia cs da de dz el en_AU en_CA en_GB eo es et eu fa fi fr ga gl gu he hi hu hy id it ja ka km kn ko ku lo lt mk mn mr ms_MY my_MM nb ne nl nn oc or pa pl pt_BR pt ps ro ru si sk sl sq sr sr@latin sv sw ta te th tr uk ur vi xh zh_CN zh_HK zh_TW" AM_GLIB_GNU_GETTEXT dnl If we don't have msgfmt, then po/ is going to fail -- ensure that @@ -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) @@ -2384,30 +2393,6 @@ AC_DEFINE(HAVE_TM_GMTOFF, 1, [Define if you have a tm_gmtoff member in struct tm]) fi -AC_CACHE_CHECK([whether va_lists can be copied by value], ac_cv_va_val_copy,[ - AC_TRY_RUN([#include <stdarg.h> -#include <stdlib.h> - void f (int i, ...) { - va_list args1, args2; - va_start (args1, i); - args2 = args1; - if (va_arg (args2, int) != 42 || va_arg (args1, int) != 42) - exit (1); - va_end (args1); va_end (args2); - } - int main() { - f (0, 42); - return 0; - }], - [ac_cv_va_val_copy=yes], - [ac_cv_va_val_copy=no], - [ac_cv_va_val_copy=yes]) -]) - -if test "x$ac_cv_va_val_copy" = "xno"; then - AC_DEFINE(VA_COPY_AS_ARRAY, 1, ['va_lists' cannot be copied as values]) -fi - dnl ####################################################################### dnl # Check for check dnl #######################################################################