Sophie

Sophie

distrib > Mageia > 7 > i586 > by-pkgid > 0250d6fbc4d7354c643a150ddbc061bf > files > 2

netcf-0.2.8-5.mga7.src.rpm

From: Mathieu Trudel-Lapierre <mathieu.trudel-lapierre@canonical.com>
Subject: Make sure netcf gets correctly linked against libnl3; and
 searches for the headers in the right place.

diff -Nurp netcf-0.1.9.0002/configure.ac netcf-0.1.9.0008/configure.ac
--- netcf-0.1.9.0002/configure.ac	2012-03-20 14:22:45.846996694 +0200
+++ netcf-0.1.9.0008/configure.ac	2012-03-20 14:26:54.133918478 +0200
@@ -32,7 +32,7 @@ PKG_CHECK_MODULES([LIBAUGEAS], [augeas >
 PKG_CHECK_MODULES([LIBXML], [libxml-2.0])
 PKG_CHECK_MODULES([LIBXSLT], [libxslt])
 PKG_CHECK_MODULES([LIBEXSLT], [libexslt])
-PKG_CHECK_MODULES([LIBNL], [libnl-3.0])
+PKG_CHECK_MODULES([LIBNL], [libnl-3.0 libnl-route-3.0])
 
 NETCF_CHECK_READLINE
 
diff -Nurp netcf-0.1.9.0002/src/Makefile.am netcf-0.1.9.0008/src/Makefile.am
--- netcf-0.1.9.0002/src/Makefile.am	2011-05-20 21:40:22.000000000 +0300
+++ netcf-0.1.9.0008/src/Makefile.am	2012-03-20 14:25:26.414236154 +0200
@@ -3,7 +3,7 @@ GNULIB= ../gnulib/lib/libgnu.la
 GNULIB_CFLAGS= -I $(top_srcdir)/gnulib/lib
 
 AM_CFLAGS = $(NETCF_CFLAGS) $(GNULIB_CFLAGS) $(WARN_CFLAGS) \
-  $(LIBXML_CFLAGS) $(LIBXSLT_CFLAGS) $(LIBAUGEAS_CFLAGS)
+  $(LIBXML_CFLAGS) $(LIBXSLT_CFLAGS) $(LIBAUGEAS_CFLAGS) $(LIBNL_CFLAGS)
 
 include_HEADERS = netcf.h
 
@@ -35,7 +35,7 @@ libnetcf_la_LIBADD = $(NETCF_LIBDEPS) $(
 libnetcf_la_DEPENDENCIES = $(libnetcf_la_LIBADD) netcf.syms
 
 ncftool_SOURCES = ncftool.c
-ncftool_LDADD = libnetcf.la $(READLINE_LIBS) $(GNULIB)
+ncftool_LDADD = libnetcf.la $(READLINE_LIBS) $(GNULIB) $(LIBNL_LIBS)
 
 ncftransform_SOURCES = ncftransform.c
 ncftransform_LDADD = libnetcf.la $(GNULIB)