]> xenbits.xensource.com Git - libvirt.git/commitdiff
Fix libnl CFLAGS/LIBS inclusion
authorDoug Goldstein <cardoe@cardoe.com>
Sat, 21 Jul 2012 13:02:22 +0000 (08:02 -0500)
committerEric Blake <eblake@redhat.com>
Tue, 24 Jul 2012 20:59:48 +0000 (14:59 -0600)
When using libnl, use the variables pkg-config provides in case there are
additional libraries or CFLAGS required to build it. Specifically if
the libnl headers are not directly in /usr/include.

daemon/Makefile.am

index 71e91cd708bf606e83a98659a90b983de50b8fef..74250f6e818936350173c43f31e2637c0ce4154a 100644 (file)
@@ -96,7 +96,7 @@ libvirtd_SOURCES = $(DAEMON_SOURCES)
 #-D_XOPEN_SOURCE=600 -D_XOPEN_SOURCE_EXTENDED=1 -D_POSIX_C_SOURCE=199506L
 libvirtd_CFLAGS = \
        $(LIBXML_CFLAGS) $(GNUTLS_CFLAGS) $(SASL_CFLAGS) \
-       $(XDR_CFLAGS) $(POLKIT_CFLAGS) $(DBUS_CFLAGS) \
+       $(XDR_CFLAGS) $(POLKIT_CFLAGS) $(DBUS_CFLAGS) $(LIBNL_CFLAGS) \
        $(WARN_CFLAGS) \
        $(COVERAGE_CFLAGS) \
        -DQEMUD_PID_FILE="\"$(QEMUD_PID_FILE)\"" \
@@ -111,7 +111,8 @@ libvirtd_LDADD =                                    \
        $(GNUTLS_LIBS)                                  \
        $(SASL_LIBS)                                    \
        $(DBUS_LIBS)                                    \
-       $(POLKIT_LIBS)
+       $(POLKIT_LIBS)                                  \
+       $(LIBNL_LIBS)
 
 if WITH_DTRACE_PROBES
 libvirtd_LDADD += ../src/libvirt_probes.lo