← Back to branch summary

~ubuntu-branches/ubuntu/karmic/libvirt/karmic-proposed

« back to all changes in this revision

Viewing changes to gnulib/m4/netdb_h.m4

  • Committer: Bazaar Package Importer
  • Author(s): Soren Hansen
  • Date: 2009-02-11 01:01:42 UTC
  • mfrom: (1.1.9 upstream)
  • Revision ID: james.westby@ubuntu.com-20090211010142-8zrm7z1u6ryfhkiq
Tags: 0.6.0-1ubuntu1
* Merge with Debian experimental. Remaining changes:
  - debian/control:
    + Don't build-depend on QEmu.
    + Add "XS-Debian-" prefix to Debian's Vcs headers.
    + Bump bridge-utils, dnsmasq-base, netcat-openbsd, and iptables
      to Depends of libvirt-bin.
    + s/interract/interact/g
    + Add versioned Conflicts/Replaces to libvirt0 for libvirt0-dbg,
      since we used to ship them as such.
  - Rename libvirt group to libvirtd.
  - 0005-delayed_iff_up_bridge.patch: Don't try to bring up the bridge
    before at least one interface has been added to it.
  - dont_clobber_existing_bridges.patch: Assign the name of the virtual
    bridge dynamically to avoid interfering with existing bridges.
  - better_default_uri_virsh.patch: Default to qemu:///system if the
    user has write access to the libvirt socket, otherwise
    qemu:///session.
  - We call libxen-dev libxen3-dev, so change all references.
  - Included (but did not enable) opennebula patch (since it's not in
    main yet).

Show diffs side-by-side

added added

removed removed

Lines of Context:
gnulib/m4/netdb_h.m4
1
 
# netdb_h.m4 serial 3
 
1
# netdb_h.m4 serial 5
2
2
dnl Copyright (C) 2008 Free Software Foundation, Inc.
3
3
dnl This file is free software; the Free Software Foundation
4
4
dnl gives unlimited permission to copy and/or distribute it,
9
9
  AC_REQUIRE([gl_NETDB_H_DEFAULTS])
10
10
  gl_CHECK_NEXT_HEADERS([netdb.h])
11
11
  if test $ac_cv_header_netdb_h = yes; then
12
 
    AC_CHECK_TYPES([struct addrinfo], [NETDB_H=''], [NETDB_H='netdb.h'],
13
 
                   [[#include <netdb.h>]])
 
12
    AC_COMPILE_IFELSE(
 
13
      [AC_LANG_PROGRAM([[
 
14
         #include <netdb.h>
 
15
         struct addrinfo a;
 
16
         int b = EAI_OVERFLOW;
 
17
         int c = AI_NUMERICSERV;
 
18
       ]])],
 
19
      [NETDB_H=''], [NETDB_H='netdb.h'])
14
20
    HAVE_NETDB_H=1
15
21
  else
16
22
    NETDB_H='netdb.h'
30
36
AC_DEFUN([gl_NETDB_H_DEFAULTS],
31
37
[
32
38
  GNULIB_GETADDRINFO=0; AC_SUBST([GNULIB_GETADDRINFO])
 
39
  dnl Assume proper GNU behavior unless another module says otherwise.
 
40
  HAVE_STRUCT_ADDRINFO=1;   AC_SUBST([HAVE_STRUCT_ADDRINFO])
 
41
  HAVE_DECL_FREEADDRINFO=1; AC_SUBST([HAVE_DECL_FREEADDRINFO])
 
42
  HAVE_DECL_GAI_STRERROR=1; AC_SUBST([HAVE_DECL_GAI_STRERROR])
 
43
  HAVE_DECL_GETADDRINFO=1;  AC_SUBST([HAVE_DECL_GETADDRINFO])
 
44
  HAVE_DECL_GETNAMEINFO=1;  AC_SUBST([HAVE_DECL_GETNAMEINFO])
33
45
])