projects
/
platform
/
core
/
uifw
/
libtdm.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
print time for debugging init time
[platform/core/uifw/libtdm.git]
/
configure.ac
diff --git
a/configure.ac
b/configure.ac
index
c2bb484
..
f460e0a
100644
(file)
--- a/
configure.ac
+++ b/
configure.ac
@@
-1,7
+1,7
@@
AC_PREREQ([2.60])
m4_define([tdm_major_version], [1])
AC_PREREQ([2.60])
m4_define([tdm_major_version], [1])
-m4_define([tdm_minor_version], [
3
])
+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])
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
# Check for programs
AC_PROG_CC
+AC_PROG_CXX
AC_USE_SYSTEM_EXTENSIONS
AC_SYS_LARGEFILE
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])])
# 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])
AC_PATH_PROG([wayland_scanner], [wayland-scanner])
if test x$wayland_scanner = x; then
AC_MSG_ERROR([wayland-scanner is needed to compile])
@@
-38,6
+45,7
@@
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(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(TTRACE,
[ttrace],
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"
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)
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)
AC_SUBST(TDM_CLIENT_CFLAGS)
AC_SUBST(TDM_CLIENT_LIBS)
@@
-82,7
+91,8
@@
AC_OUTPUT([
src/Makefile
client/libtdm-client.pc
client/Makefile
src/Makefile
client/libtdm-client.pc
client/Makefile
- tools/Makefile])
+ tools/Makefile
+ ut/Makefile])
echo ""
echo "$PACKAGE_STRING will be compiled with:"
echo ""
echo "$PACKAGE_STRING will be compiled with:"