diff options
| author | Joonbum Ko <joonbum.ko@samsung.com> | 2021-08-24 18:27:07 +0900 |
|---|---|---|
| committer | Changyeon Lee <cyeon.lee@samsung.com> | 2021-09-02 11:35:14 +0900 |
| commit | c6430d6b8a1f48ba748ab56e44cdc5a3f45603db (patch) | |
| tree | b146a7d658322b87971f43b18934355fc0cf797f | |
| parent | 45136ee98f55fd4663f18042304e731ab37816b8 (diff) | |
| download | libtdm-msm-c6430d6b8a1f48ba748ab56e44cdc5a3f45603db.tar.gz libtdm-msm-c6430d6b8a1f48ba748ab56e44cdc5a3f45603db.tar.bz2 libtdm-msm-c6430d6b8a1f48ba748ab56e44cdc5a3f45603db.zip | |
Exclude dlog dependency when dlog disabled.
Change-Id: Iaeb90be03ac86263323c4896d50ce3e6d9778d56
Signed-off-by: Joonbum Ko <joonbum.ko@samsung.com>
| -rw-r--r-- | configure.ac | 11 | ||||
| -rw-r--r-- | src/libhal-backend-tdm-msm/tdm_backend_log.c | 9 | ||||
| -rw-r--r-- | src/libhal-backend-tdm-msm/tdm_backend_log.h | 3 |
3 files changed, 17 insertions, 6 deletions
diff --git a/configure.ac b/configure.ac index 7f65741..66ee084 100644 --- a/configure.ac +++ b/configure.ac @@ -27,7 +27,7 @@ m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) PKG_CHECK_MODULES(TDM_MSM, libtdm libtbm [libdrm >= 2.4.47] pixman-1) # for libhal-backend-tdm-msm -PKG_CHECK_MODULES(LIBHAL_BACKEND_TDM_MSM, hal-api-common hal-api-tdm libtbm libdrm dlog pixman-1) +PKG_CHECK_MODULES(LIBHAL_BACKEND_TDM_MSM, hal-api-common hal-api-tdm libtbm libdrm pixman-1) PKG_CHECK_MODULES(UDEV, libudev, [udev=yes], [udev=no]) if test x"$udev" = xyes; then @@ -79,8 +79,13 @@ AC_ARG_WITH(default-dlog, AS_HELP_STRING([--with-default-dlog=yes/no], [whether 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") +if test "x${use_dlog}" = "xyes"; then + AC_DEFINE([ENABLE_DLOG], 1, "Use dlog as a default log") + + PKG_CHECK_MODULES(DLOG, dlog) + + LIBTDM_MSM_CFLAGS="$LIBTBM_MSM_CFLAGS $DLOG_CFLAGS " + LIBTDM_MSM_LIBS="$LIBTBM_MSM_LIBS $DLOG_LIBS " fi # For enumerating devices in test case diff --git a/src/libhal-backend-tdm-msm/tdm_backend_log.c b/src/libhal-backend-tdm-msm/tdm_backend_log.c index e7a5a70..d334e91 100644 --- a/src/libhal-backend-tdm-msm/tdm_backend_log.c +++ b/src/libhal-backend-tdm-msm/tdm_backend_log.c @@ -38,7 +38,7 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #if ENABLE_DLOG static unsigned int dlog_enable = 1; #else -static unsigned int dlog_enable = 0; +#include <stdarg.h> #endif static unsigned int color_enable = 1; @@ -59,6 +59,7 @@ _tdm_log_vprint_stdout(int level, const char *fmt, va_list arg) printf("\n"); } +#if ENABLE_DLOG static void _tdm_backend_log_dlog_print(int level, const char *fmt, va_list arg) { @@ -82,6 +83,7 @@ _tdm_backend_log_dlog_print(int level, const char *fmt, va_list arg) } __dlog_vprint(LOG_ID_SYSTEM, dlog_prio, LOG_TAG, fmt, arg); } +#endif void tdm_backend_log_print(int level, const char *fmt, ...) @@ -91,11 +93,14 @@ tdm_backend_log_print(int level, const char *fmt, ...) if (level > tdm_log_debug_level) return; +#if ENABLE_DLOG if (dlog_enable) { va_start(arg, fmt); _tdm_backend_log_dlog_print(level, fmt, arg); va_end(arg); - } else { + } else +#endif + { va_start(arg, fmt); _tdm_log_vprint_stdout(level, fmt, arg); va_end(arg); diff --git a/src/libhal-backend-tdm-msm/tdm_backend_log.h b/src/libhal-backend-tdm-msm/tdm_backend_log.h index c83d78d..664bde2 100644 --- a/src/libhal-backend-tdm-msm/tdm_backend_log.h +++ b/src/libhal-backend-tdm-msm/tdm_backend_log.h @@ -35,8 +35,9 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include <unistd.h> #include <stdio.h> #include <time.h> +#if ENABLE_DLOG #include <dlog.h> - +#endif #undef LOG_TAG #define LOG_TAG "TDM_BACKEND" |