Fix sign extension error

[platform/core/uifw/libtdm.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 1829d04..fc7ce92 100644 (file)
--- 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],  [16])
+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,21 @@ 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_ARG_WITH(default-dlog, AS_HELP_STRING([--with-default-dlog=yes/no], [whether use dlog as a default log or not]),
+                               [ use_dlog="$withval" ],
+                               [ 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")
+fi
 
 AC_PATH_PROG([wayland_scanner], [wayland-scanner])
 if test x$wayland_scanner = x; then
@@ -44,8 +54,22 @@ fi
 
 PKG_CHECK_MODULES(WAYLAND_SCANNER, wayland-scanner >= 1.7.0)
 
-PKG_CHECK_MODULES(TDM, dlog libtbm libpng pixman-1 wayland-server iniparser)
-PKG_CHECK_MODULES(TDM_CLIENT, dlog wayland-client)
+PKG_CHECK_MODULES(TDM, libtbm libpng pixman-1 wayland-server iniparser hal-api-tdm)
+PKG_CHECK_MODULES(TDM_CLIENT, libtbm wayland-client)
+
+PKG_CHECK_EXISTS([dlog], [have_dlog="yes"], [have_dlog="no"])
+AC_MSG_CHECKING([Have dlog logger])
+AC_MSG_RESULT([${have_dlog}])
+if test "x${have_dlog}" = "xyes"; then
+    AC_DEFINE([HAVE_DLOG], [1], [Define to 1 if you have dlog])
+
+    PKG_CHECK_MODULES(DLOG, dlog)
+
+    TDM_CFLAGS="$TDM_CFLAGS $DLOG_CFLAGS "
+    TDM_CLIENT_CFLAGS="$TDM_CLIENT_CFLAGS $DLOG_CFLAGS "
+    TDM_LIBS="$TDM_LIBS $DLOG_LIBS "
+       TDM_CLIENT_LIBS="$TDM_CLIENT_LIBS $DLOG_LIBS "
+fi
 
 PKG_CHECK_MODULES(TTRACE,
                [ttrace],
@@ -100,10 +124,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:"