summaryrefslogtreecommitdiff
path: root/lib/libXmu/configure.ac
diff options
context:
space:
mode:
authorMatthieu Herrb <matthieu@cvs.openbsd.org>2009-10-31 18:29:38 +0000
committerMatthieu Herrb <matthieu@cvs.openbsd.org>2009-10-31 18:29:38 +0000
commit25ba41f5fc08813ee339172ef68158f2a433ed59 (patch)
tree07dd5e8dfa60169e4462d5a2d6607427107923db /lib/libXmu/configure.ac
parentd9b828c2d1e6e4e2ceb750c1b925f0bc551a1443 (diff)
Update to libXmu 1.0.5
Diffstat (limited to 'lib/libXmu/configure.ac')
-rw-r--r--lib/libXmu/configure.ac15
1 files changed, 12 insertions, 3 deletions
diff --git a/lib/libXmu/configure.ac b/lib/libXmu/configure.ac
index 7abdb21ad..f521572e4 100644
--- a/lib/libXmu/configure.ac
+++ b/lib/libXmu/configure.ac
@@ -5,7 +5,7 @@
AC_PREREQ(2.57)
AC_INIT([libXmu],
- 1.0.3,
+ 1.0.5,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
libXmu)
@@ -15,14 +15,19 @@ AM_INIT_AUTOMAKE([dist-bzip2])
AM_MAINTAINER_MODE
+# Require xorg-macros: XORG_DEFAULT_OPTIONS, XORG_WITH_LINT
+m4_ifndef([XORG_MACROS_VERSION], [AC_FATAL([must install xorg-macros 1.3 or later before running autoconf/autogen])])
+XORG_MACROS_VERSION(1.3)
AM_CONFIG_HEADER([config.h])
+
# Checks for programs.
AC_PROG_LIBTOOL
AC_PROG_CC
+XORG_DEFAULT_OPTIONS
# Checks for pkg-config packages
-PKG_CHECK_MODULES(XMU, xt xext xextproto)
+PKG_CHECK_MODULES(XMU, xt xext x11 xextproto)
AC_SUBST(XMU_CFLAGS)
AC_SUBST(XMU_LIBS)
@@ -51,7 +56,11 @@ XTRANS_CONNECTION_FLAGS
AC_DEFINE(HAS_SNPRINTF, [], [Whether we have snprintf()])
AC_SUBST(HAS_SNPRINTF)
-XORG_RELEASE_VERSION
+dnl Allow checking code with lint, sparse, etc.
+XORG_WITH_LINT
+XORG_LINT_LIBRARY([Xmu])
+LINTLIBUU=`echo $LINTLIB | sed s/Xmu/Xmuu/`
+AC_SUBST(LINTLIBUU)
AC_OUTPUT([Makefile
include/Makefile