X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=configure.ac;h=2d9ee44aca3a24464c7000b125f26282a32f35b1;hb=1dffe69b35428402db9d2335d539454d43cf62c6;hp=ebbcd493cc143e42c8f896358f262828f612395e;hpb=775002c6c0f841a034a286c756899e6a4371962b;p=profile%2Fivi%2Fwayland.git
diff --git a/configure.ac b/configure.ac
index ebbcd49..2d9ee44 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,14 +1,14 @@
AC_PREREQ([2.64])
-m4_define([wayland_major_version], [0])
-m4_define([wayland_minor_version], [89])
-m4_define([wayland_micro_version], [0])
+m4_define([wayland_major_version], [1])
+m4_define([wayland_minor_version], [0])
+m4_define([wayland_micro_version], [6])
m4_define([wayland_version],
[wayland_major_version.wayland_minor_version.wayland_micro_version])
AC_INIT([wayland],
[wayland_version],
- [https://bugs.freedesktop.org/enter_bug.cgi?product=wayland],
+ [https://bugs.freedesktop.org/enter_bug.cgi?product=Wayland&component=wayland&version=wayland_version],
[wayland],
[http://wayland.freedesktop.org/])
@@ -39,11 +39,11 @@ if test "x$GCC" = "xyes"; then
fi
AC_SUBST(GCC_CFLAGS)
-AC_CHECK_FUNCS([accept4])
+AC_CHECK_FUNCS([accept4 mkostemp])
AC_ARG_ENABLE([scanner],
[AC_HELP_STRING([--disable-scanner],
- [Disable compilation of wayland-scannner])],
+ [Disable compilation of wayland-scanner])],
[],
[enable_scanner=yes])
@@ -55,6 +55,11 @@ AC_ARG_ENABLE([documentation],
AM_CONDITIONAL(ENABLE_SCANNER, test "x$enable_scanner" = xyes)
+AC_ARG_WITH(icondir, [ --with-icondir=
Look for cursor icons here],
+ [ ICONDIR=$withval],
+ [ ICONDIR=${datadir}/icons])
+AC_SUBST([ICONDIR])
+
EXPAT_LIB=""
AC_ARG_WITH(expat, [ --with-expat= Use expat from here],
[ expat=$withval
@@ -71,8 +76,42 @@ fi
AC_PATH_PROG(XSLTPROC, xsltproc)
AM_CONDITIONAL([HAVE_XSLTPROC], [test "x$XSLTPROC" != "x"])
+AC_MSG_CHECKING([for docbook manpages stylesheet])
+MANPAGES_STYLESHEET=http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl
+AC_PATH_PROGS_FEATURE_CHECK([XSLTPROC_TMP], [xsltproc],
+ AS_IF([`"$ac_path_XSLTPROC_TMP" --nonet "$MANPAGES_STYLESHEET" > /dev/null 2>&1`],
+ [HAVE_MANPAGES_STYLESHEET=yes]))
+if test "x$HAVE_MANPAGES_STYLESHEET" = "xyes"; then
+ AM_CONDITIONAL([HAVE_MANPAGES_STYLESHEET], true)
+ AC_SUBST(MANPAGES_STYLESHEET)
+ AC_MSG_RESULT([yes])
+else
+ AM_CONDITIONAL([HAVE_MANPAGES_STYLESHEET], false)
+ AC_MSG_RESULT([no])
+fi
+
+AM_CONDITIONAL(BUILD_DOCS, [test x$enable_documentation = xyes])
if test "x$enable_documentation" = "xyes"; then
+ AC_PATH_PROG(DOXYGEN, doxygen)
+
+ if test "x$DOXYGEN" = "x"; then
+ AC_MSG_ERROR([Documentation build requested but doxygen not found. Install doxygen or disable the documentation using --disable-documentation])
+ fi
+
AC_PATH_PROG(PUBLICAN, publican)
+
+ if test "x$PUBLICAN" != "x"; then
+ PUBLICAN_VERSION=`$PUBLICAN -v | cut -d'=' -f2`
+
+ if test [ 1 -eq `echo "${PUBLICAN_VERSION} < 2.8" | bc` ]; then
+ AC_MSG_ERROR([Publican version is not supported. Install publican >= 2.8 or disable the documentation using --disable-documentation])
+ fi
+ fi
+
+ AC_CONFIG_FILES([
+ doc/doxygen/wayland.doxygen
+ ])
+
fi
AM_CONDITIONAL([HAVE_PUBLICAN], [test "x$PUBLICAN" != "x"])
@@ -80,9 +119,14 @@ AC_CONFIG_FILES([Makefile
wayland-scanner.m4
cursor/Makefile
cursor/wayland-cursor.pc
+ cursor/wayland-cursor-uninstalled.pc
doc/Makefile
doc/Wayland/Makefile
+ doc/doxygen/Makefile
+ doc/man/Makefile
src/Makefile
+ src/wayland-server-uninstalled.pc
+ src/wayland-client-uninstalled.pc
src/wayland-server.pc
src/wayland-client.pc
src/wayland-version.h