evas json: fix json loader configuration. - #9

lottie-player detection is not correct.
fix configure to enable/disable it automatically.

@feature

Change-Id: I286341164490b6b89ba0cf7fcd28aba9ba7721bd

diff --git a/configure.ac b/configure.ac
index 5e77bd6..d8f736d 100755 (executable)
--- a/configure.ac
+++ b/configure.ac
@@ -2591,7 +2591,7 @@ esac
 
 ARG_ENABLE_EVAS_VG_LOADER(SVG, static)
 ARG_ENABLE_EVAS_VG_LOADER(EET, static)
-ARG_ENABLE_EVAS_VG_LOADER(JSON, static)
+ARG_ENABLE_EVAS_VG_LOADER(JSON, auto)
 
 ARG_ENABLE_EVAS_IMAGE_LOADER(BMP, static)
 ARG_ENABLE_EVAS_IMAGE_LOADER(Eet, static)

diff --git a/m4/evas_check_loader.m4 b/m4/evas_check_loader.m4
index 22cb0e1..06302f2 100644 (file)
--- a/m4/evas_check_loader.m4
+++ b/m4/evas_check_loader.m4
@@ -63,9 +63,24 @@ dnl use: EVAS_CHECK_VG_LOADER_DEP_JSON(loader, want_static[, ACTION-IF-FOUND[, A
 AC_DEFUN([EVAS_CHECK_VG_LOADER_DEP_JSON],
 [
 
-have_dep="yes"
+have_dep="no"
 evas_vg_loader_[]$1[]_cflags=""
-evas_vg_loader_[]$1[]_libs="-llottie-player"
+evas_vg_loader_[]$1[]_libs=""
+
+AC_CHECK_HEADER([lotplayer_capi.h], [have_dep="yes"])
+
+if test "x${have_dep}"  = "xyes" ; then
+   AC_CHECK_LIB([lottie-player],
+               [lotplayer_create],
+      [
+       evas_vg_loader_[]$1[]_libs="-llottie-player"
+      ]
+   )
+fi
+
+if test "x$2" = "xstatic"  && test "x${have_dep}" = "xyes" ; then
+   requirements_libs_evas="${evas_vg_loader_[]$1[]_libs} ${requirements_libs_evas}"
+fi
 
 AC_SUBST([evas_vg_loader_$1_cflags])
 AC_SUBST([evas_vg_loader_$1_libs])
@@ -673,11 +688,12 @@ if test "x${have_loader}" = "xyes" ; then
       want_static_loader="yes"
    else
       have_evas_vg_loader_[]DOWN="yes"
+      want_static_loader="yes"
    fi
 fi
 
 if test "x${have_loader}" = "xyes" ; then
-   AC_DEFINE(BUILD_VG_LOADER_[]UP, [1], [UP Image Loader Support])
+   AC_DEFINE(BUILD_VG_LOADER_[]UP, [1], [UP VG Loader Support])
 fi
 
 AM_CONDITIONAL(BUILD_VG_LOADER_[]UP, [test "x${have_loader}" = "xyes"])