← Back to branch summary

~ubuntu-branches/ubuntu/maverick/x11-xserver-utils/maverick-security

« back to all changes in this revision

Viewing changes to xsetroot/configure.ac

  • Committer: Bazaar Package Importer
  • Author(s): Bryce Harrington
  • Date: 2010-01-08 18:38:47 UTC
  • mfrom: (5.1.1 sid)
  • Revision ID: james.westby@ubuntu.com-20100108183847-wuunshkmhcyh7vzc
Tags: 7.5+1ubuntu1
* Merge from Debian.  Remaining Ubuntu changes:
  - Add 100_xrandr-output.patch: When using --scale or --transform, verify
    a valid output parameter is used; crashes otherwise.

Show diffs side-by-side

added added

removed removed

Lines of Context:
xsetroot/configure.ac
22
22
dnl Process this file with autoconf to create configure.
23
23
 
24
24
AC_PREREQ([2.57])
25
 
AC_INIT(xsetroot,[1.0.2], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],xsetroot)
 
25
AC_INIT(xsetroot, [1.0.3], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],xsetroot)
26
26
AM_INIT_AUTOMAKE([dist-bzip2])
27
27
AM_MAINTAINER_MODE
28
28
 
 
29
# Require xorg-macros 1.3 or later: XORG_DEFAULT_OPTIONS
 
30
m4_ifndef([XORG_MACROS_VERSION],
 
31
          [m4_fatal([must install xorg-macros 1.3 or later before running autoconf/autogen])])
 
32
XORG_MACROS_VERSION(1.3)
 
33
 
29
34
AM_CONFIG_HEADER(config.h)
30
35
 
31
 
# Require xorg-macros version 1.1.0 or newer for XORG_WITH_LINT macro
32
 
m4_ifndef([XORG_MACROS_VERSION], [AC_FATAL([must install xorg-macros 1.1 or later before running autoconf/autogen])])
33
 
XORG_MACROS_VERSION(1.1)
34
 
 
35
36
AC_PROG_CC
36
37
AC_PROG_INSTALL
37
38
 
 
39
XORG_DEFAULT_OPTIONS
 
40
 
38
41
# Checks for pkg-config packages
39
42
PKG_CHECK_MODULES(XSETROOT, xmuu x11 xbitmaps)
40
43
AC_SUBST(XSETROOT_CFLAGS)
41
44
AC_SUBST(XSETROOT_LIBS)
42
45
 
43
46
XORG_WITH_LINT
44
 
XORG_MANPAGE_SECTIONS
45
 
XORG_RELEASE_VERSION
46
47
 
47
48
AC_OUTPUT([Makefile])