diff options
Diffstat (limited to 'xorg-server/fonts.src/font-util')
| -rw-r--r-- | xorg-server/fonts.src/font-util/ChangeLog | 19 | ||||
| -rw-r--r-- | xorg-server/fonts.src/font-util/Makefile.in | 2 | ||||
| -rw-r--r-- | xorg-server/fonts.src/font-util/configure | 27 | ||||
| -rw-r--r-- | xorg-server/fonts.src/font-util/configure.ac | 7 | ||||
| -rw-r--r-- | xorg-server/fonts.src/font-util/fontutil.m4 | 4 |
5 files changed, 38 insertions, 21 deletions
diff --git a/xorg-server/fonts.src/font-util/ChangeLog b/xorg-server/fonts.src/font-util/ChangeLog index 875844a14..487e829d3 100644 --- a/xorg-server/fonts.src/font-util/ChangeLog +++ b/xorg-server/fonts.src/font-util/ChangeLog @@ -1,3 +1,22 @@ +commit 640a11b930dde29a5a74bcecec858d0a8255c013 +Author: Alan Coopersmith <alan.coopersmith@sun.com> +Date: Mon Oct 12 08:49:02 2009 -0700 + + font-util 1.1.1 + + Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com> + +commit e1a84f5c30de633767dc4c05a38a34c3f114a138 +Author: Alan Coopersmith <alan.coopersmith@sun.com> +Date: Sat Oct 10 21:50:26 2009 -0700 + + Make fontrootdir capitalization consistently lowercase + + Fixes installation of mapfiles, which were going to /util because + ${fontrootdir} was undefined in Makefile. Found by tinderbox. + + Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com> + commit b10044e1cdb8f1656b6f61d79512bf4d49ee3339 Author: Alan Coopersmith <alan.coopersmith@sun.com> Date: Wed Oct 7 20:23:36 2009 -0700 diff --git a/xorg-server/fonts.src/font-util/Makefile.in b/xorg-server/fonts.src/font-util/Makefile.in index 6d5a734e4..f9518222c 100644 --- a/xorg-server/fonts.src/font-util/Makefile.in +++ b/xorg-server/fonts.src/font-util/Makefile.in @@ -170,7 +170,6 @@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ FILE_MAN_DIR = @FILE_MAN_DIR@ FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@ -FONTROOTDIR = @FONTROOTDIR@ GREP = @GREP@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ @@ -224,6 +223,7 @@ distcleancheck_listfiles = @distcleancheck_listfiles@ docdir = @docdir@ dvidir = @dvidir@ exec_prefix = @exec_prefix@ +fontrootdir = @fontrootdir@ host = @host@ host_alias = @host_alias@ host_cpu = @host_cpu@ diff --git a/xorg-server/fonts.src/font-util/configure b/xorg-server/fonts.src/font-util/configure index 61121c79a..2e735f080 100644 --- a/xorg-server/fonts.src/font-util/configure +++ b/xorg-server/fonts.src/font-util/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.63 for font-util 1.1.0. +# Generated by GNU Autoconf 2.63 for font-util 1.1.1. # # Report bugs to <https://bugs.freedesktop.org/enter_bug.cgi?product=xorg>. # @@ -596,8 +596,8 @@ SHELL=${CONFIG_SHELL-/bin/sh} # Identity of this package. PACKAGE_NAME='font-util' PACKAGE_TARNAME='font-util' -PACKAGE_VERSION='1.1.0' -PACKAGE_STRING='font-util 1.1.0' +PACKAGE_VERSION='1.1.1' +PACKAGE_STRING='font-util 1.1.1' PACKAGE_BUGREPORT='https://bugs.freedesktop.org/enter_bug.cgi?product=xorg' # Factoring default headers for most tests. @@ -641,7 +641,7 @@ am__EXEEXT_TRUE LTLIBOBJS LIBOBJS MAPDIR -FONTROOTDIR +fontrootdir ADMIN_MAN_DIR DRIVER_MAN_DIR MISC_MAN_DIR @@ -1321,7 +1321,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures font-util 1.1.0 to adapt to many kinds of systems. +\`configure' configures font-util 1.1.1 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1391,7 +1391,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of font-util 1.1.0:";; + short | recursive ) echo "Configuration of font-util 1.1.1:";; esac cat <<\_ACEOF @@ -1494,7 +1494,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -font-util configure 1.1.0 +font-util configure 1.1.1 generated by GNU Autoconf 2.63 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -1508,7 +1508,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by font-util $as_me 1.1.0, which was +It was created by font-util $as_me 1.1.1, which was generated by GNU Autoconf 2.63. Invocation command line was $ $0 $@ @@ -2357,7 +2357,7 @@ fi # Define the identity of the package. PACKAGE='font-util' - VERSION='1.1.0' + VERSION='1.1.1' cat >>confdefs.h <<_ACEOF @@ -5731,10 +5731,9 @@ if test "${with_fontrootdir+set}" = set; then withval=$with_fontrootdir; fontrootdir="${withval}" fi -FONTROOTDIR="${fontrootdir}" -{ $as_echo "$as_me:$LINENO: result: ${FONTROOTDIR}" >&5 -$as_echo "${FONTROOTDIR}" >&6; } +{ $as_echo "$as_me:$LINENO: result: ${fontrootdir}" >&5 +$as_echo "${fontrootdir}" >&6; } mapdir='${fontrootdir}/util' @@ -6203,7 +6202,7 @@ exec 6>&1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by font-util $as_me 1.1.0, which was +This file was extended by font-util $as_me 1.1.1, which was generated by GNU Autoconf 2.63. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -6266,7 +6265,7 @@ Report bugs to <bug-autoconf@gnu.org>." _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_version="\\ -font-util config.status 1.1.0 +font-util config.status 1.1.1 configured by $0, generated by GNU Autoconf 2.63, with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" diff --git a/xorg-server/fonts.src/font-util/configure.ac b/xorg-server/fonts.src/font-util/configure.ac index bc8b1362b..f3b63c33b 100644 --- a/xorg-server/fonts.src/font-util/configure.ac +++ b/xorg-server/fonts.src/font-util/configure.ac @@ -22,7 +22,7 @@ dnl dnl Process this file with autoconf to create configure. AC_PREREQ([2.57]) -AC_INIT(font-util, [1.1.0], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], font-util) +AC_INIT(font-util, [1.1.1], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], font-util) AM_INIT_AUTOMAKE([foreign dist-bzip2]) AM_MAINTAINER_MODE @@ -42,9 +42,8 @@ fontrootdir='${datadir}/fonts/X11' AC_ARG_WITH(fontrootdir, [AC_HELP_STRING([--with-fontrootdir=DIR], [Path to parent of font subdirectories [DATADIR/fonts/X11]])], [fontrootdir="${withval}"]) -FONTROOTDIR="${fontrootdir}" -AC_SUBST(FONTROOTDIR) -AC_MSG_RESULT([${FONTROOTDIR}]) +AC_SUBST(fontrootdir) +AC_MSG_RESULT([${fontrootdir}]) mapdir='${fontrootdir}/util' AC_ARG_WITH(mapdir, [AC_HELP_STRING([--with-mapdir=DIR], diff --git a/xorg-server/fonts.src/font-util/fontutil.m4 b/xorg-server/fonts.src/font-util/fontutil.m4 index 2487e2654..64bccc374 100644 --- a/xorg-server/fonts.src/font-util/fontutil.m4 +++ b/xorg-server/fonts.src/font-util/fontutil.m4 @@ -1,6 +1,6 @@ dnl fontutil.m4. Generated from fontutil.m4.in by configure. dnl -dnl This file comes from X.Org's font-util 1.1.0 +dnl This file comes from X.Org's font-util 1.1.1 dnl dnl Copyright 2005 Red Hat, Inc dnl @@ -71,7 +71,7 @@ dnl of the copyright holder. # See the "minimum version" comment for each macro you use to see what # version you require. m4_defun([XORG_FONT_MACROS_VERSION],[ -m4_define([vers_have], [1.1.0]) +m4_define([vers_have], [1.1.1]) m4_define([maj_have], m4_substr(vers_have, 0, m4_index(vers_have, [.]))) m4_define([maj_needed], m4_substr([$1], 0, m4_index([$1], [.]))) m4_if(m4_cmp(maj_have, maj_needed), 0,, |