diff options
| author | Joonbum Ko <joonbum.ko@samsung.com> | 2021-08-24 18:35:12 +0900 |
|---|---|---|
| committer | Changyeon Lee <cyeon.lee@samsung.com> | 2021-09-02 11:56:56 +0900 |
| commit | 955c2999d5a6af56df6cd94d77a89b3972c32c63 (patch) | |
| tree | 60c1188e7d5f1d56d03d8767f09898208261f108 | |
| parent | 92d99019a95ef56925c2cc7aa879d359ffc0d275 (diff) | |
| download | libtbm-msm-955c2999d5a6af56df6cd94d77a89b3972c32c63.tar.gz libtbm-msm-955c2999d5a6af56df6cd94d77a89b3972c32c63.tar.bz2 libtbm-msm-955c2999d5a6af56df6cd94d77a89b3972c32c63.zip | |
Exclude dlog dependency when dlog disabled.
Change-Id: Id033673aadca8ad39441a9e018539e5b8d48179a
Signed-off-by: Joonbum Ko <joonbum.ko@samsung.com>
| -rw-r--r-- | configure.ac | 17 | ||||
| -rw-r--r-- | src/libhal-backend-tbm-msm/tbm_backend_log.c | 9 | ||||
| -rw-r--r-- | src/libhal-backend-tbm-msm/tbm_backend_log.h | 4 |
3 files changed, 22 insertions, 8 deletions
diff --git a/configure.ac b/configure.ac index c7f8e5b..f515026 100644 --- a/configure.ac +++ b/configure.ac @@ -41,7 +41,6 @@ PKG_CHECK_MODULES(LIBTBM, libtbm) PKG_CHECK_MODULES(GBM, gbm) PKG_CHECK_MODULES(HAL_API_COMMON, hal-api-common) PKG_CHECK_MODULES(HAL_API_TBM, hal-api-tbm) -PKG_CHECK_MODULES(DLOG, dlog) PKG_CHECK_MODULES(LIBUDEV, libudev) # set the data dir for the tdm config @@ -58,10 +57,18 @@ AC_ARG_WITH(default-dlog, AS_HELP_STRING([--with-default-dlog=yes/no], [whether [ 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) + + LIBTBM_MSM_CFLAGS="$LIBTBM_MSM_CFLAGS $DLOG_CFLAGS " + LIBTBM_MSM_LIBS="$LIBTBM_MSM_LIBS $DLOG_LIBS " +fi # for libtbm-msm -LIBTBM_MSM_CFLAGS="$LIBDRM_CFLAGS $LIBTBM_CFLAGS $DLOG_CFLAGS $LIBUDEV_CFLAGS $GBM_CFLAGS" -LIBTBM_MSM_LIBS="$LIBDRM_LIBS $LIBTBM_LIBS $DLOG_LIBS $LIBUDEV_LIBS $GBM_LIBS" +LIBTBM_MSM_CFLAGS="$LIBDRM_CFLAGS $LIBTBM_CFLAGS $LIBUDEV_CFLAGS $GBM_CFLAGS" +LIBTBM_MSM_LIBS="$LIBDRM_LIBS $LIBTBM_LIBS $LIBUDEV_LIBS $GBM_LIBS" AC_SUBST(LIBTBM_MSM_CFLAGS) AC_SUBST(LIBTBM_MSM_LIBS) @@ -69,8 +76,8 @@ bufmgr_dir=${libdir#*/} AC_SUBST(bufmgr_dir) # for libhal-backend-tbm-msm -LIBHAL_BACKEND_TBM_MSM_CFLAGS="$HAL_API_COMMON_CFLAGS $HAL_API_TBM_CFLAGS $LIBDRM_CFLAGS $GBM_CFLAGS $DLOG_CFLAGS $LIBUDEV_CFLAGS" -LIBHAL_BACKEND_TBM_MSM_LIBS="$HAL_API_COMMON_LIBS $HAL_API_TBM_LIBS $LIBDRM_LIBS $GBM_LIBS $DLOG_LIBS $LIBUDEV_LIBS" +LIBHAL_BACKEND_TBM_MSM_CFLAGS="$HAL_API_COMMON_CFLAGS $HAL_API_TBM_CFLAGS $LIBDRM_CFLAGS $GBM_CFLAGS $LIBUDEV_CFLAGS" +LIBHAL_BACKEND_TBM_MSM_LIBS="$HAL_API_COMMON_LIBS $HAL_API_TBM_LIBS $LIBDRM_LIBS $GBM_LIBS $LIBUDEV_LIBS" AC_SUBST(LIBHAL_BACKEND_TBM_MSM_CFLAGS) AC_SUBST(LIBHAL_BACKEND_TBM_MSM_LIBS) diff --git a/src/libhal-backend-tbm-msm/tbm_backend_log.c b/src/libhal-backend-tbm-msm/tbm_backend_log.c index 2565da1..51d447a 100644 --- a/src/libhal-backend-tbm-msm/tbm_backend_log.c +++ b/src/libhal-backend-tbm-msm/tbm_backend_log.c @@ -40,8 +40,6 @@ 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; #endif static unsigned int color_enable = 1; @@ -62,6 +60,7 @@ _tbm_log_vprint_stdout(int level, const char *fmt, va_list arg) printf("\n"); } +#if ENABLE_DLOG static void _tbm_backend_log_dlog_print(int level, const char *fmt, va_list arg) { @@ -85,6 +84,7 @@ _tbm_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 tbm_backend_log_print(int level, const char *fmt, ...) @@ -94,11 +94,14 @@ tbm_backend_log_print(int level, const char *fmt, ...) if (level > tbm_log_debug_level) return; +#if ENABLE_DLOG if (dlog_enable) { va_start(arg, fmt); _tbm_backend_log_dlog_print(level, fmt, arg); va_end(arg); - } else { + } else +#endif + { va_start(arg, fmt); _tbm_log_vprint_stdout(level, fmt, arg); va_end(arg); diff --git a/src/libhal-backend-tbm-msm/tbm_backend_log.h b/src/libhal-backend-tbm-msm/tbm_backend_log.h index 7396a8f..50903ae 100644 --- a/src/libhal-backend-tbm-msm/tbm_backend_log.h +++ b/src/libhal-backend-tbm-msm/tbm_backend_log.h @@ -35,7 +35,11 @@ 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> +#else +#include <stdarg.h> +#endif enum { TBM_BACKEND_LOG_LEVEL_NONE, |