X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=configure.ac;h=51ceb3c612ca48275a1504ac094c279736a313b6;hb=refs%2Fheads%2Ftizen_5.0;hp=26ba06d802e57bc81d000f18fa5bcbc3fb7bfc73;hpb=8f6880f3201d181533298cabf83a9e6f1006529c;p=platform%2Fcore%2Fuifw%2Flibtdm.git diff --git a/configure.ac b/configure.ac index 26ba06d..51ceb3c 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], [11]) +m4_define([tdm_major_version], [2]) +m4_define([tdm_minor_version], [0]) m4_define([tdm_micro_version], [0]) m4_define([tdm_version], [tdm_major_version.tdm_minor_version.tdm_micro_version]) @@ -31,11 +31,11 @@ LT_INIT([disable-static]) # Enable quiet compiles on automake 1.11. m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) -AC_ARG_WITH(utests, AS_HELP_STRING([--with-utests=yes/no], [whether build/run unit tests or not]), - [ utests="$withval" ], - [ utests="no" ]) +AC_ARG_WITH(haltests, AS_HELP_STRING([--with-haltests=yes/no], [whether build/run unit tests or not]), + [ haltests="$withval" ], + [ haltests="no" ]) -AM_CONDITIONAL(HAVE_UTEST, test "x$utests" = "xyes") +AM_CONDITIONAL(HAVE_HALTESTS, test "x$haltests" = "xyes") AC_PATH_PROG([wayland_scanner], [wayland-scanner]) if test x$wayland_scanner = x; then @@ -44,8 +44,8 @@ fi PKG_CHECK_MODULES(WAYLAND_SCANNER, wayland-scanner >= 1.7.0) -PKG_CHECK_MODULES(TDM, dlog libtbm libpng pixman-1 wayland-server) -PKG_CHECK_MODULES(TDM_CLIENT, dlog wayland-client) +PKG_CHECK_MODULES(TDM, dlog libtbm libpng pixman-1 wayland-server iniparser) +PKG_CHECK_MODULES(TDM_CLIENT, dlog libtbm wayland-client) PKG_CHECK_MODULES(TTRACE, [ttrace], @@ -72,6 +72,14 @@ AC_ARG_WITH(tdm-module-path, AS_HELP_STRING([--with-tdm-module-path=PATH], [tdm AC_DEFINE_UNQUOTED(TDM_MODULE_PATH, "${TDM_MODULE_PATH}", [Directory for the modules of tdm]) AC_SUBST(TDM_MODULE_PATH) +# set the data dir for the tdm config +DEFAULT_TDM_DATA_PATH="${datadir}/tdm" +AC_ARG_WITH(tdm-data-path, AS_HELP_STRING([--with-tdm-data-path=PATH], [tdm data dir]), + [ TDM_DATA_PATH="$withval" ], + [ TDM_DATA_PATH="${DEFAULT_TDM_DATA_PATH}" ]) +AC_DEFINE_UNQUOTED(TDM_DATA_PATH, "${TDM_DATA_PATH}", [Directory for the data of tdm]) +AC_SUBST(TDM_DATA_PATH) + AC_SUBST([TDM_MAJOR_VERSION], [tdm_major_version]) AC_SUBST([TDM_MINOR_VERSION], [tdm_minor_version]) AC_SUBST([TDM_MICRO_VERSION], [tdm_micro_version]) @@ -92,10 +100,11 @@ AC_OUTPUT([ src/Makefile backends/Makefile backends/dummy/Makefile + backends/virtual/Makefile client/libtdm-client.pc client/Makefile tools/Makefile - utests/Makefile]) + haltests/Makefile]) echo "" echo "$PACKAGE_STRING will be compiled with:" @@ -105,4 +114,5 @@ echo "TDM_LIBS : $TDM_LIBS" echo "TDM_CLIENT_CFLAGS : $TDM_CLIENT_CFLAGS" echo "TDM_CLIENT_LIBS : $TDM_CLIENT_LIBS" echo "TDM_MODULE_PATH : $TDM_MODULE_PATH" +echo "TDM_DATA_PATH : $TDM_DATA_PATH" echo ""