diff options
Diffstat (limited to 'app/xmag/configure.ac')
| -rw-r--r-- | app/xmag/configure.ac | 31 |
1 files changed, 11 insertions, 20 deletions
diff --git a/app/xmag/configure.ac b/app/xmag/configure.ac index 41730b90c..2fd67be03 100644 --- a/app/xmag/configure.ac +++ b/app/xmag/configure.ac @@ -21,40 +21,31 @@ dnl PERFORMANCE OF THIS SOFTWARE. dnl dnl Process this file with autoconf to create configure. -AC_PREREQ([2.57]) -AC_INIT(xmag, [1.0.3], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],xmag) -AM_INIT_AUTOMAKE([dist-bzip2]) +AC_PREREQ([2.60]) +AC_INIT([xmag], [1.0.4], + [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], [xmag]) +AM_INIT_AUTOMAKE([foreign 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) +# Require X.Org macros 1.8 or later for MAN_SUBSTS set by XORG_MANPAGE_SECTIONS +m4_ifndef([XORG_MACROS_VERSION], + [m4_fatal([must install xorg-macros 1.8 or later before running autoconf/autogen])]) +XORG_MACROS_VERSION(1.8) +XORG_DEFAULT_OPTIONS AM_CONFIG_HEADER(config.h) -AC_PROG_CC -AC_PROG_INSTALL - -XORG_CWARNFLAGS - AC_CHECK_FUNCS([nanosleep poll select]) # Checks for pkg-config packages -PKG_CHECK_MODULES(XMAG, xaw7) -XMAG_CFLAGS="$CWARNFLAGS $XMAG_CFLAGS" -AC_SUBST(XMAG_CFLAGS) -AC_SUBST(XMAG_LIBS) +PKG_CHECK_MODULES(XMAG, xaw7 xmu xt x11) -PKG_CHECK_MODULES(APPDEFS, xt) -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]) |