[libvirt] [PATCH 5/9] Introduce JSON_CFLAGS and JSON_LIBS

[Ján Tomko]

Just copy YAJL_CFLAGS and YAJL_LIBS at this time.

Signed-off-by: Ján Tomko <jto...@redhat.com>
---
 m4/virt-json.m4          | 2 ++
 src/Makefile.am          | 8 ++++----
 src/util/Makefile.inc.am | 4 ++--
 tests/Makefile.am        | 2 +-
 4 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/m4/virt-json.m4 b/m4/virt-json.m4
index 2f2125b56..9e026931e 100644
--- a/m4/virt-json.m4
+++ b/m4/virt-json.m4
@@ -54,6 +54,8 @@ AC_DEFUN([LIBVIRT_CHECK_JSON],[
   if test "$with_yajl" = "yes"; then
     AC_DEFINE([WITH_JSON], [1], [whether a JSON library is available])
   fi
+  AC_SUBST([JSON_CFLAGS], [$YAJL_CFLAGS])
+  AC_SUBST([JSON_LIBS], [$YAJL_LIBS])
 
 ])
 
diff --git a/src/Makefile.am b/src/Makefile.am
index 8b1e4c8a4..fd09bfd17 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -545,7 +545,7 @@ libvirt_admin_la_CFLAGS = \
 libvirt_admin_la_CFLAGS += \
                $(XDR_CFLAGS) \
                $(CAPNG_CFLAGS) \
-               $(YAJL_CFLAGS) \
+               $(JSON_CFLAGS) \
                $(SSH2_CFLAGS) \
                $(SASL_CFLAGS) \
                $(GNUTLS_CFLAGS) \
@@ -553,7 +553,7 @@ libvirt_admin_la_CFLAGS += \
 
 libvirt_admin_la_LIBADD += \
                $(CAPNG_LIBS) \
-               $(YAJL_LIBS) \
+               $(JSON_LIBS) \
                $(DEVMAPPER_LIBS) \
                $(LIBXML_LIBS) \
                $(SSH2_LIBS) \
@@ -993,14 +993,14 @@ libvirt_nss_la_SOURCES = \
 libvirt_nss_la_CFLAGS = \
                -DLIBVIRT_NSS \
                $(AM_CFLAGS) \
-               $(YAJL_CFLAGS) \
+               $(JSON_CFLAGS) \
                $(NULL)
 libvirt_nss_la_LDFLAGS = \
                $(AM_LDFLAGS) \
                $(NULL)
 
 libvirt_nss_la_LIBADD = \
-               $(YAJL_LIBS) \
+               $(JSON_LIBS) \
                $(NULL)
 endif WITH_NSS
 
diff --git a/src/util/Makefile.inc.am b/src/util/Makefile.inc.am
index a3c3b711f..5adc24fee 100644
--- a/src/util/Makefile.inc.am
+++ b/src/util/Makefile.inc.am
@@ -245,7 +245,7 @@ libvirt_util_la_SOURCES = \
        $(NULL)
 libvirt_util_la_CFLAGS = \
        $(CAPNG_CFLAGS) \
-       $(YAJL_CFLAGS) \
+       $(JSON_CFLAGS) \
        $(LIBNL_CFLAGS) \
        $(AM_CFLAGS) \
        $(AUDIT_CFLAGS) \
@@ -258,7 +258,7 @@ libvirt_util_la_CFLAGS = \
        $(NULL)
 libvirt_util_la_LIBADD = \
        $(CAPNG_LIBS) \
-       $(YAJL_LIBS) \
+       $(JSON_LIBS) \
        $(LIBNL_LIBS) \
        $(THREAD_LIBS) \
        $(AUDIT_LIBS) \
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 249c533dc..ed0cd60f4 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -46,7 +46,7 @@ AM_CFLAGS = \
        $(SASL_CFLAGS) \
        $(SELINUX_CFLAGS) \
        $(APPARMOR_CFLAGS) \
-       $(YAJL_CFLAGS) \
+       $(JSON_CFLAGS) \
        $(COVERAGE_CFLAGS) \
        $(XDR_CFLAGS) \
        $(WARN_CFLAGS)
-- 
2.16.1

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list