diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | configure.in | 64 |
2 files changed, 6 insertions, 63 deletions
@@ -1,3 +1,8 @@ +2005-11-26 Tor Lillqvist <tml@novell.com> + + * configure.in: Drop the IPv6 and getaddrinfo checks, unused here + in Evolution. (It's used in e-d-s, though.) + 2005-11-23 Srinivasa Ragavan <sragavan@novell.com> * configure.in: Made hal dependency optional. diff --git a/configure.in b/configure.in index bc8e448854..f6e3212a3b 100644 --- a/configure.in +++ b/configure.in @@ -400,67 +400,6 @@ AC_SUBST(A11Y_CFLAGS) AC_SUBST(A11Y_LIBS) dnl ************************************************** -dnl * IPv6 support and getaddrinfo calls -dnl ************************************************** -AC_CACHE_CHECK([if system supports getaddrinfo and getnameinfo], have_addrinfo, -[ - AC_TRY_COMPILE([ - #include "confdefs.h" - #include <sys/types.h> - #include <sys/socket.h> - #include <netinet/in.h> - #include <netdb.h> - - ],[ - struct addrinfo hints, *res; - struct sockaddr_in6 sin6; - int af = AF_INET6; - char host[NI_MAXHOST]; - char serv[NI_MAXSERV]; - - getaddrinfo("www.ximian.com", 0, &hints, &res); - freeaddrinfo(res); - getnameinfo((struct sockaddr *)&sin6, sizeof(sin6), host, sizeof(host), serv, sizeof(serv), 0); - ],[ - have_addrinfo=yes - ],[ - have_addrinfo=no - ]) -]) - -if test x"$have_addrinfo" = "xno" ; then - AC_DEFINE(NEED_ADDRINFO,1,[Enable getaddrinfo emulation]) - if test x"$enable_ipv6" = "xyes" ; then - AC_ERROR(system doesn't support necessary interfaces for ipv6 support) - fi - msg_ipv6=no -else - AC_ARG_ENABLE(ipv6, [ --enable-ipv6=[no/yes] Enable support for resolving IPv6 addresses.],,enable_ipv6=yes) - if test x"$enable_ipv6" = "xyes"; then - msg_ipv6=yes - AC_DEFINE(ENABLE_IPv6,1,[Enable IPv6 support]) - AC_TRY_COMPILE([ - #include "confdefs.h" - #include <sys/types.h> - #include <sys/socket.h> - #include <netinet/in.h> - #include <netdb.h> - - ],[ - struct addrinfo hints; - - hints.ai_flags = AI_ADDRCONFIG; - ],[ - AC_DEFINE(HAVE_AI_ADDRCONFIG,1,[Define if the system defines the AI_ADDRCONFIG flag for getaddrinfo]) - ]) - else - msg_ipv6=no - fi -fi - -AM_CONDITIONAL(ENABLE_IPv6, test "x$enable_ipv6" = "xyes") - -dnl ************************************************** dnl LDAP support. dnl ************************************************** if test "$os_win32" != yes; then @@ -486,7 +425,7 @@ AC_SUBST(LDAP_CFLAGS) AC_SUBST(LDAP_LIBS) AC_DEFINE(HAVE_LDAP,1,[Define if you have LDAP support]) AM_CONDITIONAL(ENABLE_LDAP, true) -msg_exchange="yes" +msg_ldap="yes" fi # Win32 dnl ************************************************** @@ -1762,7 +1701,6 @@ echo "\ Kerberos 4/5: $msg_krb4/$msg_krb5 SSL support: $msg_ssl SMIME support: $msg_smime - IPv6 support: $msg_ipv6 Plugins: $msg_plugins Gtk-doc: $enable_gtk_doc DBus API version $DBUS_VERSION" |