From 0354da5856188a9fd6e394ad4ac6794ba312eda1 Mon Sep 17 00:00:00 2001 From: Boram Park Date: Wed, 2 Mar 2016 09:45:37 +0900 Subject: [PATCH] fix dependency error for build-break Change-Id: Iffbda4fde6879f2fa258bf8f8821a76cceb592d9 --- configure.ac | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/configure.ac b/configure.ac index 3da1d84..c4b1a40 100644 --- a/configure.ac +++ b/configure.ac @@ -23,6 +23,16 @@ LT_INIT([disable-static]) # Enable quiet compiles on automake 1.11. m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) +PKG_CHECK_MODULES(TTRACE, + [ttrace], + [have_ttrace="yes"], [have_ttrace="no"]) +if test "x$have_ttrace" = "xyes"; then + PKG_CHECK_MODULES(TDM, libtbm pthread-stubs libpng ttrace) + AC_DEFINE(HAVE_TTRACE, 1, [ttrace available]) +else + PKG_CHECK_MODULES(TDM, libtbm pthread-stubs libpng) +fi + PKG_CHECK_MODULES(TDM, libtbm pthread-stubs libpng) AC_SUBST(TDM_CFLAGS) AC_SUBST(TDM_LIBS) @@ -34,13 +44,6 @@ AC_ARG_WITH(tdm-module-path, AS_HELP_STRING([--with-tdm-module-path=PATH], [tdm [ TDM_MODULE_PATH="${DEFAULT_TDM_MODULE_PATH}" ]) AC_DEFINE_UNQUOTED(TDM_MODULE_PATH, "${TDM_MODULE_PATH}", [Directory for the modules of tdm]) -PKG_CHECK_MODULES(TTRACE, - [ttrace], - [have_ttrace="yes"], [have_ttrace="no"]) -if test "x$have_ttrace" = "xyes"; then - AC_DEFINE(HAVE_TTRACE, 1, [ttrace available]) -fi - # For enumerating devices in test case AC_SUBST(WARN_CFLAGS) AC_OUTPUT([ -- 2.7.4