X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=configure.ac;h=f460e0a956d8243793683583d1c2bac2386098a1;hb=0f5cebbe5d7468ffda331389b7c18938949d93a4;hp=4f0124306287bc8bdbf7b6d6469ce87bcd1581fd;hpb=fc0354984b353a7bc3a504294621be05d6d8522a;p=platform%2Fcore%2Fuifw%2Flibtdm.git diff --git a/configure.ac b/configure.ac index 4f01243..f460e0a 100644 --- a/configure.ac +++ b/configure.ac @@ -1,7 +1,7 @@ AC_PREREQ([2.60]) m4_define([tdm_major_version], [1]) -m4_define([tdm_minor_version], [2]) +m4_define([tdm_minor_version], [4]) m4_define([tdm_micro_version], [0]) m4_define([tdm_version], [tdm_major_version.tdm_minor_version.tdm_micro_version]) @@ -18,6 +18,7 @@ AM_MAINTAINER_MODE([enable]) # Check for programs AC_PROG_CC +AC_PROG_CXX AC_USE_SYSTEM_EXTENSIONS AC_SYS_LARGEFILE @@ -30,6 +31,12 @@ LT_INIT([disable-static]) # Enable quiet compiles on automake 1.11. m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) +AC_ARG_WITH(utest, AS_HELP_STRING([--with-utest=yes/no], [whether build/run unit tests or not]), + [ utest="$withval" ], + [ utest="no" ]) + +AM_CONDITIONAL(HAVE_UTEST, test "x$utest" = "xyes") + AC_PATH_PROG([wayland_scanner], [wayland-scanner]) if test x$wayland_scanner = x; then AC_MSG_ERROR([wayland-scanner is needed to compile]) @@ -37,7 +44,8 @@ fi PKG_CHECK_MODULES(WAYLAND_SCANNER, wayland-scanner >= 1.7.0) -PKG_CHECK_MODULES(TDM, dlog libtbm pthread-stubs libpng wayland-server) +PKG_CHECK_MODULES(TDM, dlog libtbm libpng pixman-1 wayland-server) +PKG_CHECK_MODULES(TDM_CLIENT, dlog wayland-client) PKG_CHECK_MODULES(TTRACE, [ttrace], @@ -45,13 +53,14 @@ PKG_CHECK_MODULES(TTRACE, if test "x$have_ttrace" = "xyes"; then TDM_CFLAGS="$TDM_CFLAGS $TTRACE_CFLAGS" TDM_LIBS="$TDM_LIBS $TTRACE_LIBS" - AC_DEFINE(HAVE_TTRACE, 1, [ttrace available]) + TDM_CLIENT_CFLAGS="$TDM_CLIENT_CFLAGS $TTRACE_CFLAGS" + TDM_CLIENT_LIBS="$TDM_CLIENT_LIBS $TTRACE_LIBS" + AC_DEFINE(HAVE_TTRACE, 1, [ttrace available]) fi AC_SUBST(TDM_CFLAGS) AC_SUBST(TDM_LIBS) -PKG_CHECK_MODULES(TDM_CLIENT, dlog wayland-client) AC_SUBST(TDM_CLIENT_CFLAGS) AC_SUBST(TDM_CLIENT_LIBS) @@ -76,13 +85,14 @@ AC_SUBST(WARN_CFLAGS) AC_OUTPUT([ Makefile libtdm.pc - doc/tdm_doc.h include/Makefile protocol/Makefile + common/Makefile + src/Makefile client/libtdm-client.pc client/Makefile - src/Makefile - tools/Makefile]) + tools/Makefile + ut/Makefile]) echo "" echo "$PACKAGE_STRING will be compiled with:"