[Xen-devel] [PATCH 4 of 4 RFC] xl/remus: Add libnl3 dependency to autoconf scripts and libxl/Makefile

[Shriram Rajagopalan <rshriram@xxxxxxxxx>]

Add dependency on libnl3 version 3.2.17 or higher to autoconf.
Add include flags and link to relevant libraries in tools/libxl/Makefile.

Signed-off-by: Shriram Rajagopalan <rshriram@xxxxxxxxx>

diff -r bef729fc4336 -r c4c05e4e4e02 tools/configure.ac
--- a/tools/configure.ac        Thu Jul 25 00:02:22 2013 -0700
+++ b/tools/configure.ac        Thu Jul 25 00:02:33 2013 -0700
@@ -171,4 +171,12 @@ AC_SUBST(libiconv)
 # Checks for header files.
 AC_CHECK_HEADERS([yajl/yajl_version.h sys/eventfd.h])
 
+# Checks for libnl3 libraries and headers.
+PKG_CHECK_MODULES(LIBNL3, libnl-3.0 >= 3.2.17 libnl-route-3.0 >= 3.2.17, 
[have_libnl3=yes], [have_libnl3=no])
+if (test "${have_libnl3}" = "yes"); then
+        CFLAGS+="-I$LIBNL3_CFLAGS"
+else
+       AC_MSG_ERROR([Need libnl version 3.2.17 or higher])
+fi
+
 AC_OUTPUT()
diff -r bef729fc4336 -r c4c05e4e4e02 tools/libxl/Makefile
--- a/tools/libxl/Makefile      Thu Jul 25 00:02:22 2013 -0700
+++ b/tools/libxl/Makefile      Thu Jul 25 00:02:33 2013 -0700
@@ -13,7 +13,7 @@ XLUMINOR = 0
 
 CFLAGS += -Werror -Wno-format-zero-length -Wmissing-declarations \
        -Wno-declaration-after-statement -Wformat-nonliteral
-CFLAGS += -I. -fPIC
+CFLAGS += -I. -fPIC -I /usr/local/include/libnl3/
 
 ifeq ($(CONFIG_Linux),y)
 LIBUUID_LIBS += -luuid
@@ -29,7 +29,7 @@ CFLAGS_LIBXL += $(CFLAGS_libblktapctl)
 CFLAGS_LIBXL += -Wshadow
 
 CFLAGS += $(PTHREAD_CFLAGS)
-LDFLAGS += $(PTHREAD_LDFLAGS)
+LDFLAGS += $(PTHREAD_LDFLAGS) -L/usr/local/lib/libnl3/
 LIBXL_LIBS += $(PTHREAD_LIBS)
 
 LIBXLU_LIBS =
@@ -68,6 +68,7 @@ ifeq ($(BISON),)
 endif
 
 LIBXL_LIBS += -lyajl
+LIBXL_LIBS += -lnl-3 -lnl-route-3
 
 LIBXL_OBJS = flexarray.o libxl.o libxl_create.o libxl_dm.o libxl_pci.o \
                        libxl_dom.o libxl_exec.o libxl_xshelp.o libxl_device.o \
@@ -92,7 +93,7 @@ CLIENTS = xl testidl libxl-save-helper
 CFLAGS_XL += $(CFLAGS_libxenlight)
 CFLAGS_XL += -Wshadow
 
-XL_OBJS = xl.o xl_cmdimpl.o xl_cmdtable.o xl_sxp.o
+XL_OBJS = xl.o xl_cmdimpl.o xl_cmdtable.o xl_sxp.o xl_netbuf.o
 $(XL_OBJS) _libxl.api-for-check: \
             CFLAGS += $(CFLAGS_libxenctrl) # For xentoollog.h
 $(XL_OBJS): CFLAGS += $(CFLAGS_XL)
@@ -189,7 +190,7 @@ libxlutil.a: $(LIBXLU_OBJS)
        $(AR) rcs libxlutil.a $^
 
 xl: $(XL_OBJS) libxlutil.so libxenlight.so
-       $(CC) $(LDFLAGS) -o $@ $(XL_OBJS) libxlutil.so $(LDLIBS_libxenlight) 
$(LDLIBS_libxenctrl) -lyajl $(APPEND_LDFLAGS)
+       $(CC) $(LDFLAGS) -o $@ $(XL_OBJS) libxlutil.so $(LDLIBS_libxenlight) 
$(LDLIBS_libxenctrl) -lyajl -lnl-3 -lnl-route-3 $(APPEND_LDFLAGS)
 
 libxl-save-helper: $(SAVE_HELPER_OBJS) libxenlight.so
        $(CC) $(LDFLAGS) -o $@ $(SAVE_HELPER_OBJS) $(LDLIBS_libxenctrl) 
$(LDLIBS_libxenguest) $(APPEND_LDFLAGS)

_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxx
http://lists.xen.org/xen-devel