diff options
| author | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2010-11-25 21:58:02 +0000 |
|---|---|---|
| committer | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2010-11-25 21:58:02 +0000 |
| commit | 715bf2b5c0edc9705d4b8f78a128213629225820 (patch) | |
| tree | 1f2db7324b35c69ec9ffe2db0155cf87376d7e70 /app/xcalc/configure.ac | |
| parent | 5673405fda589b3fa44c760f6a7ad2da4736ac14 (diff) | |
Update to xcalc 1.0.4.
Diffstat (limited to 'app/xcalc/configure.ac')
| -rw-r--r-- | app/xcalc/configure.ac | 31 |
1 files changed, 14 insertions, 17 deletions
diff --git a/app/xcalc/configure.ac b/app/xcalc/configure.ac index 369ba6135..19912432c 100644 --- a/app/xcalc/configure.ac +++ b/app/xcalc/configure.ac @@ -21,31 +21,28 @@ dnl PERFORMANCE OF THIS SOFTWARE. dnl dnl Process this file with autoconf to create configure. -AC_PREREQ([2.57]) -AC_INIT(xcalc, [1.0.3], - [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xcalc) +# Initialize Autoconf +AC_PREREQ([2.60]) +AC_INIT([xcalc], [1.0.4], + [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], [xcalc]) +AC_CONFIG_SRCDIR([Makefile.am]) +AC_CONFIG_HEADERS([config.h]) + +# Initialize Automake AM_INIT_AUTOMAKE([foreign dist-bzip2]) AM_MAINTAINER_MODE -# Require xorg-macros: XORG_DEFAULT_OPTIONS +# 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.3 or later before running autoconf/autogen])]) -XORG_MACROS_VERSION(1.3) + [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 - - -PKG_CHECK_MODULES(XCALC, xaw7) -XCALC_CFLAGS="$CWARNFLAGS $XCALC_CFLAGS" -AC_SUBST(XCALC_CFLAGS) -AC_SUBST(XCALC_LIBS) +# Checks for pkg-config packages +PKG_CHECK_MODULES(XCALC, xaw7 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)]), |