- merge libXfont 1.2.6
- regen generated files
This commit is contained in:
matthieu
parent
8ae8ea3af8
commit
500e16d1e2
@ -1,5 +1,4 @@
|
||||
#
|
||||
# $Xorg: Makefile.am,v 1.1.1.1 2006/11/25 17:14:30 matthieu Exp $
|
||||
#
|
||||
# Copyright © 2003 Keith Packard, Noah Levitt
|
||||
#
|
||||
@ -31,7 +30,6 @@ libXfontinclude_HEADERS = \
|
||||
include/X11/fonts/fntfil.h \
|
||||
include/X11/fonts/fntfilio.h \
|
||||
include/X11/fonts/fntfilst.h \
|
||||
include/X11/fonts/fontconf.h \
|
||||
include/X11/fonts/fontencc.h \
|
||||
include/X11/fonts/fontmisc.h \
|
||||
include/X11/fonts/fontmod.h \
|
||||
@ -41,6 +39,8 @@ libXfontinclude_HEADERS = \
|
||||
include/X11/fonts/pcf.h \
|
||||
src/FreeType/ft.h \
|
||||
src/FreeType/ftfuncs.h
|
||||
nodist_libXfontinclude_HEADERS = \
|
||||
include/X11/fonts/fontconf.h
|
||||
|
||||
pkgconfigdir = $(libdir)/pkgconfig
|
||||
pkgconfig_DATA = xfont.pc
|
||||
@ -51,7 +51,7 @@ EXTRA_DIST = xfont.pc.in autogen.sh include/X11/fonts/fontconf.h.in ChangeLog
|
||||
|
||||
CLEANFILES = ChangeLog
|
||||
ChangeLog:
|
||||
git-log > ChangeLog
|
||||
(GIT_DIR=$(top_srcdir)/.git git-log > .changelog.tmp && mv .changelog.tmp ChangeLog; rm -f .changelog.tmp) || (touch ChangeLog; echo 'git directory not found: installing possibly empty changelog.' >&2)
|
||||
|
||||
dist-hook: ChangeLog
|
||||
|
||||
|
||||
@ -15,7 +15,6 @@
|
||||
@SET_MAKE@
|
||||
|
||||
#
|
||||
# $Xorg: Makefile.am,v 1.1.1.1 2006/11/25 17:14:30 matthieu Exp $
|
||||
#
|
||||
# Copyright © 2003 Keith Packard, Noah Levitt
|
||||
#
|
||||
@ -92,11 +91,13 @@ am__vpath_adj = case $$p in \
|
||||
esac;
|
||||
am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
|
||||
am__installdirs = "$(DESTDIR)$(pkgconfigdir)" \
|
||||
"$(DESTDIR)$(libXfontincludedir)" \
|
||||
"$(DESTDIR)$(libXfontincludedir)"
|
||||
pkgconfigDATA_INSTALL = $(INSTALL_DATA)
|
||||
DATA = $(pkgconfig_DATA)
|
||||
libXfontincludeHEADERS_INSTALL = $(INSTALL_HEADER)
|
||||
HEADERS = $(libXfontinclude_HEADERS)
|
||||
nodist_libXfontincludeHEADERS_INSTALL = $(INSTALL_HEADER)
|
||||
HEADERS = $(libXfontinclude_HEADERS) $(nodist_libXfontinclude_HEADERS)
|
||||
ETAGS = etags
|
||||
CTAGS = ctags
|
||||
DIST_SUBDIRS = $(SUBDIRS)
|
||||
@ -252,7 +253,6 @@ libXfontinclude_HEADERS = \
|
||||
include/X11/fonts/fntfil.h \
|
||||
include/X11/fonts/fntfilio.h \
|
||||
include/X11/fonts/fntfilst.h \
|
||||
include/X11/fonts/fontconf.h \
|
||||
include/X11/fonts/fontencc.h \
|
||||
include/X11/fonts/fontmisc.h \
|
||||
include/X11/fonts/fontmod.h \
|
||||
@ -263,6 +263,9 @@ libXfontinclude_HEADERS = \
|
||||
src/FreeType/ft.h \
|
||||
src/FreeType/ftfuncs.h
|
||||
|
||||
nodist_libXfontinclude_HEADERS = \
|
||||
include/X11/fonts/fontconf.h
|
||||
|
||||
pkgconfigdir = $(libdir)/pkgconfig
|
||||
pkgconfig_DATA = xfont.pc
|
||||
EXTRA_DIST = xfont.pc.in autogen.sh include/X11/fonts/fontconf.h.in ChangeLog
|
||||
@ -377,6 +380,23 @@ uninstall-libXfontincludeHEADERS:
|
||||
echo " rm -f '$(DESTDIR)$(libXfontincludedir)/$$f'"; \
|
||||
rm -f "$(DESTDIR)$(libXfontincludedir)/$$f"; \
|
||||
done
|
||||
install-nodist_libXfontincludeHEADERS: $(nodist_libXfontinclude_HEADERS)
|
||||
@$(NORMAL_INSTALL)
|
||||
test -z "$(libXfontincludedir)" || $(mkdir_p) "$(DESTDIR)$(libXfontincludedir)"
|
||||
@list='$(nodist_libXfontinclude_HEADERS)'; for p in $$list; do \
|
||||
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
|
||||
f=$(am__strip_dir) \
|
||||
echo " $(nodist_libXfontincludeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(libXfontincludedir)/$$f'"; \
|
||||
$(nodist_libXfontincludeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(libXfontincludedir)/$$f"; \
|
||||
done
|
||||
|
||||
uninstall-nodist_libXfontincludeHEADERS:
|
||||
@$(NORMAL_UNINSTALL)
|
||||
@list='$(nodist_libXfontinclude_HEADERS)'; for p in $$list; do \
|
||||
f=$(am__strip_dir) \
|
||||
echo " rm -f '$(DESTDIR)$(libXfontincludedir)/$$f'"; \
|
||||
rm -f "$(DESTDIR)$(libXfontincludedir)/$$f"; \
|
||||
done
|
||||
|
||||
# This directory's subdirectories are mostly independent; you can cd
|
||||
# into them and run `make' without going through this Makefile.
|
||||
@ -660,7 +680,7 @@ check: check-recursive
|
||||
all-am: Makefile $(DATA) $(HEADERS) config.h
|
||||
installdirs: installdirs-recursive
|
||||
installdirs-am:
|
||||
for dir in "$(DESTDIR)$(pkgconfigdir)" "$(DESTDIR)$(libXfontincludedir)"; do \
|
||||
for dir in "$(DESTDIR)$(pkgconfigdir)" "$(DESTDIR)$(libXfontincludedir)" "$(DESTDIR)$(libXfontincludedir)"; do \
|
||||
test -z "$$dir" || $(mkdir_p) "$$dir"; \
|
||||
done
|
||||
install: install-recursive
|
||||
@ -708,7 +728,8 @@ info: info-recursive
|
||||
|
||||
info-am:
|
||||
|
||||
install-data-am: install-libXfontincludeHEADERS install-pkgconfigDATA
|
||||
install-data-am: install-libXfontincludeHEADERS \
|
||||
install-nodist_libXfontincludeHEADERS install-pkgconfigDATA
|
||||
|
||||
install-exec-am:
|
||||
|
||||
@ -737,6 +758,7 @@ ps: ps-recursive
|
||||
ps-am:
|
||||
|
||||
uninstall-am: uninstall-info-am uninstall-libXfontincludeHEADERS \
|
||||
uninstall-nodist_libXfontincludeHEADERS \
|
||||
uninstall-pkgconfigDATA
|
||||
|
||||
uninstall-info: uninstall-info-recursive
|
||||
@ -751,18 +773,20 @@ uninstall-info: uninstall-info-recursive
|
||||
install install-am install-data install-data-am install-exec \
|
||||
install-exec-am install-info install-info-am \
|
||||
install-libXfontincludeHEADERS install-man \
|
||||
install-pkgconfigDATA install-strip installcheck \
|
||||
installcheck-am installdirs installdirs-am maintainer-clean \
|
||||
maintainer-clean-generic maintainer-clean-recursive \
|
||||
mostlyclean mostlyclean-generic mostlyclean-libtool \
|
||||
mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \
|
||||
uninstall uninstall-am uninstall-info-am \
|
||||
uninstall-libXfontincludeHEADERS uninstall-pkgconfigDATA
|
||||
install-nodist_libXfontincludeHEADERS install-pkgconfigDATA \
|
||||
install-strip installcheck installcheck-am installdirs \
|
||||
installdirs-am maintainer-clean maintainer-clean-generic \
|
||||
maintainer-clean-recursive mostlyclean mostlyclean-generic \
|
||||
mostlyclean-libtool mostlyclean-recursive pdf pdf-am ps ps-am \
|
||||
tags tags-recursive uninstall uninstall-am uninstall-info-am \
|
||||
uninstall-libXfontincludeHEADERS \
|
||||
uninstall-nodist_libXfontincludeHEADERS \
|
||||
uninstall-pkgconfigDATA
|
||||
|
||||
|
||||
.PHONY: ChangeLog
|
||||
ChangeLog:
|
||||
git-log > ChangeLog
|
||||
(GIT_DIR=$(top_srcdir)/.git git-log > .changelog.tmp && mv .changelog.tmp ChangeLog; rm -f .changelog.tmp) || (touch ChangeLog; echo 'git directory not found: installing possibly empty changelog.' >&2)
|
||||
|
||||
dist-hook: ChangeLog
|
||||
# Tell versions [3.59,3.63) of GNU make to not export all variables.
|
||||
|
||||
6
lib/libXfont/aclocal.m4
vendored
6
lib/libXfont/aclocal.m4
vendored
@ -7413,16 +7413,16 @@ AC_DEFUN([XORG_RELEASE_VERSION],[
|
||||
AC_MSG_NOTICE([Building with package name set to $PACKAGE])
|
||||
fi
|
||||
AC_DEFINE_UNQUOTED([PACKAGE_VERSION_MAJOR],
|
||||
[`echo $PACKAGE_VERSION | sed -ne 's/^\([[^\.]]\+\).*/\1/p'`],
|
||||
[`echo $PACKAGE_VERSION | cut -d . -f 1`],
|
||||
[Major version of this package])
|
||||
PVM=`echo $PACKAGE_VERSION | sed -ne 's/^\([[^\.]]\+\)\.\([[^\.]]\+\).*/\2/p'`
|
||||
PVM=`echo $PACKAGE_VERSION | cut -d . -f 2`
|
||||
if test "x$PVM" = "x"; then
|
||||
PVM="0"
|
||||
fi
|
||||
AC_DEFINE_UNQUOTED([PACKAGE_VERSION_MINOR],
|
||||
[$PVM],
|
||||
[Minor version of this package])
|
||||
PVP=`echo $PACKAGE_VERSION | sed -ne 's/^\([[^\.]]\+\)\.\([[^\.]]\+\)\.\([[^\.]]\+\).*/\3/p'`
|
||||
PVP=`echo $PACKAGE_VERSION | cut -d . -f 3`
|
||||
if test "x$PVP" = "x"; then
|
||||
PVP="0"
|
||||
fi
|
||||
|
||||
28
lib/libXfont/configure
vendored
28
lib/libXfont/configure
vendored
@ -1,6 +1,6 @@
|
||||
#! /bin/sh
|
||||
# Guess values for system-dependent variables and create Makefiles.
|
||||
# Generated by GNU Autoconf 2.59 for libXfont 1.2.5.
|
||||
# Generated by GNU Autoconf 2.59 for libXfont 1.2.6.
|
||||
#
|
||||
# Report bugs to <https://bugs.freedesktop.org/enter_bug.cgi?product=xorg>.
|
||||
#
|
||||
@ -423,8 +423,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
|
||||
# Identity of this package.
|
||||
PACKAGE_NAME='libXfont'
|
||||
PACKAGE_TARNAME='libXfont'
|
||||
PACKAGE_VERSION='1.2.5'
|
||||
PACKAGE_STRING='libXfont 1.2.5'
|
||||
PACKAGE_VERSION='1.2.6'
|
||||
PACKAGE_STRING='libXfont 1.2.6'
|
||||
PACKAGE_BUGREPORT='https://bugs.freedesktop.org/enter_bug.cgi?product=xorg'
|
||||
|
||||
# Factoring default headers for most tests.
|
||||
@ -981,7 +981,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 libXfont 1.2.5 to adapt to many kinds of systems.
|
||||
\`configure' configures libXfont 1.2.6 to adapt to many kinds of systems.
|
||||
|
||||
Usage: $0 [OPTION]... [VAR=VALUE]...
|
||||
|
||||
@ -1047,7 +1047,7 @@ fi
|
||||
|
||||
if test -n "$ac_init_help"; then
|
||||
case $ac_init_help in
|
||||
short | recursive ) echo "Configuration of libXfont 1.2.5:";;
|
||||
short | recursive ) echo "Configuration of libXfont 1.2.6:";;
|
||||
esac
|
||||
cat <<\_ACEOF
|
||||
|
||||
@ -1217,7 +1217,7 @@ fi
|
||||
test -n "$ac_init_help" && exit 0
|
||||
if $ac_init_version; then
|
||||
cat <<\_ACEOF
|
||||
libXfont configure 1.2.5
|
||||
libXfont configure 1.2.6
|
||||
generated by GNU Autoconf 2.59
|
||||
|
||||
Copyright (C) 2003 Free Software Foundation, Inc.
|
||||
@ -1231,7 +1231,7 @@ cat >&5 <<_ACEOF
|
||||
This file contains any messages produced by compilers while
|
||||
running configure, to aid debugging if configure makes a mistake.
|
||||
|
||||
It was created by libXfont $as_me 1.2.5, which was
|
||||
It was created by libXfont $as_me 1.2.6, which was
|
||||
generated by GNU Autoconf 2.59. Invocation command line was
|
||||
|
||||
$ $0 $@
|
||||
@ -1874,7 +1874,7 @@ fi
|
||||
|
||||
# Define the identity of the package.
|
||||
PACKAGE='libXfont'
|
||||
VERSION='1.2.5'
|
||||
VERSION='1.2.6'
|
||||
|
||||
|
||||
cat >>confdefs.h <<_ACEOF
|
||||
@ -19114,7 +19114,7 @@ if test "${enable_type1+set}" = set; then
|
||||
enableval="$enable_type1"
|
||||
XFONT_TYPE1=$enableval
|
||||
else
|
||||
XFONT_TYPE1=no
|
||||
XFONT_TYPE1=yes
|
||||
fi;
|
||||
if test "x$XFONT_TYPE1" = xyes; then
|
||||
|
||||
@ -20356,10 +20356,10 @@ echo "$as_me: Building with package name set to $PACKAGE" >&6;}
|
||||
fi
|
||||
|
||||
cat >>confdefs.h <<_ACEOF
|
||||
#define PACKAGE_VERSION_MAJOR `echo $PACKAGE_VERSION | sed -ne 's/^\([^\.]\+\).*/\1/p'`
|
||||
#define PACKAGE_VERSION_MAJOR `echo $PACKAGE_VERSION | cut -d . -f 1`
|
||||
_ACEOF
|
||||
|
||||
PVM=`echo $PACKAGE_VERSION | sed -ne 's/^\([^\.]\+\)\.\([^\.]\+\).*/\2/p'`
|
||||
PVM=`echo $PACKAGE_VERSION | cut -d . -f 2`
|
||||
if test "x$PVM" = "x"; then
|
||||
PVM="0"
|
||||
fi
|
||||
@ -20368,7 +20368,7 @@ cat >>confdefs.h <<_ACEOF
|
||||
#define PACKAGE_VERSION_MINOR $PVM
|
||||
_ACEOF
|
||||
|
||||
PVP=`echo $PACKAGE_VERSION | sed -ne 's/^\([^\.]\+\)\.\([^\.]\+\)\.\([^\.]\+\).*/\3/p'`
|
||||
PVP=`echo $PACKAGE_VERSION | cut -d . -f 3`
|
||||
if test "x$PVP" = "x"; then
|
||||
PVP="0"
|
||||
fi
|
||||
@ -20840,7 +20840,7 @@ _ASBOX
|
||||
} >&5
|
||||
cat >&5 <<_CSEOF
|
||||
|
||||
This file was extended by libXfont $as_me 1.2.5, which was
|
||||
This file was extended by libXfont $as_me 1.2.6, which was
|
||||
generated by GNU Autoconf 2.59. Invocation command line was
|
||||
|
||||
CONFIG_FILES = $CONFIG_FILES
|
||||
@ -20903,7 +20903,7 @@ _ACEOF
|
||||
|
||||
cat >>$CONFIG_STATUS <<_ACEOF
|
||||
ac_cs_version="\\
|
||||
libXfont config.status 1.2.5
|
||||
libXfont config.status 1.2.6
|
||||
configured by $0, generated by GNU Autoconf 2.59,
|
||||
with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
|
||||
|
||||
|
||||
@ -1,58 +0,0 @@
|
||||
/* include/X11/fonts/fontconf.h. Generated from fontconf.h.in by configure. */
|
||||
/*
|
||||
* $Id: fontconf.h,v 1.1.1.2 2006/12/16 18:23:45 matthieu Exp $
|
||||
*
|
||||
* Copyright © 2005 Keith Packard
|
||||
*
|
||||
* Permission to use, copy, modify, distribute, and sell this software and its
|
||||
* documentation for any purpose is hereby granted without fee, provided that
|
||||
* the above copyright notice appear in all copies and that both that
|
||||
* copyright notice and this permission notice appear in supporting
|
||||
* documentation, and that the name of Keith Packard not be used in
|
||||
* advertising or publicity pertaining to distribution of the software without
|
||||
* specific, written prior permission. Keith Packard makes no
|
||||
* representations about the suitability of this software for any purpose. It
|
||||
* is provided "as is" without express or implied warranty.
|
||||
*
|
||||
* KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
|
||||
* INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
|
||||
* EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR
|
||||
* CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
|
||||
* DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
|
||||
* TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
|
||||
* PERFORMANCE OF THIS SOFTWARE.
|
||||
*/
|
||||
|
||||
/* Define as 1 if you have FreeType support in Xfont */
|
||||
#define XFONT_FREETYPE 1
|
||||
|
||||
/* Define as 1 if you have Type1 font support in Xfont */
|
||||
/* #undef XFONT_TYPE1 */
|
||||
|
||||
/* Define as 1 if you have Speedo support in Xfont */
|
||||
#define XFONT_SPEEDO 1
|
||||
|
||||
/* Define as 1 if you have builtin font support in Xfont */
|
||||
#define XFONT_BUILTINS 1
|
||||
|
||||
/* Define as 1 if you have pcf font support in Xfont */
|
||||
#define XFONT_PCFFORMAT 1
|
||||
|
||||
/* Define as 1 if you have bdf font support in Xfont */
|
||||
#define XFONT_BDFFORMAT 1
|
||||
|
||||
/* Define as 1 if you have snf font support in Xfont */
|
||||
#define XFONT_SNFFORMAT 1
|
||||
|
||||
/* Define as 1 if you have bitmap font support in Xfont */
|
||||
#define XFONT_BITMAP 1
|
||||
|
||||
/* Define as 1 if you have fontfile support in Xfont */
|
||||
#define XFONT_FONTFILE 1
|
||||
|
||||
/* Define as 1 if you have font cache support in Xfont */
|
||||
/* #undef XFONT_FONTCACHE */
|
||||
|
||||
/* Define as 1 if you have X Font Services Protocol support in Xfont */
|
||||
#define XFONT_FC 1
|
||||
|
||||
Loading…
Reference in New Issue
Block a user