From 86be0d4c48f92cca64edd8b49b7175c6f85e24d2 Mon Sep 17 00:00:00 2001
From: Joonbum Ko <joonbum.ko@samsung.com>
Date: Tue, 24 Aug 2021 19:07:59 +0900
Subject: [PATCH] Exclude dlog dependency when dlog disabled.

Change-Id: I098473c189d4e3c5f9692ddde4a37deefd261206
Signed-off-by: Joonbum Ko <joonbum.ko@samsung.com>
---
 configure.ac          | 24 ++++++++++++++----------
 src/wayland-tbm-int.h |  4 ++--
 2 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/configure.ac b/configure.ac
index 11eb79e..0a692f6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -17,26 +17,30 @@ AC_ARG_WITH(unittests, AS_HELP_STRING([--with-unittests=yes/no], [whether build/
 
 AM_CONDITIONAL(HAVE_UTEST, test "x$unittests" = "xyes")
 
-AC_ARG_WITH(default-dlog, AS_HELP_STRING([--with-default-dlog=yes/no], [whether use dlog as a default log or not]),
-				[ use_dlog="$withval" ],
-				[ use_dlog="yes" ])
-
-AM_CONDITIONAL(ENABLE_DLOG, test "x$use_dlog" = "xyes")
-
-if test "x$use_dlog" = "xyes"; then
-	AC_DEFINE([ENABLE_DLOG], 1, "Use dlog as a default log")
-fi
 
 AC_PATH_PROG([wayland_scanner], [wayland-scanner])
 if test x$wayland_scanner = x; then
       AC_MSG_ERROR([wayland-scanner is needed to compile wayland-tbm])
 fi
 
-PKG_CHECK_MODULES([WL_TBM_COMMON], [libtbm capi-base-common dlog])
+PKG_CHECK_MODULES([WL_TBM_COMMON], [libtbm capi-base-common])
 PKG_CHECK_MODULES([WL_TBM_CLIENT], [wayland-client])
 PKG_CHECK_MODULES([WL_TBM_SERVER], [wayland-server])
 PKG_CHECK_MODULES( WAYLAND_SCANNER, wayland-scanner)
 
+AC_ARG_WITH(default-dlog, AS_HELP_STRING([--with-default-dlog=yes/no], [whether use dlog as a default log or not]),
+				[ use_dlog="$withval" ],
+				[ use_dlog="yes" ])
+AM_CONDITIONAL(ENABLE_DLOG, test "x$use_dlog" = "xyes")
+if test "x${use_dlog}" = "xyes"; then
+    AC_DEFINE([ENABLE_DLOG], 1, "Use dlog as a default log")
+
+    PKG_CHECK_MODULES(DLOG, dlog)
+
+    WL_TBM_COMMON_CFLAGS="$WL_TBM_COMMON_CFLAGS $DLOG_CFLAGS "
+    WL_TBM_COMMON_LIBS="$WL_TBM_COMMON_LIBS $DLOG_LIBS "
+fi
+
 AC_CONFIG_FILES([
 	Makefile
     src/Makefile
diff --git a/src/wayland-tbm-int.h b/src/wayland-tbm-int.h
index 7fa9281..e763c6e 100644
--- a/src/wayland-tbm-int.h
+++ b/src/wayland-tbm-int.h
@@ -43,11 +43,11 @@ extern "C" {
 #include <tbm_log.h>
 #include <wayland-tbm-client.h>
 
+extern int bTrace;
+
 #ifdef ENABLE_DLOG
 #include <dlog.h>
 
-extern int bTrace;
-
 #ifdef LOG_TAG
 #undef LOG_TAG
 #endif
-- 
2.7.4