Re: [PATCH 1/5] configure: use correct if defined

[Dan Williams <dcbw redhat com>]

On Mon, 2011-11-21 at 18:35 -0500, Thomas Graf wrote:
> On Mon, Nov 21, 2011 at 04:02:32PM -0600, Dan Williams wrote:
> > On Mon, 2011-11-21 at 08:20 -0500, Weiping Pan wrote:
> > > I only install libnl-3.2.3 on my system, and I met an error:
> > > 
> > > In file included from ../../src/nm-netlink-monitor.h:93:0,
> > > from nm-vpn-connection.c:48:
> > > ../../src/nm-netlink-compat.h:210:5: error: "HAVE_LIBNL1" is not defined
> > > ../../src/nm-netlink-compat.h:210:20: error: "HAVE_LIBNL2" is not defined
> > > make[5]: *** [libvpn_manager_la-nm-vpn-connection.lo] Error 1
> > 
> > Pushed this one to master, thanks.
> 
> Just a FYI, this is also already in the bonding branch as commit
> 
> commit e654bb8d1de85c8a3422ed80630696b08a04c520
> Author: Thomas Graf <tgraf redhat com>
> Date:   Wed Nov 9 11:22:38 2011 +0100
> 
>     netlink: Fix #if check if HAVE_LIBNL1 and HAVE_LIBNL2 are not defined
>     
>     Need to use #if defined HAVE_LIBNL1 instead of #if HAVE_LIBNL1.
>     
>     Signed-off-by: Thomas Graf <tgraf redhat com>

Yeah, I committed Weiping's patch in a slightly modified format to
conform more to what I've seen for multi defines, ie:

#if defined(A) || defined(B)

rather than:

if (defined A || defined B)

but I suppose both are valid.

Dan