mirrors/wayland
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/wayland/wayland.git synced 2025-10-29 05:40:16 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions
wayland/configure.ac

122 lines
3.5 KiB
Text
Raw Normal View History

Update autotools configuration Use new libtool syntax and cleaning the code a bit
2010-11-06 01:55:27 +01:00
AC_PREREQ([2.64])
Add a public header for the version number This adds a public header so that applications can get the Wayland version number at compile time. This can be used to make applications that support compiling against multiple versions of Wayland. There is a separate installed header called cogl-version.h which gets included by both wayland-client.h and wayland-server.h The canonical place for the version number is the configure.ac script which splits it into three separate m4 defines for the major, minor and micro version. These are copied into the generated wayland-version.h header using AC_SUBST. There is also a string form of the complete version number. The version number is now also automatically copied into the two .pc files. Because the major, minor and micro parts are required it is no longer possible to leave the version number as 'master' when building from git. Most projects seem to immediately bump the git repo to a fake version number (usually odd) after making a release so that there is always a relative number that can be used for comparison. This patch sets the git version to 0.99.0 under the assumption that the next release will be 1.0.0.
2012-04-11 16:59:05 +01:00
configure.ac: Bump version to 1.0.0
2012-10-22 14:55:06 -04:00
m4_define([wayland_major_version], [1])
m4_define([wayland_minor_version], [0])
Bump version to 0.95.0
2012-07-24 15:45:00 -04:00
m4_define([wayland_micro_version], [0])
Add a public header for the version number This adds a public header so that applications can get the Wayland version number at compile time. This can be used to make applications that support compiling against multiple versions of Wayland. There is a separate installed header called cogl-version.h which gets included by both wayland-client.h and wayland-server.h The canonical place for the version number is the configure.ac script which splits it into three separate m4 defines for the major, minor and micro version. These are copied into the generated wayland-version.h header using AC_SUBST. There is also a string form of the complete version number. The version number is now also automatically copied into the two .pc files. Because the major, minor and micro parts are required it is no longer possible to leave the version number as 'master' when building from git. Most projects seem to immediately bump the git repo to a fake version number (usually odd) after making a release so that there is always a relative number that can be used for comparison. This patch sets the git version to 0.99.0 under the assumption that the next release will be 1.0.0.
2012-04-11 16:59:05 +01:00
m4_define([wayland_version],
[wayland_major_version.wayland_minor_version.wayland_micro_version])
Update autotools configuration Use new libtool syntax and cleaning the code a bit
2010-11-06 01:55:27 +01:00
AC_INIT([wayland],
Add a public header for the version number This adds a public header so that applications can get the Wayland version number at compile time. This can be used to make applications that support compiling against multiple versions of Wayland. There is a separate installed header called cogl-version.h which gets included by both wayland-client.h and wayland-server.h The canonical place for the version number is the configure.ac script which splits it into three separate m4 defines for the major, minor and micro version. These are copied into the generated wayland-version.h header using AC_SUBST. There is also a string form of the complete version number. The version number is now also automatically copied into the two .pc files. Because the major, minor and micro parts are required it is no longer possible to leave the version number as 'master' when building from git. Most projects seem to immediately bump the git repo to a fake version number (usually odd) after making a release so that there is always a relative number that can be used for comparison. This patch sets the git version to 0.99.0 under the assumption that the next release will be 1.0.0.
2012-04-11 16:59:05 +01:00
[wayland_version],
Update autotools configuration Use new libtool syntax and cleaning the code a bit
2010-11-06 01:55:27 +01:00
[https://bugs.freedesktop.org/enter_bug.cgi?product=wayland],
[wayland],
[http://wayland.freedesktop.org/])
Add a public header for the version number This adds a public header so that applications can get the Wayland version number at compile time. This can be used to make applications that support compiling against multiple versions of Wayland. There is a separate installed header called cogl-version.h which gets included by both wayland-client.h and wayland-server.h The canonical place for the version number is the configure.ac script which splits it into three separate m4 defines for the major, minor and micro version. These are copied into the generated wayland-version.h header using AC_SUBST. There is also a string form of the complete version number. The version number is now also automatically copied into the two .pc files. Because the major, minor and micro parts are required it is no longer possible to leave the version number as 'master' when building from git. Most projects seem to immediately bump the git repo to a fake version number (usually odd) after making a release so that there is always a relative number that can be used for comparison. This patch sets the git version to 0.99.0 under the assumption that the next release will be 1.0.0.
2012-04-11 16:59:05 +01:00
AC_SUBST([WAYLAND_VERSION_MAJOR], [wayland_major_version])
AC_SUBST([WAYLAND_VERSION_MINOR], [wayland_minor_version])
AC_SUBST([WAYLAND_VERSION_MICRO], [wayland_micro_version])
AC_SUBST([WAYLAND_VERSION], [wayland_version])
Fall back to cairo image backend and shm surface if we don't have cairo gl
2010-10-25 11:40:03 -04:00
AC_CONFIG_HEADERS([config.h])
Update autotools configuration Use new libtool syntax and cleaning the code a bit
2010-11-06 01:55:27 +01:00
AC_CONFIG_MACRO_DIR([m4])
Use dist-xz for tarballs
2012-02-09 11:15:33 -05:00
AM_INIT_AUTOMAKE([1.11 foreign no-dist-gzip dist-xz])
Update autotools configuration Use new libtool syntax and cleaning the code a bit
2010-11-06 01:55:27 +01:00
Use automake
2010-10-12 17:24:20 -04:00
AM_SILENT_RULES([yes])
Use autoconf instead of $(shell ...) in the Makefile.
2008-12-04 22:48:50 -05:00
Update autotools configuration Use new libtool syntax and cleaning the code a bit
2010-11-06 01:55:27 +01:00
# Check for programs
AC_PROG_CC
# Initialize libtool
LT_PREREQ([2.2])
LT_INIT
Use autoconf instead of $(shell ...) in the Makefile.
2008-12-04 22:48:50 -05:00
PKG_PROG_PKG_CONFIG()
PKG_CHECK_MODULES(FFI, [libffi])
fix configure check for gcc This shouldn't fail just because someone sets CC=gcc-4.5 explicitly. Besides, this way it also works with compilers that advertise GCC-compatibility like clang and ICC.
2011-01-28 13:47:21 +00:00
if test "x$GCC" = "xyes"; then
configure: add -Wextra -Wno-unused-parameter This adds more gcc warnings that should be useful, and suppresses the unused parameter warnings that are not wanted. Most importantly, this change enables warnings about comparison between signed and unsigned. Signed-off-by: Pekka Paalanen <ppaalanen@gmail.com>
2012-03-22 11:30:35 +02:00
GCC_CFLAGS="-Wall -Wextra -Wno-unused-parameter -g -Wstrict-prototypes -Wmissing-prototypes -fvisibility=hidden"
Use autoconf instead of $(shell ...) in the Makefile.
2008-12-04 22:48:50 -05:00
fi
AC_SUBST(GCC_CFLAGS)
cursor: use os_create_anonymous_file() Copy the implementation of os_create_anonymous_file() here from weston, so we can use it instead of hardcoding a path to /tmp. Signed-off-by: Pekka Paalanen <ppaalanen@gmail.com>
2012-07-10 13:05:02 +03:00
AC_CHECK_FUNCS([accept4 mkostemp])
os: wrap accept4(SOCK_CLOEXEC) Some system C libraries do not have SOCK_CLOEXEC, and completely miss accept4(), too. Provide a fallback for this case. This changes the behaviour: no error messages are printed now for failing to set CLOEXEC but the file descriptor is closed. The unit test for this wrapper is NOT included. Signed-off-by: Pekka Paalanen <ppaalanen@gmail.com>
2012-03-22 14:16:10 +02:00
Add configure option to disable scanner compilation When cross-compiling Wayland, wayland-scanner should be picked up from the host system instead of compiling and trying to run e.g. ARM wayland-scanner on X86. This patch adds --disable-scanner option for disabling the scanner from the build and using existing wayland-scanner instead (from PATH) which should help in most cross-compilation systems. By default everything works as before. Signed-off-by: Jani Uusi-Rantala <jani.uusi-rantala@nokia.com>
2011-05-06 06:13:36 +00:00
AC_ARG_ENABLE([scanner],
[AC_HELP_STRING([--disable-scanner],
configure: Make documentation option work in fact Also, now doxygen is mandatory for building the documentation (looks reasonable because both man-pages and publican will need it). Signed-off-by: Tiago Vignatti <tiago.vignatti@intel.com>
2012-10-12 20:54:45 +03:00
[Disable compilation of wayland-scanner])],
Add configure option to disable scanner compilation When cross-compiling Wayland, wayland-scanner should be picked up from the host system instead of compiling and trying to run e.g. ARM wayland-scanner on X86. This patch adds --disable-scanner option for disabling the scanner from the build and using existing wayland-scanner instead (from PATH) which should help in most cross-compilation systems. By default everything works as before. Signed-off-by: Jani Uusi-Rantala <jani.uusi-rantala@nokia.com>
2011-05-06 06:13:36 +00:00
[],
[enable_scanner=yes])
configure: Add option to disable building documentation. Signed-off-by: Üstün Ergenoğlu <ego@ustun.fi>
2012-03-17 19:09:39 +02:00
AC_ARG_ENABLE([documentation],
[AC_HELP_STRING([--disable-documentation],
[Disable building the documentation])],
[],
[enable_documentation=yes])
Add configure option to disable scanner compilation When cross-compiling Wayland, wayland-scanner should be picked up from the host system instead of compiling and trying to run e.g. ARM wayland-scanner on X86. This patch adds --disable-scanner option for disabling the scanner from the build and using existing wayland-scanner instead (from PATH) which should help in most cross-compilation systems. By default everything works as before. Signed-off-by: Jani Uusi-Rantala <jani.uusi-rantala@nokia.com>
2011-05-06 06:13:36 +00:00
AM_CONDITIONAL(ENABLE_SCANNER, test "x$enable_scanner" = xyes)
wayland-cursor: add an option that changes the cursor theme directory Some distros (e.g. gentoo) install cursor themes in non-standard directories. Add option --with-icondir to configure.sh that sets the directory in which to look for cursors.
2012-06-08 11:58:02 +03:00
AC_ARG_WITH(icondir, [ --with-icondir=<dir> Look for cursor icons here],
[ ICONDIR=$withval],
[ ICONDIR=${datadir}/icons])
AC_SUBST([ICONDIR])
Generate protocol types and metadata from xml
2010-08-03 09:26:44 -04:00
EXPAT_LIB=""
AC_ARG_WITH(expat, [ --with-expat=<dir> Use expat from here],
[ expat=$withval
CPPFLAGS="$CPPFLAGS -I$withval/include"
LDFLAGS="$LDFLAGS -L$withval/lib" ] )
Make expat a dependency to the scanner
2011-08-04 07:56:04 +02:00
if test "x$enable_scanner" = "xyes"; then
AC_CHECK_HEADERS(expat.h, [AC_DEFINE(HAVE_EXPAT_H)],
[AC_MSG_ERROR([Can't find expat.h. Please install expat.])])
AC_CHECK_LIB(expat, XML_ParserCreate, [EXPAT_LIBS="-lexpat"],
[AC_MSG_ERROR([Can't find expat library. Please install expat.])])
AC_SUBST(EXPAT_LIBS)
fi
Generate protocol types and metadata from xml
2010-08-03 09:26:44 -04:00
protocol: add xslt stylesheet to prettify the protocol Includes rudimentary styling only. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2012-02-23 15:58:37 +10:00
AC_PATH_PROG(XSLTPROC, xsltproc)
configure.ac: Fix test-for-empty bug From Gaetan Nadon: ./configure: line 11662: test: !=: unary operator expected AM_CONDITIONAL([HAVE_XSLTPROC], [test $XSLTPROC != ""]) AM_CONDITIONAL([HAVE_PUBLICAN], [test $PUBLICAN != ""]) It shows up when you do not have publican. The usual "testing for blank" bug.
2012-02-29 12:49:25 -05:00
AM_CONDITIONAL([HAVE_XSLTPROC], [test "x$XSLTPROC" != "x"])
protocol: add xslt stylesheet to prettify the protocol Includes rudimentary styling only. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2012-02-23 15:58:37 +10:00
configure: Make documentation option work in fact Also, now doxygen is mandatory for building the documentation (looks reasonable because both man-pages and publican will need it). Signed-off-by: Tiago Vignatti <tiago.vignatti@intel.com>
2012-10-12 20:54:45 +03:00
AM_CONDITIONAL(BUILD_DOCS, [test x$enable_documentation = xyes])
configure: Add option to disable building documentation. Signed-off-by: Üstün Ergenoğlu <ego@ustun.fi>
2012-03-17 19:09:39 +02:00
if test "x$enable_documentation" = "xyes"; then
configure: Make documentation option work in fact Also, now doxygen is mandatory for building the documentation (looks reasonable because both man-pages and publican will need it). Signed-off-by: Tiago Vignatti <tiago.vignatti@intel.com>
2012-10-12 20:54:45 +03:00
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
configure: Add option to disable building documentation. Signed-off-by: Üstün Ergenoğlu <ego@ustun.fi>
2012-03-17 19:09:39 +02:00
AC_PATH_PROG(PUBLICAN, publican)
doc: Add auto-generated Wayland Library chapter For now only Wayland Client API is described on that chapter, which is extracted via doxygen on ./src/wayland-client.h. We apply a stylesheet (doxygen-to-publican) on doxygen output so it becomes docbook valid. Now all we need to do is populate that header while developing in order to grow a decent documentation. So please use it! Signed-off-by: Tiago Vignatti <tiago.vignatti@intel.com>
2012-10-11 17:42:09 +03:00
configure: Depend on a more strict version of publican Fix https://bugs.freedesktop.org/show_bug.cgi?id=56101 Signed-off-by: Tiago Vignatti <tiago.vignatti@intel.com>
2012-10-19 18:29:54 +03:00
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
doc: Add auto-generated Wayland Library chapter For now only Wayland Client API is described on that chapter, which is extracted via doxygen on ./src/wayland-client.h. We apply a stylesheet (doxygen-to-publican) on doxygen output so it becomes docbook valid. Now all we need to do is populate that header while developing in order to grow a decent documentation. So please use it! Signed-off-by: Tiago Vignatti <tiago.vignatti@intel.com>
2012-10-11 17:42:09 +03:00
AC_CONFIG_FILES([
doc/doxygen/wayland.doxygen
])
configure: Add option to disable building documentation. Signed-off-by: Üstün Ergenoğlu <ego@ustun.fi>
2012-03-17 19:09:39 +02:00
fi
configure.ac: Fix test-for-empty bug From Gaetan Nadon: ./configure: line 11662: test: !=: unary operator expected AM_CONDITIONAL([HAVE_XSLTPROC], [test $XSLTPROC != ""]) AM_CONDITIONAL([HAVE_PUBLICAN], [test $PUBLICAN != ""]) It shows up when you do not have publican. The usual "testing for blank" bug.
2012-02-29 12:49:25 -05:00
AM_CONDITIONAL([HAVE_PUBLICAN], [test "x$PUBLICAN" != "x"])
Hook up autotools for publican automake doesn't seem to provide a sensible method to install a directory of stuff in $(docdir). Do it manually then. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2012-02-24 09:42:05 +10:00
Split into a core repository that only holds the core Wayland libraries
2011-02-14 22:17:41 -05:00
AC_CONFIG_FILES([Makefile
wayland-scanner.m4
Introduce libwayland-cursor, a cursor helper library The purpose of this library is to be the equivalent of libXcursor in the X world. This library is compatible with X cursor themes and loads them directly into an shm pool making it easy for the clients to get buffer for each cursor image. The code for handling the X cursor theme was taken from libXcursor. The files cursor/xcursor.[ch] are a stripped down version of that library containing only the interfaces necessary for implementing the wayland counterpart.
2012-05-22 15:39:41 +03:00
cursor/Makefile
cursor/wayland-cursor.pc
build: add uninstalled pkg-config files Required for building apps against wayland libraries that have not been installed. Signed-off-by: Pekka Paalanen <ppaalanen@gmail.com>
2012-05-29 16:53:20 +03:00
cursor/wayland-cursor-uninstalled.pc
Hook up autotools for publican automake doesn't seem to provide a sensible method to install a directory of stuff in $(docdir). Do it manually then. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2012-02-24 09:42:05 +10:00
doc/Makefile
doc/Wayland/Makefile
doc: Add auto-generated Wayland Library chapter For now only Wayland Client API is described on that chapter, which is extracted via doxygen on ./src/wayland-client.h. We apply a stylesheet (doxygen-to-publican) on doxygen output so it becomes docbook valid. Now all we need to do is populate that header while developing in order to grow a decent documentation. So please use it! Signed-off-by: Tiago Vignatti <tiago.vignatti@intel.com>
2012-10-11 17:42:09 +03:00
doc/doxygen/Makefile
man: add man-page infrastructure This adds a man-page infrastructure based on Docbook XML files. This allows us to integrate the man-pages into the publican books later. An example page for wl_display_connect() (with an alias wl_display_connect_to_fd()) is also added. Feel free to add more man-pages. Function calls are put in man3 and overview pages into man7. All pages (including aliases) have to be added to the Makefile. Docbook does generate aliases automatically from the additional names that were put in the XML file. However, a small SED script is needed to fixup the include-paths in the generated troff files. If someone knows how to avoid that (or even install them gzip'ped), please fix it up. Signed-off-by: David Herrmann <dh.herrmann@googlemail.com>
2012-09-24 13:18:38 +02:00
doc/man/Makefile
Rename source subdir from wayland to src
2011-08-12 15:09:00 -04:00
src/Makefile
build: add uninstalled pkg-config files Required for building apps against wayland libraries that have not been installed. Signed-off-by: Pekka Paalanen <ppaalanen@gmail.com>
2012-05-29 16:53:20 +03:00
src/wayland-server-uninstalled.pc
src/wayland-client-uninstalled.pc
Rename source subdir from wayland to src
2011-08-12 15:09:00 -04:00
src/wayland-server.pc
protocol: add xslt stylesheet to prettify the protocol Includes rudimentary styling only. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2012-02-23 15:58:37 +10:00
src/wayland-client.pc
Add a public header for the version number This adds a public header so that applications can get the Wayland version number at compile time. This can be used to make applications that support compiling against multiple versions of Wayland. There is a separate installed header called cogl-version.h which gets included by both wayland-client.h and wayland-server.h The canonical place for the version number is the configure.ac script which splits it into three separate m4 defines for the major, minor and micro version. These are copied into the generated wayland-version.h header using AC_SUBST. There is also a string form of the complete version number. The version number is now also automatically copied into the two .pc files. Because the major, minor and micro parts are required it is no longer possible to leave the version number as 'master' when building from git. Most projects seem to immediately bump the git repo to a fake version number (usually odd) after making a release so that there is always a relative number that can be used for comparison. This patch sets the git version to 0.99.0 under the assumption that the next release will be 1.0.0.
2012-04-11 16:59:05 +01:00
src/wayland-version.h
Fix distcheck by adding back protocol/Makefile.am 5909dddc78573774bd3a93c280831a7d18d82994 removed protocol/Makefile.am which meant protocol/wayland.xml no longer got included in the tarball. Add back protocol/Makefile.am and configure.ac bits and add protocol to subdirs in Makefile.am to fix this.
2012-11-19 17:11:58 -05:00
protocol/Makefile
tests: Add Unit tests for wl_map and wl_array data structures We use a simple test-runner helper that runs each test in a separate process and reports the pass/fail rate at the end.
2012-03-02 18:03:16 -05:00
tests/Makefile])
Install libraries plus headers and add pkg-config files.
2008-12-10 13:44:23 -05:00
AC_OUTPUT
Reference in a new issue Copy permalink