summaryrefslogtreecommitdiff
path: root/app/xmag/configure.ac
diff options
context:
space:
mode:
authorMatthieu Herrb <matthieu@cvs.openbsd.org>2009-09-26 14:49:37 +0000
committerMatthieu Herrb <matthieu@cvs.openbsd.org>2009-09-26 14:49:37 +0000
commit546cf947d181edf627c2d1f9821e718c103d8cbe (patch)
treee6a7fd9036583427a09eae096408a4be846a69d2 /app/xmag/configure.ac
parent8f53c3ed0c8e06999a24e0f03956e7d8e5ffcc0f (diff)
update to xmag 1.0.3
Diffstat (limited to 'app/xmag/configure.ac')
-rw-r--r--app/xmag/configure.ac20
1 files changed, 17 insertions, 3 deletions
diff --git a/app/xmag/configure.ac b/app/xmag/configure.ac
index 2dfb39933..41730b90c 100644
--- a/app/xmag/configure.ac
+++ b/app/xmag/configure.ac
@@ -22,25 +22,39 @@ dnl
dnl Process this file with autoconf to create configure.
AC_PREREQ([2.57])
-AC_INIT(xmag,[1.0.1], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],xmag)
+AC_INIT(xmag, [1.0.3], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],xmag)
AM_INIT_AUTOMAKE([dist-bzip2])
AM_MAINTAINER_MODE
+# Require xorg-macros: XORG_CWARNFLAGS, XORG_CHANGELOG
+m4_ifndef([XORG_MACROS_VERSION], [AC_FATAL([must install xorg-macros 1.2 or later before running autoconf/autogen])])
+XORG_MACROS_VERSION(1.2)
+
AM_CONFIG_HEADER(config.h)
AC_PROG_CC
AC_PROG_INSTALL
+XORG_CWARNFLAGS
+
+AC_CHECK_FUNCS([nanosleep poll select])
+
# Checks for pkg-config packages
-XAW_CHECK_XPRINT_SUPPORT(XMAG)
+PKG_CHECK_MODULES(XMAG, xaw7)
+XMAG_CFLAGS="$CWARNFLAGS $XMAG_CFLAGS"
AC_SUBST(XMAG_CFLAGS)
AC_SUBST(XMAG_LIBS)
PKG_CHECK_MODULES(APPDEFS, xt)
-appdefaultdir=$(pkg-config --variable=appdefaultdir xt)
+xt_appdefaultdir=$(pkg-config --variable=appdefaultdir xt)
+AC_ARG_WITH(appdefaultdir,
+ AC_HELP_STRING([--with-appdefaultdir=<pathname>],
+ [specify directory for app-defaults files (default is autodetected)]),
+ [appdefaultdir="$withval"], [appdefaultdir="${xt_appdefaultdir}"])
AC_SUBST(appdefaultdir)
XORG_MANPAGE_SECTIONS
XORG_RELEASE_VERSION
+XORG_CHANGELOG
AC_OUTPUT([Makefile])