Re: Initial libnl support committed

[Christopher Aillon <caillon redhat com>]

On 11/02/2005 12:33 PM, Thomas Graf wrote:
> * Christopher Aillon <caillon redhat com> 2005-11-01 22:37
>   
> > NetworkManager doesn't compile against libnl with newer kernels.
> >
> > In file included from /usr/include/netlink/route/link.h:15,
> > from NetworkManagerSystem.c:52:
> > /usr/include/linux/if.h:59: error: redefinition of ?struct ifmap?
> > /usr/include/linux/if.h:77: error: redefinition of ?struct ifreq?
> > /usr/include/linux/if.h:126: error: redefinition of ?struct ifconf?
> >
> > The attached patch to libnl fixes this, using the macro guard from 
> > iwlib.h (also under GPL).
> >     
>
> Thanks, I fixed this by making minimized local copies of linux/if.h,
> linux/if_arp.h, and linux/if_ether.h as it should have been from the
> beginning. It is up to the application using libnl to properly include
> kernel headers if required. The fix is included in 1.0-pre5.
>   
Cool.  One more fix for those using 64bit machines.  Use $LIBDIR instead 
of $PREFIX/lib

Is there a preferred way for people to submit patches, and a CVS/SVN 
repository or something that people can check out?



Use $(libdir) instead of $(prefix)/lib for 64bit awesomeness.

diff -ru libnl-1.0-pre5-64bit-issues/lib/Makefile libnl-1.0-pre5/lib/Makefile
--- libnl-1.0-pre5-64bit-issues/lib/Makefile	2005-11-02 12:29:06.000000000 -0500
+++ libnl-1.0-pre5/lib/Makefile	2005-11-02 17:07:47.000000000 -0500
@@ -13,7 +13,7 @@
     include ../Makefile.opts
 endif
 
-LIBDIR=$(prefix)/lib
+LIBDIR=$(libdir)
 
 # Core
 CIN      := $(wildcard *.c)
diff -ru libnl-1.0-pre5-64bit-issues/Makefile.opts.in libnl-1.0-pre5/Makefile.opts.in
--- libnl-1.0-pre5-64bit-issues/Makefile.opts.in	2005-11-02 12:29:06.000000000 -0500
+++ libnl-1.0-pre5/Makefile.opts.in	2005-11-02 17:06:50.000000000 -0500
@@ -19,6 +19,7 @@
 LIBNL_LIB        := @LIBNL_LIB@
 
 prefix           := @prefix@
+libdir           := @libdir@
 mandir           := @mandir@
 sysconfdir       := @sysconfdir@