aboutsummaryrefslogtreecommitdiff
path: root/xorg-server/fonts.src/font-util/configure.ac
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2009-09-02 21:09:13 +0000
committermarha <marha@users.sourceforge.net>2009-09-02 21:09:13 +0000
commit8fedf58693f42869528b41408ac4d6012839e973 (patch)
tree62a817bea7dfc71050292d302ba94f5e349c67a7 /xorg-server/fonts.src/font-util/configure.ac
parentac14083f465166b298162a57fff0bad90e528fff (diff)
parent6f25a23db1df27e992c34f6fd4c82e83c44fc2e2 (diff)
downloadvcxsrv-8fedf58693f42869528b41408ac4d6012839e973.tar.gz
vcxsrv-8fedf58693f42869528b41408ac4d6012839e973.tar.bz2
vcxsrv-8fedf58693f42869528b41408ac4d6012839e973.zip
svn merge https://vcxsrv.svn.sourceforge.net/svnroot/vcxsrv/branches/released .
Diffstat (limited to 'xorg-server/fonts.src/font-util/configure.ac')
-rw-r--r--xorg-server/fonts.src/font-util/configure.ac18
1 files changed, 10 insertions, 8 deletions
diff --git a/xorg-server/fonts.src/font-util/configure.ac b/xorg-server/fonts.src/font-util/configure.ac
index e582c8957..90d0e6f6f 100644
--- a/xorg-server/fonts.src/font-util/configure.ac
+++ b/xorg-server/fonts.src/font-util/configure.ac
@@ -22,25 +22,27 @@ dnl
dnl Process this file with autoconf to create configure.
AC_PREREQ([2.57])
-AC_INIT(font-util, [1.0.1], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], font-util)
+AC_INIT(font-util, [1.0.2], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], font-util)
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)
AM_CONFIG_HEADER(config.h)
+XORG_CWARNFLAGS
AC_PROG_CC
AC_PROG_INSTALL
-m4_ifdef([AS_HELP_STRING], , [m4_define([AS_HELP_STRING], m4_defn([AC_HELP_STRING]))])
-
-DEFAULT_MAPDIR=${libdir}/X11/fonts/util
-AC_ARG_WITH(mapdir,
- AS_HELP_STRING([--with-mapdir=MAPDIR], [Path to install font maps]),
- [MAPDIR="$withval"],
- [MAPDIR="$DEFAULT_MAPDIR"])
+mapdir=${libdir}/X11/fonts/util
+AC_ARG_WITH(mapdir, AC_HELP_STRING([--with-mapdir=<pathname>],
+ [Path to install font maps]), [mapdir="$withval"])
+MAPDIR="$mapdir"
AC_SUBST(MAPDIR)
XORG_MANPAGE_SECTIONS
XORG_RELEASE_VERSION
+XORG_CHANGELOG
AC_OUTPUT([Makefile fontutil.pc])