Re: [PATCH 1/2] respect libnl flags also in backends/ip6-manager

[Dan Williams <dcbw redhat com>]

On Sat, 2011-05-07 at 16:28 +0200, Paul Menzel wrote:
> From: Martin Jansa <Martin Jansa gmail com>
> Date: Wed, 23 Mar 2011 17:27:54 +0100
> 
> `backend/ip6-manager` didn't respect `LIBNL_CFLAGS` and used `/usr/include/netlink` headers from libnl 2 instead.
> 
> This patch is used in OpenEmbedded [1] since commit 154bd72b [2][3].
> 
> [1] http://www.openembedded.org/
> [2] http://cgit.openembedded.org/cgit.cgi/openembedded/log/recipes/networkmanager/networkmanager/0001-respect-libnl-flags-also-in-backends-ip6-manager.patch
> [3] http://cgit.openembedded.org/cgit.cgi/openembedded/commit/?id=154bd72b1ca859afcae5ed4fe99ed611a13a475c
> 
> Signed-off-by: Martin Jansa <Martin Jansa gmail com>

Pushed to master and 0.8.x, thanks!

Dan

> ---
>  src/backends/Makefile.am    |    2 ++
>  src/ip6-manager/Makefile.am |    2 ++
>  2 files changed, 4 insertions(+), 0 deletions(-)
> 
> diff --git a/src/backends/Makefile.am b/src/backends/Makefile.am
> index fbec9aa..c0780d0 100644
> --- a/src/backends/Makefile.am
> +++ b/src/backends/Makefile.am
> @@ -63,10 +63,12 @@ endif
>  
>  libnmbackend_la_LIBADD += \
>  	$(top_builddir)/src/logging/libnm-logging.la \
> +	$(LIBNL_LIBS) \
>  	$(DBUS_LIBS) \
>  	$(GLIB_LIBS)
>  
>  libnmbackend_la_CPPFLAGS = \
> +	$(LIBNL_CFLAGS) \
>  	$(DBUS_CFLAGS) \
>  	$(GLIB_CFLAGS) \
>  	-DG_DISABLE_DEPRECATED \
> diff --git a/src/ip6-manager/Makefile.am b/src/ip6-manager/Makefile.am
> index b56b197..b98d6de 100644
> --- a/src/ip6-manager/Makefile.am
> +++ b/src/ip6-manager/Makefile.am
> @@ -13,6 +13,7 @@ libip6_manager_la_SOURCES = \
>  	nm-ip6-manager.h
>  
>  libip6_manager_la_CPPFLAGS = \
> +	$(LIBNL_CFLAGS) \
>  	$(DBUS_CFLAGS) \
>  	$(GLIB_CFLAGS) \
>  	-DG_DISABLE_DEPRECATED
> @@ -20,6 +21,7 @@ libip6_manager_la_CPPFLAGS = \
>  libip6_manager_la_LIBADD = \
>  	$(top_builddir)/marshallers/libmarshallers.la \
>  	$(top_builddir)/src/logging/libnm-logging.la \
> +	$(LIBNL_LIBS) \
>  	$(DBUS_LIBS) \
>  	$(GLIB_LIBS)
>  
> _______________________________________________
> networkmanager-list mailing list
> networkmanager-list gnome org
> http://mail.gnome.org/mailman/listinfo/networkmanager-list