Update to libXcomposite 0.4.3. No functional change.
This commit is contained in:
matthieu
parent
0160e37394
commit
0023d90dd4
@ -1,3 +1,77 @@
|
||||
commit 8898782b98457292057d249ab9e40cfc2fed7d8d
|
||||
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
|
||||
Date: Wed Oct 27 22:40:32 2010 -0700
|
||||
|
||||
libXcomposite 0.4.3
|
||||
|
||||
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
|
||||
|
||||
commit 206af895a90d5582a8078c86a33a0ba5888b7e27
|
||||
Author: Gaetan Nadon <memsize@videotron.ca>
|
||||
Date: Sun Aug 15 10:41:17 2010 -0400
|
||||
|
||||
man: list files to install only once
|
||||
|
||||
Newer versions of autoconf detect that error.
|
||||
|
||||
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
|
||||
|
||||
commit 542ff68e43a33a5c1849f9a88d2d5cc6d0827d04
|
||||
Author: Gaetan Nadon <memsize@videotron.ca>
|
||||
Date: Sat Aug 14 20:12:57 2010 -0400
|
||||
|
||||
man: store shadow man pages in git rather than generating them
|
||||
|
||||
Simplify the build process and the makefile.
|
||||
|
||||
Local fix in CVS for bug 5628 is not required
|
||||
as the problem has been fixed in
|
||||
util-macros d9062e4077ebfd0985baf8418f3d0f111b9ddbba
|
||||
|
||||
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
|
||||
|
||||
commit 976db8a67a3e0462d0a675e2bfb2fe715e715bae
|
||||
Author: Gaetan Nadon <memsize@videotron.ca>
|
||||
Date: Sat Aug 14 19:58:14 2010 -0400
|
||||
|
||||
config: upgrade to util-macros 1.8 for additional man page support
|
||||
|
||||
Use MAN_SUBST now supplied in XORG_MANPAGE_SECTIONS
|
||||
The value of MAN_SUBST is the same for all X.Org packages.
|
||||
|
||||
Use AC_PROG_SED now supplied by XORG_DEFAULT_OPTIONS
|
||||
|
||||
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
|
||||
|
||||
commit dc0afc177521014462baa966359b45d7a40a0c63
|
||||
Author: Fernando Carrijo <fcarrijo@yahoo.com.br>
|
||||
Date: Thu Jul 1 06:52:10 2010 -0300
|
||||
|
||||
Purge macros NEED_EVENTS and NEED_REPLIES
|
||||
|
||||
Signed-off-by: Fernando Carrijo <fcarrijo@yahoo.com.br>
|
||||
Acked-by: Tiago Vignatti <tiago.vignatti@nokia.com>
|
||||
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
|
||||
|
||||
commit 219e4de3666e3a7dda42c64ab1539a4cc5adbee4
|
||||
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
|
||||
Date: Wed Jun 30 22:49:26 2010 -0700
|
||||
|
||||
Remove unneeded dependencies from configure.ac & xcomposite.pc
|
||||
|
||||
We only need Xfixes headers for the XserverRegion definition, don't
|
||||
need to link against it directly or require clients link against it,
|
||||
so only use CFLAGS from it in the Makefile, and only list it in
|
||||
Requires.private in the .pc file.
|
||||
|
||||
Don't need libXext at all - no headers or functions from it are used.
|
||||
|
||||
Also clean up some extra appearances of *_CFLAGS & *_LIBS that aren't needed.
|
||||
|
||||
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
|
||||
Reviewed-by: Dan Nicholson <dbn.lists@gmail.com>
|
||||
Acked-by: Peter Hutterer <peter.hutterer@who-t.net>
|
||||
|
||||
commit 01c4691e18b536de6585a0e93e05e2831cf2be34
|
||||
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
|
||||
Date: Tue Jun 8 17:05:02 2010 -0700
|
||||
|
||||
@ -147,6 +147,8 @@ FILE_MAN_DIR = @FILE_MAN_DIR@
|
||||
FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
|
||||
GREP = @GREP@
|
||||
HAVE_XMLTO_FALSE = @HAVE_XMLTO_FALSE@
|
||||
HAVE_XMLTO_TEXT_FALSE = @HAVE_XMLTO_TEXT_FALSE@
|
||||
HAVE_XMLTO_TEXT_TRUE = @HAVE_XMLTO_TEXT_TRUE@
|
||||
HAVE_XMLTO_TRUE = @HAVE_XMLTO_TRUE@
|
||||
INSTALL_CMD = @INSTALL_CMD@
|
||||
INSTALL_DATA = @INSTALL_DATA@
|
||||
@ -188,6 +190,8 @@ STRIP = @STRIP@
|
||||
VERSION = @VERSION@
|
||||
XCOMPOSITE_CFLAGS = @XCOMPOSITE_CFLAGS@
|
||||
XCOMPOSITE_LIBS = @XCOMPOSITE_LIBS@
|
||||
XFIXES_CFLAGS = @XFIXES_CFLAGS@
|
||||
XFIXES_LIBS = @XFIXES_LIBS@
|
||||
XMLTO = @XMLTO@
|
||||
XORG_MAN_PAGE = @XORG_MAN_PAGE@
|
||||
ac_ct_CC = @ac_ct_CC@
|
||||
|
||||
154
lib/libXcomposite/aclocal.m4
vendored
154
lib/libXcomposite/aclocal.m4
vendored
@ -7633,7 +7633,7 @@ AC_SUBST([am__untar])
|
||||
|
||||
dnl xorg-macros.m4. Generated from xorg-macros.m4.in xorgversion.m4 by configure.
|
||||
dnl
|
||||
dnl Copyright 2005-2006 Sun Microsystems, Inc. All rights reserved.
|
||||
dnl Copyright (c) 2005, 2006, Oracle and/or its affiliates. All rights reserved.
|
||||
dnl
|
||||
dnl Permission is hereby granted, free of charge, to any person obtaining a
|
||||
dnl copy of this software and associated documentation files (the "Software"),
|
||||
@ -7670,7 +7670,7 @@ dnl DEALINGS IN THE SOFTWARE.
|
||||
# See the "minimum version" comment for each macro you use to see what
|
||||
# version you require.
|
||||
m4_defun([XORG_MACROS_VERSION],[
|
||||
m4_define([vers_have], [1.8.0])
|
||||
m4_define([vers_have], [1.11.0])
|
||||
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,,
|
||||
@ -7821,6 +7821,7 @@ MAN_SUBSTS="\
|
||||
-e 's|__xservername__|Xorg|g' \
|
||||
-e 's|__xconfigfile__|xorg.conf|g' \
|
||||
-e 's|__projectroot__|\$(prefix)|g' \
|
||||
-e 's|__apploaddir__|\$(appdefaultdir)|g' \
|
||||
-e 's|__appmansuffix__|\$(APP_MAN_SUFFIX)|g' \
|
||||
-e 's|__drivermansuffix__|\$(DRIVER_MAN_SUFFIX)|g' \
|
||||
-e 's|__adminmansuffix__|\$(ADMIN_MAN_SUFFIX)|g' \
|
||||
@ -7849,13 +7850,20 @@ PKG_CHECK_EXISTS([xorg-sgml-doctools m4_ifval([$1],[>= $1])],
|
||||
fi])
|
||||
])
|
||||
|
||||
# Define variables STYLESHEET_SRCDIR and XSL_STYLESHEET containing
|
||||
# the path and the name of the doc stylesheet
|
||||
if test "x$XORG_SGML_PATH" != "x" ; then
|
||||
AC_MSG_RESULT([$XORG_SGML_PATH])
|
||||
STYLESHEET_SRCDIR=$XORG_SGML_PATH/X11
|
||||
XSL_STYLESHEET=$STYLESHEET_SRCDIR/xorg.xsl
|
||||
else
|
||||
AC_MSG_RESULT([no])
|
||||
fi
|
||||
|
||||
AC_SUBST(XORG_SGML_PATH)
|
||||
AC_SUBST(STYLESHEET_SRCDIR)
|
||||
AC_SUBST(XSL_STYLESHEET)
|
||||
AM_CONDITIONAL([HAVE_STYLESHEETS], [test "x$XSL_STYLESHEET" != "x"])
|
||||
]) # XORG_CHECK_SGML_DOCTOOLS
|
||||
|
||||
# XORG_CHECK_LINUXDOC
|
||||
@ -7971,15 +7979,17 @@ AC_SUBST(MAKE_PDF)
|
||||
AC_SUBST(MAKE_HTML)
|
||||
]) # XORG_CHECK_DOCBOOK
|
||||
|
||||
# XORG_WITH_XMLTO([MIN-VERSION])
|
||||
# XORG_WITH_XMLTO([MIN-VERSION], [DEFAULT])
|
||||
# ----------------
|
||||
# Minimum version: 1.5.0
|
||||
# Minimum version for optional DEFAULT argument: 1.11.0
|
||||
#
|
||||
# Documentation tools are not always available on all platforms and sometimes
|
||||
# not at the appropriate level. This macro enables a module to test for the
|
||||
# presence of the tool and obtain it's path in separate variables. Coupled with
|
||||
# the --with-xmlto option, it allows maximum flexibilty in making decisions
|
||||
# as whether or not to use the xmlto package.
|
||||
# as whether or not to use the xmlto package. When DEFAULT is not specified,
|
||||
# --with-xmlto assumes 'auto'.
|
||||
#
|
||||
# Interface to module:
|
||||
# HAVE_XMLTO: used in makefiles to conditionally generate documentation
|
||||
@ -7988,14 +7998,20 @@ AC_SUBST(MAKE_HTML)
|
||||
# --with-xmlto: 'yes' user instructs the module to use xmlto
|
||||
# 'no' user instructs the module not to use xmlto
|
||||
#
|
||||
# Added in version 1.10.0
|
||||
# HAVE_XMLTO_TEXT: used in makefiles to conditionally generate text documentation
|
||||
# xmlto for text output requires either lynx, links, or w3m browsers
|
||||
#
|
||||
# If the user sets the value of XMLTO, AC_PATH_PROG skips testing the path.
|
||||
#
|
||||
AC_DEFUN([XORG_WITH_XMLTO],[
|
||||
AC_ARG_VAR([XMLTO], [Path to xmlto command])
|
||||
m4_define([_defopt], m4_default([$2], [auto]))
|
||||
AC_ARG_WITH(xmlto,
|
||||
AS_HELP_STRING([--with-xmlto],
|
||||
[Use xmlto to regenerate documentation (default: yes, if installed)]),
|
||||
[use_xmlto=$withval], [use_xmlto=auto])
|
||||
[Use xmlto to regenerate documentation (default: ]_defopt[)]),
|
||||
[use_xmlto=$withval], [use_xmlto=]_defopt)
|
||||
m4_undefine([_defopt])
|
||||
|
||||
if test "x$use_xmlto" = x"auto"; then
|
||||
AC_PATH_PROG([XMLTO], [xmlto])
|
||||
@ -8019,6 +8035,8 @@ elif test "x$use_xmlto" = x"no" ; then
|
||||
else
|
||||
AC_MSG_ERROR([--with-xmlto expects 'yes' or 'no'])
|
||||
fi
|
||||
|
||||
# Test for a minimum version of xmlto, if provided.
|
||||
m4_ifval([$1],
|
||||
[if test "$have_xmlto" = yes; then
|
||||
# scrape the xmlto version
|
||||
@ -8033,18 +8051,31 @@ m4_ifval([$1],
|
||||
AC_MSG_ERROR([xmlto version $xmlto_version found, but $1 needed])
|
||||
fi])
|
||||
fi])
|
||||
|
||||
# Test for the ability of xmlto to generate a text target
|
||||
have_xmlto_text=no
|
||||
cat > conftest.xml << "EOF"
|
||||
EOF
|
||||
AS_IF([test "$have_xmlto" = yes],
|
||||
[AS_IF([$XMLTO --skip-validation txt conftest.xml >/dev/null 2>&1],
|
||||
[have_xmlto_text=yes],
|
||||
[AC_MSG_WARN([xmlto cannot generate text format, this format skipped])])])
|
||||
rm -f conftest.xml
|
||||
AM_CONDITIONAL([HAVE_XMLTO_TEXT], [test $have_xmlto_text = yes])
|
||||
AM_CONDITIONAL([HAVE_XMLTO], [test "$have_xmlto" = yes])
|
||||
]) # XORG_WITH_XMLTO
|
||||
|
||||
# XORG_WITH_ASCIIDOC([MIN-VERSION])
|
||||
# XORG_WITH_ASCIIDOC([MIN-VERSION], [DEFAULT])
|
||||
# ----------------
|
||||
# Minimum version: 1.5.0
|
||||
# Minimum version for optional DEFAULT argument: 1.11.0
|
||||
#
|
||||
# Documentation tools are not always available on all platforms and sometimes
|
||||
# not at the appropriate level. This macro enables a module to test for the
|
||||
# presence of the tool and obtain it's path in separate variables. Coupled with
|
||||
# the --with-asciidoc option, it allows maximum flexibilty in making decisions
|
||||
# as whether or not to use the asciidoc package.
|
||||
# as whether or not to use the asciidoc package. When DEFAULT is not specified,
|
||||
# --with-asciidoc assumes 'auto'.
|
||||
#
|
||||
# Interface to module:
|
||||
# HAVE_ASCIIDOC: used in makefiles to conditionally generate documentation
|
||||
@ -8057,10 +8088,12 @@ AM_CONDITIONAL([HAVE_XMLTO], [test "$have_xmlto" = yes])
|
||||
#
|
||||
AC_DEFUN([XORG_WITH_ASCIIDOC],[
|
||||
AC_ARG_VAR([ASCIIDOC], [Path to asciidoc command])
|
||||
m4_define([_defopt], m4_default([$2], [auto]))
|
||||
AC_ARG_WITH(asciidoc,
|
||||
AS_HELP_STRING([--with-asciidoc],
|
||||
[Use asciidoc to regenerate documentation (default: yes, if installed)]),
|
||||
[use_asciidoc=$withval], [use_asciidoc=auto])
|
||||
[Use asciidoc to regenerate documentation (default: ]_defopt[)]),
|
||||
[use_asciidoc=$withval], [use_asciidoc=]_defopt)
|
||||
m4_undefine([_defopt])
|
||||
|
||||
if test "x$use_asciidoc" = x"auto"; then
|
||||
AC_PATH_PROG([ASCIIDOC], [asciidoc])
|
||||
@ -8101,15 +8134,17 @@ fi])
|
||||
AM_CONDITIONAL([HAVE_ASCIIDOC], [test "$have_asciidoc" = yes])
|
||||
]) # XORG_WITH_ASCIIDOC
|
||||
|
||||
# XORG_WITH_DOXYGEN([MIN-VERSION])
|
||||
# XORG_WITH_DOXYGEN([MIN-VERSION], [DEFAULT])
|
||||
# --------------------------------
|
||||
# Minimum version: 1.5.0
|
||||
# Minimum version for optional DEFAULT argument: 1.11.0
|
||||
#
|
||||
# Documentation tools are not always available on all platforms and sometimes
|
||||
# not at the appropriate level. This macro enables a module to test for the
|
||||
# presence of the tool and obtain it's path in separate variables. Coupled with
|
||||
# the --with-doxygen option, it allows maximum flexibilty in making decisions
|
||||
# as whether or not to use the doxygen package.
|
||||
# as whether or not to use the doxygen package. When DEFAULT is not specified,
|
||||
# --with-doxygen assumes 'auto'.
|
||||
#
|
||||
# Interface to module:
|
||||
# HAVE_DOXYGEN: used in makefiles to conditionally generate documentation
|
||||
@ -8122,10 +8157,12 @@ AM_CONDITIONAL([HAVE_ASCIIDOC], [test "$have_asciidoc" = yes])
|
||||
#
|
||||
AC_DEFUN([XORG_WITH_DOXYGEN],[
|
||||
AC_ARG_VAR([DOXYGEN], [Path to doxygen command])
|
||||
m4_define([_defopt], m4_default([$2], [auto]))
|
||||
AC_ARG_WITH(doxygen,
|
||||
AS_HELP_STRING([--with-doxygen],
|
||||
[Use doxygen to regenerate documentation (default: yes, if installed)]),
|
||||
[use_doxygen=$withval], [use_doxygen=auto])
|
||||
[Use doxygen to regenerate documentation (default: ]_defopt[)]),
|
||||
[use_doxygen=$withval], [use_doxygen=]_defopt)
|
||||
m4_undefine([_defopt])
|
||||
|
||||
if test "x$use_doxygen" = x"auto"; then
|
||||
AC_PATH_PROG([DOXYGEN], [doxygen])
|
||||
@ -8166,15 +8203,17 @@ fi])
|
||||
AM_CONDITIONAL([HAVE_DOXYGEN], [test "$have_doxygen" = yes])
|
||||
]) # XORG_WITH_DOXYGEN
|
||||
|
||||
# XORG_WITH_GROFF
|
||||
# XORG_WITH_GROFF([DEFAULT])
|
||||
# ----------------
|
||||
# Minimum version: 1.6.0
|
||||
# Minimum version for optional DEFAULT argument: 1.11.0
|
||||
#
|
||||
# Documentation tools are not always available on all platforms and sometimes
|
||||
# not at the appropriate level. This macro enables a module to test for the
|
||||
# presence of the tool and obtain it's path in separate variables. Coupled with
|
||||
# the --with-groff option, it allows maximum flexibilty in making decisions
|
||||
# as whether or not to use the groff package.
|
||||
# as whether or not to use the groff package. When DEFAULT is not specified,
|
||||
# --with-groff assumes 'auto'.
|
||||
#
|
||||
# Interface to module:
|
||||
# HAVE_GROFF: used in makefiles to conditionally generate documentation
|
||||
@ -8185,6 +8224,12 @@ AM_CONDITIONAL([HAVE_DOXYGEN], [test "$have_doxygen" = yes])
|
||||
# --with-groff: 'yes' user instructs the module to use groff
|
||||
# 'no' user instructs the module not to use groff
|
||||
#
|
||||
# Added in version 1.9.0:
|
||||
# HAVE_GROFF_HTML: groff has dependencies to output HTML format:
|
||||
# pnmcut pnmcrop pnmtopng pnmtops from the netpbm package.
|
||||
# psselect from the psutils package.
|
||||
# the ghostcript package. Refer to the grohtml man pages
|
||||
#
|
||||
# If the user sets the value of GROFF, AC_PATH_PROG skips testing the path.
|
||||
#
|
||||
# OS and distros often splits groff in a basic and full package, the former
|
||||
@ -8197,10 +8242,12 @@ AM_CONDITIONAL([HAVE_DOXYGEN], [test "$have_doxygen" = yes])
|
||||
#
|
||||
AC_DEFUN([XORG_WITH_GROFF],[
|
||||
AC_ARG_VAR([GROFF], [Path to groff command])
|
||||
m4_define([_defopt], m4_default([$1], [auto]))
|
||||
AC_ARG_WITH(groff,
|
||||
AS_HELP_STRING([--with-groff],
|
||||
[Use groff to regenerate documentation (default: yes, if installed)]),
|
||||
[use_groff=$withval], [use_groff=auto])
|
||||
[Use groff to regenerate documentation (default: ]_defopt[)]),
|
||||
[use_groff=$withval], [use_groff=]_defopt)
|
||||
m4_undefine([_defopt])
|
||||
|
||||
if test "x$use_groff" = x"auto"; then
|
||||
AC_PATH_PROG([GROFF], [groff])
|
||||
@ -8224,6 +8271,7 @@ elif test "x$use_groff" = x"no" ; then
|
||||
else
|
||||
AC_MSG_ERROR([--with-groff expects 'yes' or 'no'])
|
||||
fi
|
||||
|
||||
# We have groff, test for the presence of the macro packages
|
||||
if test "x$have_groff" = x"yes"; then
|
||||
AC_MSG_CHECKING([for ${GROFF} -ms macros])
|
||||
@ -8241,20 +8289,38 @@ if test "x$have_groff" = x"yes"; then
|
||||
fi
|
||||
AC_MSG_RESULT([$groff_mm_works])
|
||||
fi
|
||||
|
||||
# We have groff, test for HTML dependencies, one command per package
|
||||
if test "x$have_groff" = x"yes"; then
|
||||
AC_PATH_PROGS(GS_PATH, [gs gswin32c])
|
||||
AC_PATH_PROG(PNMTOPNG_PATH, [pnmtopng])
|
||||
AC_PATH_PROG(PSSELECT_PATH, [psselect])
|
||||
if test "x$GS_PATH" != "x" -a "x$PNMTOPNG_PATH" != "x" -a "x$PSSELECT_PATH" != "x"; then
|
||||
have_groff_html=yes
|
||||
else
|
||||
have_groff_html=no
|
||||
AC_MSG_WARN([grohtml dependencies not found - HTML Documentation skipped. Refer to grohtml man pages])
|
||||
fi
|
||||
fi
|
||||
|
||||
# Set Automake conditionals for Makefiles
|
||||
AM_CONDITIONAL([HAVE_GROFF], [test "$have_groff" = yes])
|
||||
AM_CONDITIONAL([HAVE_GROFF_MS], [test "$groff_ms_works" = yes])
|
||||
AM_CONDITIONAL([HAVE_GROFF_MM], [test "$groff_mm_works" = yes])
|
||||
AM_CONDITIONAL([HAVE_GROFF_HTML], [test "$have_groff_html" = yes])
|
||||
]) # XORG_WITH_GROFF
|
||||
|
||||
# XORG_WITH_FOP
|
||||
# XORG_WITH_FOP([DEFAULT])
|
||||
# ----------------
|
||||
# Minimum version: 1.6.0
|
||||
# Minimum version for optional DEFAULT argument: 1.11.0
|
||||
#
|
||||
# Documentation tools are not always available on all platforms and sometimes
|
||||
# not at the appropriate level. This macro enables a module to test for the
|
||||
# presence of the tool and obtain it's path in separate variables. Coupled with
|
||||
# the --with-fop option, it allows maximum flexibilty in making decisions
|
||||
# as whether or not to use the fop package.
|
||||
# as whether or not to use the fop package. When DEFAULT is not specified,
|
||||
# --with-fop assumes 'auto'.
|
||||
#
|
||||
# Interface to module:
|
||||
# HAVE_FOP: used in makefiles to conditionally generate documentation
|
||||
@ -8267,10 +8333,12 @@ AM_CONDITIONAL([HAVE_GROFF_MM], [test "$groff_mm_works" = yes])
|
||||
#
|
||||
AC_DEFUN([XORG_WITH_FOP],[
|
||||
AC_ARG_VAR([FOP], [Path to fop command])
|
||||
m4_define([_defopt], m4_default([$1], [auto]))
|
||||
AC_ARG_WITH(fop,
|
||||
AS_HELP_STRING([--with-fop],
|
||||
[Use fop to regenerate documentation (default: yes, if installed)]),
|
||||
[use_fop=$withval], [use_fop=auto])
|
||||
[Use fop to regenerate documentation (default: ]_defopt[)]),
|
||||
[use_fop=$withval], [use_fop=]_defopt)
|
||||
m4_undefine([_defopt])
|
||||
|
||||
if test "x$use_fop" = x"auto"; then
|
||||
AC_PATH_PROG([FOP], [fop])
|
||||
@ -8297,15 +8365,17 @@ fi
|
||||
AM_CONDITIONAL([HAVE_FOP], [test "$have_fop" = yes])
|
||||
]) # XORG_WITH_FOP
|
||||
|
||||
# XORG_WITH_PS2PDF
|
||||
# XORG_WITH_PS2PDF([DEFAULT])
|
||||
# ----------------
|
||||
# Minimum version: 1.6.0
|
||||
# Minimum version for optional DEFAULT argument: 1.11.0
|
||||
#
|
||||
# Documentation tools are not always available on all platforms and sometimes
|
||||
# not at the appropriate level. This macro enables a module to test for the
|
||||
# presence of the tool and obtain it's path in separate variables. Coupled with
|
||||
# the --with-ps2pdf option, it allows maximum flexibilty in making decisions
|
||||
# as whether or not to use the ps2pdf package.
|
||||
# as whether or not to use the ps2pdf package. When DEFAULT is not specified,
|
||||
# --with-ps2pdf assumes 'auto'.
|
||||
#
|
||||
# Interface to module:
|
||||
# HAVE_PS2PDF: used in makefiles to conditionally generate documentation
|
||||
@ -8318,10 +8388,12 @@ AM_CONDITIONAL([HAVE_FOP], [test "$have_fop" = yes])
|
||||
#
|
||||
AC_DEFUN([XORG_WITH_PS2PDF],[
|
||||
AC_ARG_VAR([PS2PDF], [Path to ps2pdf command])
|
||||
m4_define([_defopt], m4_default([$1], [auto]))
|
||||
AC_ARG_WITH(ps2pdf,
|
||||
AS_HELP_STRING([--with-ps2pdf],
|
||||
[Use ps2pdf to regenerate documentation (default: yes, if installed)]),
|
||||
[use_ps2pdf=$withval], [use_ps2pdf=auto])
|
||||
[Use ps2pdf to regenerate documentation (default: ]_defopt[)]),
|
||||
[use_ps2pdf=$withval], [use_ps2pdf=]_defopt)
|
||||
m4_undefine([_defopt])
|
||||
|
||||
if test "x$use_ps2pdf" = x"auto"; then
|
||||
AC_PATH_PROG([PS2PDF], [ps2pdf])
|
||||
@ -8372,14 +8444,12 @@ AM_CONDITIONAL([HAVE_PS2PDF], [test "$have_ps2pdf" = yes])
|
||||
# parm1: specify the default value, yes or no.
|
||||
#
|
||||
AC_DEFUN([XORG_ENABLE_DOCS],[
|
||||
default=$1
|
||||
if test "x$default" = x ; then
|
||||
default="yes"
|
||||
fi
|
||||
m4_define([default], m4_default([$1], [yes]))
|
||||
AC_ARG_ENABLE(docs,
|
||||
AS_HELP_STRING([--enable-docs],
|
||||
[Enable building the documentation (default: yes)]),
|
||||
[build_docs=$enableval], [build_docs=$default])
|
||||
[Enable building the documentation (default: ]default[)]),
|
||||
[build_docs=$enableval], [build_docs=]default)
|
||||
m4_undefine([default])
|
||||
AM_CONDITIONAL(ENABLE_DOCS, [test x$build_docs = xyes])
|
||||
AC_MSG_CHECKING([whether to build documentation])
|
||||
AC_MSG_RESULT([$build_docs])
|
||||
@ -8407,14 +8477,12 @@ AC_MSG_RESULT([$build_docs])
|
||||
# parm1: specify the default value, yes or no.
|
||||
#
|
||||
AC_DEFUN([XORG_ENABLE_DEVEL_DOCS],[
|
||||
devel_default=$1
|
||||
if test "x$devel_default" = x ; then
|
||||
devel_default="yes"
|
||||
fi
|
||||
m4_define([devel_default], m4_default([$1], [yes]))
|
||||
AC_ARG_ENABLE(devel-docs,
|
||||
AS_HELP_STRING([--enable-devel-docs],
|
||||
[Enable building the developer documentation (default: yes)]),
|
||||
[build_devel_docs=$enableval], [build_devel_docs=$devel_default])
|
||||
[Enable building the developer documentation (default: ]devel_default[)]),
|
||||
[build_devel_docs=$enableval], [build_devel_docs=]devel_default)
|
||||
m4_undefine([devel_default])
|
||||
AM_CONDITIONAL(ENABLE_DEVEL_DOCS, [test x$build_devel_docs = xyes])
|
||||
AC_MSG_CHECKING([whether to build developer documentation])
|
||||
AC_MSG_RESULT([$build_devel_docs])
|
||||
@ -8442,14 +8510,12 @@ AC_MSG_RESULT([$build_devel_docs])
|
||||
# parm1: specify the default value, yes or no.
|
||||
#
|
||||
AC_DEFUN([XORG_ENABLE_SPECS],[
|
||||
spec_default=$1
|
||||
if test "x$spec_default" = x ; then
|
||||
spec_default="yes"
|
||||
fi
|
||||
m4_define([spec_default], m4_default([$1], [yes]))
|
||||
AC_ARG_ENABLE(specs,
|
||||
AS_HELP_STRING([--enable-specs],
|
||||
[Enable building the specs (default: yes)]),
|
||||
[build_specs=$enableval], [build_specs=$spec_default])
|
||||
[Enable building the specs (default: ]spec_default[)]),
|
||||
[build_specs=$enableval], [build_specs=]spec_default)
|
||||
m4_undefine([spec_default])
|
||||
AM_CONDITIONAL(ENABLE_SPECS, [test x$build_specs = xyes])
|
||||
AC_MSG_CHECKING([whether to build functional specifications])
|
||||
AC_MSG_RESULT([$build_specs])
|
||||
|
||||
250
lib/libXcomposite/configure
vendored
250
lib/libXcomposite/configure
vendored
@ -1,6 +1,6 @@
|
||||
#! /bin/sh
|
||||
# Guess values for system-dependent variables and create Makefiles.
|
||||
# Generated by GNU Autoconf 2.62 for libXcomposite 0.4.2.
|
||||
# Generated by GNU Autoconf 2.62 for libXcomposite 0.4.3.
|
||||
#
|
||||
# Report bugs to <https://bugs.freedesktop.org/enter_bug.cgi?product=xorg>.
|
||||
#
|
||||
@ -810,8 +810,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
|
||||
# Identity of this package.
|
||||
PACKAGE_NAME='libXcomposite'
|
||||
PACKAGE_TARNAME='libXcomposite'
|
||||
PACKAGE_VERSION='0.4.2'
|
||||
PACKAGE_STRING='libXcomposite 0.4.2'
|
||||
PACKAGE_VERSION='0.4.3'
|
||||
PACKAGE_STRING='libXcomposite 0.4.3'
|
||||
PACKAGE_BUGREPORT='https://bugs.freedesktop.org/enter_bug.cgi?product=xorg'
|
||||
|
||||
# Factoring default headers for most tests.
|
||||
@ -976,6 +976,8 @@ XORG_MAN_PAGE
|
||||
MAN_SUBSTS
|
||||
AM_DEFAULT_VERBOSITY
|
||||
XMLTO
|
||||
HAVE_XMLTO_TEXT_TRUE
|
||||
HAVE_XMLTO_TEXT_FALSE
|
||||
HAVE_XMLTO_TRUE
|
||||
HAVE_XMLTO_FALSE
|
||||
INSTALL_MANPAGES_TRUE
|
||||
@ -983,6 +985,8 @@ INSTALL_MANPAGES_FALSE
|
||||
COMPOSITEEXT_VERSION
|
||||
XCOMPOSITE_CFLAGS
|
||||
XCOMPOSITE_LIBS
|
||||
XFIXES_CFLAGS
|
||||
XFIXES_LIBS
|
||||
LIBOBJS
|
||||
LTLIBOBJS'
|
||||
ac_subst_files=''
|
||||
@ -1018,7 +1022,9 @@ FFLAGS
|
||||
PKG_CONFIG
|
||||
XMLTO
|
||||
XCOMPOSITE_CFLAGS
|
||||
XCOMPOSITE_LIBS'
|
||||
XCOMPOSITE_LIBS
|
||||
XFIXES_CFLAGS
|
||||
XFIXES_LIBS'
|
||||
|
||||
|
||||
# Initialize some variables set by options.
|
||||
@ -1571,7 +1577,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 libXcomposite 0.4.2 to adapt to many kinds of systems.
|
||||
\`configure' configures libXcomposite 0.4.3 to adapt to many kinds of systems.
|
||||
|
||||
Usage: $0 [OPTION]... [VAR=VALUE]...
|
||||
|
||||
@ -1641,7 +1647,7 @@ fi
|
||||
|
||||
if test -n "$ac_init_help"; then
|
||||
case $ac_init_help in
|
||||
short | recursive ) echo "Configuration of libXcomposite 0.4.2:";;
|
||||
short | recursive ) echo "Configuration of libXcomposite 0.4.3:";;
|
||||
esac
|
||||
cat <<\_ACEOF
|
||||
|
||||
@ -1669,8 +1675,8 @@ Optional Packages:
|
||||
--with-pic try to use only PIC/non-PIC objects [default=use
|
||||
both]
|
||||
--with-tags[=TAGS] include additional configurations [automatic]
|
||||
--with-xmlto Use xmlto to regenerate documentation (default: yes,
|
||||
if installed)
|
||||
--with-xmlto Use xmlto to regenerate documentation (default:
|
||||
auto)
|
||||
|
||||
Some influential environment variables:
|
||||
CC C compiler command
|
||||
@ -1692,6 +1698,9 @@ Some influential environment variables:
|
||||
C compiler flags for XCOMPOSITE, overriding pkg-config
|
||||
XCOMPOSITE_LIBS
|
||||
linker flags for XCOMPOSITE, overriding pkg-config
|
||||
XFIXES_CFLAGS
|
||||
C compiler flags for XFIXES, overriding pkg-config
|
||||
XFIXES_LIBS linker flags for XFIXES, overriding pkg-config
|
||||
|
||||
Use these variables to override the choices made by `configure' or to help
|
||||
it to find libraries and programs with nonstandard names/locations.
|
||||
@ -1759,7 +1768,7 @@ fi
|
||||
test -n "$ac_init_help" && exit $ac_status
|
||||
if $ac_init_version; then
|
||||
cat <<\_ACEOF
|
||||
libXcomposite configure 0.4.2
|
||||
libXcomposite configure 0.4.3
|
||||
generated by GNU Autoconf 2.62
|
||||
|
||||
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
|
||||
@ -1773,7 +1782,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 libXcomposite $as_me 0.4.2, which was
|
||||
It was created by libXcomposite $as_me 0.4.3, which was
|
||||
generated by GNU Autoconf 2.62. Invocation command line was
|
||||
|
||||
$ $0 $@
|
||||
@ -2422,7 +2431,7 @@ fi
|
||||
|
||||
# Define the identity of the package.
|
||||
PACKAGE='libXcomposite'
|
||||
VERSION='0.4.2'
|
||||
VERSION='0.4.3'
|
||||
|
||||
|
||||
cat >>confdefs.h <<_ACEOF
|
||||
@ -2593,7 +2602,7 @@ fi
|
||||
|
||||
|
||||
|
||||
# Require xorg-macros: XORG_DEFAULT_OPTIONS
|
||||
# Require X.Org macros 1.8 or later for MAN_SUBSTS set by XORG_MANPAGE_SECTIONS
|
||||
|
||||
|
||||
|
||||
@ -4494,7 +4503,7 @@ ia64-*-hpux*)
|
||||
;;
|
||||
*-*-irix6*)
|
||||
# Find out which ABI we are using.
|
||||
echo '#line 4497 "configure"' > conftest.$ac_ext
|
||||
echo '#line 4506 "configure"' > conftest.$ac_ext
|
||||
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
|
||||
(eval $ac_compile) 2>&5
|
||||
ac_status=$?
|
||||
@ -7602,11 +7611,11 @@ else
|
||||
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
|
||||
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
|
||||
-e 's:$: $lt_compiler_flag:'`
|
||||
(eval echo "\"\$as_me:7605: $lt_compile\"" >&5)
|
||||
(eval echo "\"\$as_me:7614: $lt_compile\"" >&5)
|
||||
(eval "$lt_compile" 2>conftest.err)
|
||||
ac_status=$?
|
||||
cat conftest.err >&5
|
||||
echo "$as_me:7609: \$? = $ac_status" >&5
|
||||
echo "$as_me:7618: \$? = $ac_status" >&5
|
||||
if (exit $ac_status) && test -s "$ac_outfile"; then
|
||||
# The compiler can only warn and ignore the option if not recognized
|
||||
# So say no if there are warnings other than the usual output.
|
||||
@ -7892,11 +7901,11 @@ else
|
||||
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
|
||||
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
|
||||
-e 's:$: $lt_compiler_flag:'`
|
||||
(eval echo "\"\$as_me:7895: $lt_compile\"" >&5)
|
||||
(eval echo "\"\$as_me:7904: $lt_compile\"" >&5)
|
||||
(eval "$lt_compile" 2>conftest.err)
|
||||
ac_status=$?
|
||||
cat conftest.err >&5
|
||||
echo "$as_me:7899: \$? = $ac_status" >&5
|
||||
echo "$as_me:7908: \$? = $ac_status" >&5
|
||||
if (exit $ac_status) && test -s "$ac_outfile"; then
|
||||
# The compiler can only warn and ignore the option if not recognized
|
||||
# So say no if there are warnings other than the usual output.
|
||||
@ -7996,11 +8005,11 @@ else
|
||||
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
|
||||
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
|
||||
-e 's:$: $lt_compiler_flag:'`
|
||||
(eval echo "\"\$as_me:7999: $lt_compile\"" >&5)
|
||||
(eval echo "\"\$as_me:8008: $lt_compile\"" >&5)
|
||||
(eval "$lt_compile" 2>out/conftest.err)
|
||||
ac_status=$?
|
||||
cat out/conftest.err >&5
|
||||
echo "$as_me:8003: \$? = $ac_status" >&5
|
||||
echo "$as_me:8012: \$? = $ac_status" >&5
|
||||
if (exit $ac_status) && test -s out/conftest2.$ac_objext
|
||||
then
|
||||
# The compiler can only warn and ignore the option if not recognized
|
||||
@ -10396,7 +10405,7 @@ else
|
||||
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
|
||||
lt_status=$lt_dlunknown
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 10399 "configure"
|
||||
#line 10408 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
#if HAVE_DLFCN_H
|
||||
@ -10496,7 +10505,7 @@ else
|
||||
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
|
||||
lt_status=$lt_dlunknown
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 10499 "configure"
|
||||
#line 10508 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
#if HAVE_DLFCN_H
|
||||
@ -12905,11 +12914,11 @@ else
|
||||
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
|
||||
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
|
||||
-e 's:$: $lt_compiler_flag:'`
|
||||
(eval echo "\"\$as_me:12908: $lt_compile\"" >&5)
|
||||
(eval echo "\"\$as_me:12917: $lt_compile\"" >&5)
|
||||
(eval "$lt_compile" 2>conftest.err)
|
||||
ac_status=$?
|
||||
cat conftest.err >&5
|
||||
echo "$as_me:12912: \$? = $ac_status" >&5
|
||||
echo "$as_me:12921: \$? = $ac_status" >&5
|
||||
if (exit $ac_status) && test -s "$ac_outfile"; then
|
||||
# The compiler can only warn and ignore the option if not recognized
|
||||
# So say no if there are warnings other than the usual output.
|
||||
@ -13009,11 +13018,11 @@ else
|
||||
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
|
||||
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
|
||||
-e 's:$: $lt_compiler_flag:'`
|
||||
(eval echo "\"\$as_me:13012: $lt_compile\"" >&5)
|
||||
(eval echo "\"\$as_me:13021: $lt_compile\"" >&5)
|
||||
(eval "$lt_compile" 2>out/conftest.err)
|
||||
ac_status=$?
|
||||
cat out/conftest.err >&5
|
||||
echo "$as_me:13016: \$? = $ac_status" >&5
|
||||
echo "$as_me:13025: \$? = $ac_status" >&5
|
||||
if (exit $ac_status) && test -s out/conftest2.$ac_objext
|
||||
then
|
||||
# The compiler can only warn and ignore the option if not recognized
|
||||
@ -14592,11 +14601,11 @@ else
|
||||
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
|
||||
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
|
||||
-e 's:$: $lt_compiler_flag:'`
|
||||
(eval echo "\"\$as_me:14595: $lt_compile\"" >&5)
|
||||
(eval echo "\"\$as_me:14604: $lt_compile\"" >&5)
|
||||
(eval "$lt_compile" 2>conftest.err)
|
||||
ac_status=$?
|
||||
cat conftest.err >&5
|
||||
echo "$as_me:14599: \$? = $ac_status" >&5
|
||||
echo "$as_me:14608: \$? = $ac_status" >&5
|
||||
if (exit $ac_status) && test -s "$ac_outfile"; then
|
||||
# The compiler can only warn and ignore the option if not recognized
|
||||
# So say no if there are warnings other than the usual output.
|
||||
@ -14696,11 +14705,11 @@ else
|
||||
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
|
||||
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
|
||||
-e 's:$: $lt_compiler_flag:'`
|
||||
(eval echo "\"\$as_me:14699: $lt_compile\"" >&5)
|
||||
(eval echo "\"\$as_me:14708: $lt_compile\"" >&5)
|
||||
(eval "$lt_compile" 2>out/conftest.err)
|
||||
ac_status=$?
|
||||
cat out/conftest.err >&5
|
||||
echo "$as_me:14703: \$? = $ac_status" >&5
|
||||
echo "$as_me:14712: \$? = $ac_status" >&5
|
||||
if (exit $ac_status) && test -s out/conftest2.$ac_objext
|
||||
then
|
||||
# The compiler can only warn and ignore the option if not recognized
|
||||
@ -16911,11 +16920,11 @@ else
|
||||
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
|
||||
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
|
||||
-e 's:$: $lt_compiler_flag:'`
|
||||
(eval echo "\"\$as_me:16914: $lt_compile\"" >&5)
|
||||
(eval echo "\"\$as_me:16923: $lt_compile\"" >&5)
|
||||
(eval "$lt_compile" 2>conftest.err)
|
||||
ac_status=$?
|
||||
cat conftest.err >&5
|
||||
echo "$as_me:16918: \$? = $ac_status" >&5
|
||||
echo "$as_me:16927: \$? = $ac_status" >&5
|
||||
if (exit $ac_status) && test -s "$ac_outfile"; then
|
||||
# The compiler can only warn and ignore the option if not recognized
|
||||
# So say no if there are warnings other than the usual output.
|
||||
@ -17201,11 +17210,11 @@ else
|
||||
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
|
||||
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
|
||||
-e 's:$: $lt_compiler_flag:'`
|
||||
(eval echo "\"\$as_me:17204: $lt_compile\"" >&5)
|
||||
(eval echo "\"\$as_me:17213: $lt_compile\"" >&5)
|
||||
(eval "$lt_compile" 2>conftest.err)
|
||||
ac_status=$?
|
||||
cat conftest.err >&5
|
||||
echo "$as_me:17208: \$? = $ac_status" >&5
|
||||
echo "$as_me:17217: \$? = $ac_status" >&5
|
||||
if (exit $ac_status) && test -s "$ac_outfile"; then
|
||||
# The compiler can only warn and ignore the option if not recognized
|
||||
# So say no if there are warnings other than the usual output.
|
||||
@ -17305,11 +17314,11 @@ else
|
||||
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
|
||||
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
|
||||
-e 's:$: $lt_compiler_flag:'`
|
||||
(eval echo "\"\$as_me:17308: $lt_compile\"" >&5)
|
||||
(eval echo "\"\$as_me:17317: $lt_compile\"" >&5)
|
||||
(eval "$lt_compile" 2>out/conftest.err)
|
||||
ac_status=$?
|
||||
cat out/conftest.err >&5
|
||||
echo "$as_me:17312: \$? = $ac_status" >&5
|
||||
echo "$as_me:17321: \$? = $ac_status" >&5
|
||||
if (exit $ac_status) && test -s out/conftest2.$ac_objext
|
||||
then
|
||||
# The compiler can only warn and ignore the option if not recognized
|
||||
@ -20726,6 +20735,7 @@ MAN_SUBSTS="\
|
||||
-e 's|__xservername__|Xorg|g' \
|
||||
-e 's|__xconfigfile__|xorg.conf|g' \
|
||||
-e 's|__projectroot__|\$(prefix)|g' \
|
||||
-e 's|__apploaddir__|\$(appdefaultdir)|g' \
|
||||
-e 's|__appmansuffix__|\$(APP_MAN_SUFFIX)|g' \
|
||||
-e 's|__drivermansuffix__|\$(DRIVER_MAN_SUFFIX)|g' \
|
||||
-e 's|__adminmansuffix__|\$(ADMIN_MAN_SUFFIX)|g' \
|
||||
@ -20741,6 +20751,7 @@ AM_DEFAULT_VERBOSITY=1
|
||||
|
||||
|
||||
|
||||
|
||||
# Check whether --with-xmlto was given.
|
||||
if test "${with_xmlto+set}" = set; then
|
||||
withval=$with_xmlto; use_xmlto=$withval
|
||||
@ -20749,6 +20760,7 @@ else
|
||||
fi
|
||||
|
||||
|
||||
|
||||
if test "x$use_xmlto" = x"auto"; then
|
||||
# Extract the first word of "xmlto", so it can be a program name with args.
|
||||
set dummy xmlto; ac_word=$2
|
||||
@ -20855,6 +20867,8 @@ else
|
||||
$as_echo "$as_me: error: --with-xmlto expects 'yes' or 'no'" >&2;}
|
||||
{ (exit 1); exit 1; }; }
|
||||
fi
|
||||
|
||||
# Test for a minimum version of xmlto, if provided.
|
||||
if test "$have_xmlto" = yes; then
|
||||
# scrape the xmlto version
|
||||
{ $as_echo "$as_me:$LINENO: checking the xmlto version" >&5
|
||||
@ -20880,6 +20894,32 @@ $as_echo "$as_me: error: xmlto version $xmlto_version found, but 0.0.20 needed"
|
||||
esac
|
||||
fi
|
||||
|
||||
# Test for the ability of xmlto to generate a text target
|
||||
have_xmlto_text=no
|
||||
cat > conftest.xml << "EOF"
|
||||
EOF
|
||||
if test "$have_xmlto" = yes; then
|
||||
if $XMLTO --skip-validation txt conftest.xml >/dev/null 2>&1; then
|
||||
have_xmlto_text=yes
|
||||
else
|
||||
{ $as_echo "$as_me:$LINENO: WARNING: xmlto cannot generate text format, this format skipped" >&5
|
||||
$as_echo "$as_me: WARNING: xmlto cannot generate text format, this format skipped" >&2;}
|
||||
fi
|
||||
|
||||
fi
|
||||
|
||||
rm -f conftest.xml
|
||||
|
||||
|
||||
if test $have_xmlto_text = yes; then
|
||||
HAVE_XMLTO_TEXT_TRUE=
|
||||
HAVE_XMLTO_TEXT_FALSE='#'
|
||||
else
|
||||
HAVE_XMLTO_TEXT_TRUE='#'
|
||||
HAVE_XMLTO_TEXT_FALSE=
|
||||
fi
|
||||
|
||||
|
||||
|
||||
if test "$have_xmlto" = yes; then
|
||||
HAVE_XMLTO_TRUE=
|
||||
@ -20922,12 +20962,12 @@ if test -n "$PKG_CONFIG"; then
|
||||
pkg_cv_XCOMPOSITE_CFLAGS="$XCOMPOSITE_CFLAGS"
|
||||
else
|
||||
if test -n "$PKG_CONFIG" && \
|
||||
{ ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"compositeproto >= \$COMPOSITEEXT_VERSION x11 xfixes xext fixesproto\"") >&5
|
||||
($PKG_CONFIG --exists --print-errors "compositeproto >= $COMPOSITEEXT_VERSION x11 xfixes xext fixesproto") 2>&5
|
||||
{ ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"compositeproto >= \$COMPOSITEEXT_VERSION x11\"") >&5
|
||||
($PKG_CONFIG --exists --print-errors "compositeproto >= $COMPOSITEEXT_VERSION x11") 2>&5
|
||||
ac_status=$?
|
||||
$as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||||
(exit $ac_status); }; then
|
||||
pkg_cv_XCOMPOSITE_CFLAGS=`$PKG_CONFIG --cflags "compositeproto >= $COMPOSITEEXT_VERSION x11 xfixes xext fixesproto" 2>/dev/null`
|
||||
pkg_cv_XCOMPOSITE_CFLAGS=`$PKG_CONFIG --cflags "compositeproto >= $COMPOSITEEXT_VERSION x11" 2>/dev/null`
|
||||
else
|
||||
pkg_failed=yes
|
||||
fi
|
||||
@ -20940,12 +20980,12 @@ if test -n "$PKG_CONFIG"; then
|
||||
pkg_cv_XCOMPOSITE_LIBS="$XCOMPOSITE_LIBS"
|
||||
else
|
||||
if test -n "$PKG_CONFIG" && \
|
||||
{ ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"compositeproto >= \$COMPOSITEEXT_VERSION x11 xfixes xext fixesproto\"") >&5
|
||||
($PKG_CONFIG --exists --print-errors "compositeproto >= $COMPOSITEEXT_VERSION x11 xfixes xext fixesproto") 2>&5
|
||||
{ ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"compositeproto >= \$COMPOSITEEXT_VERSION x11\"") >&5
|
||||
($PKG_CONFIG --exists --print-errors "compositeproto >= $COMPOSITEEXT_VERSION x11") 2>&5
|
||||
ac_status=$?
|
||||
$as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||||
(exit $ac_status); }; then
|
||||
pkg_cv_XCOMPOSITE_LIBS=`$PKG_CONFIG --libs "compositeproto >= $COMPOSITEEXT_VERSION x11 xfixes xext fixesproto" 2>/dev/null`
|
||||
pkg_cv_XCOMPOSITE_LIBS=`$PKG_CONFIG --libs "compositeproto >= $COMPOSITEEXT_VERSION x11" 2>/dev/null`
|
||||
else
|
||||
pkg_failed=yes
|
||||
fi
|
||||
@ -20964,14 +21004,14 @@ else
|
||||
_pkg_short_errors_supported=no
|
||||
fi
|
||||
if test $_pkg_short_errors_supported = yes; then
|
||||
XCOMPOSITE_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "compositeproto >= $COMPOSITEEXT_VERSION x11 xfixes xext fixesproto"`
|
||||
XCOMPOSITE_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "compositeproto >= $COMPOSITEEXT_VERSION x11"`
|
||||
else
|
||||
XCOMPOSITE_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "compositeproto >= $COMPOSITEEXT_VERSION x11 xfixes xext fixesproto"`
|
||||
XCOMPOSITE_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "compositeproto >= $COMPOSITEEXT_VERSION x11"`
|
||||
fi
|
||||
# Put the nasty error message in config.log where it belongs
|
||||
echo "$XCOMPOSITE_PKG_ERRORS" >&5
|
||||
|
||||
{ { $as_echo "$as_me:$LINENO: error: Package requirements (compositeproto >= $COMPOSITEEXT_VERSION x11 xfixes xext fixesproto) were not met:
|
||||
{ { $as_echo "$as_me:$LINENO: error: Package requirements (compositeproto >= $COMPOSITEEXT_VERSION x11) were not met:
|
||||
|
||||
$XCOMPOSITE_PKG_ERRORS
|
||||
|
||||
@ -20982,7 +21022,7 @@ Alternatively, you may set the environment variables XCOMPOSITE_CFLAGS
|
||||
and XCOMPOSITE_LIBS to avoid the need to call pkg-config.
|
||||
See the pkg-config man page for more details.
|
||||
" >&5
|
||||
$as_echo "$as_me: error: Package requirements (compositeproto >= $COMPOSITEEXT_VERSION x11 xfixes xext fixesproto) were not met:
|
||||
$as_echo "$as_me: error: Package requirements (compositeproto >= $COMPOSITEEXT_VERSION x11) were not met:
|
||||
|
||||
$XCOMPOSITE_PKG_ERRORS
|
||||
|
||||
@ -21024,7 +21064,116 @@ $as_echo "yes" >&6; }
|
||||
:
|
||||
fi
|
||||
|
||||
pkg_failed=no
|
||||
{ $as_echo "$as_me:$LINENO: checking for XFIXES" >&5
|
||||
$as_echo_n "checking for XFIXES... " >&6; }
|
||||
|
||||
if test -n "$PKG_CONFIG"; then
|
||||
if test -n "$XFIXES_CFLAGS"; then
|
||||
pkg_cv_XFIXES_CFLAGS="$XFIXES_CFLAGS"
|
||||
else
|
||||
if test -n "$PKG_CONFIG" && \
|
||||
{ ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"xfixes\"") >&5
|
||||
($PKG_CONFIG --exists --print-errors "xfixes") 2>&5
|
||||
ac_status=$?
|
||||
$as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||||
(exit $ac_status); }; then
|
||||
pkg_cv_XFIXES_CFLAGS=`$PKG_CONFIG --cflags "xfixes" 2>/dev/null`
|
||||
else
|
||||
pkg_failed=yes
|
||||
fi
|
||||
fi
|
||||
else
|
||||
pkg_failed=untried
|
||||
fi
|
||||
if test -n "$PKG_CONFIG"; then
|
||||
if test -n "$XFIXES_LIBS"; then
|
||||
pkg_cv_XFIXES_LIBS="$XFIXES_LIBS"
|
||||
else
|
||||
if test -n "$PKG_CONFIG" && \
|
||||
{ ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"xfixes\"") >&5
|
||||
($PKG_CONFIG --exists --print-errors "xfixes") 2>&5
|
||||
ac_status=$?
|
||||
$as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||||
(exit $ac_status); }; then
|
||||
pkg_cv_XFIXES_LIBS=`$PKG_CONFIG --libs "xfixes" 2>/dev/null`
|
||||
else
|
||||
pkg_failed=yes
|
||||
fi
|
||||
fi
|
||||
else
|
||||
pkg_failed=untried
|
||||
fi
|
||||
|
||||
|
||||
|
||||
if test $pkg_failed = yes; then
|
||||
|
||||
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
|
||||
_pkg_short_errors_supported=yes
|
||||
else
|
||||
_pkg_short_errors_supported=no
|
||||
fi
|
||||
if test $_pkg_short_errors_supported = yes; then
|
||||
XFIXES_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "xfixes"`
|
||||
else
|
||||
XFIXES_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "xfixes"`
|
||||
fi
|
||||
# Put the nasty error message in config.log where it belongs
|
||||
echo "$XFIXES_PKG_ERRORS" >&5
|
||||
|
||||
{ { $as_echo "$as_me:$LINENO: error: Package requirements (xfixes) were not met:
|
||||
|
||||
$XFIXES_PKG_ERRORS
|
||||
|
||||
Consider adjusting the PKG_CONFIG_PATH environment variable if you
|
||||
installed software in a non-standard prefix.
|
||||
|
||||
Alternatively, you may set the environment variables XFIXES_CFLAGS
|
||||
and XFIXES_LIBS to avoid the need to call pkg-config.
|
||||
See the pkg-config man page for more details.
|
||||
" >&5
|
||||
$as_echo "$as_me: error: Package requirements (xfixes) were not met:
|
||||
|
||||
$XFIXES_PKG_ERRORS
|
||||
|
||||
Consider adjusting the PKG_CONFIG_PATH environment variable if you
|
||||
installed software in a non-standard prefix.
|
||||
|
||||
Alternatively, you may set the environment variables XFIXES_CFLAGS
|
||||
and XFIXES_LIBS to avoid the need to call pkg-config.
|
||||
See the pkg-config man page for more details.
|
||||
" >&2;}
|
||||
{ (exit 1); exit 1; }; }
|
||||
elif test $pkg_failed = untried; then
|
||||
{ { $as_echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old. Make sure it
|
||||
is in your PATH or set the PKG_CONFIG environment variable to the full
|
||||
path to pkg-config.
|
||||
|
||||
Alternatively, you may set the environment variables XFIXES_CFLAGS
|
||||
and XFIXES_LIBS to avoid the need to call pkg-config.
|
||||
See the pkg-config man page for more details.
|
||||
|
||||
To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.
|
||||
See \`config.log' for more details." >&5
|
||||
$as_echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it
|
||||
is in your PATH or set the PKG_CONFIG environment variable to the full
|
||||
path to pkg-config.
|
||||
|
||||
Alternatively, you may set the environment variables XFIXES_CFLAGS
|
||||
and XFIXES_LIBS to avoid the need to call pkg-config.
|
||||
See the pkg-config man page for more details.
|
||||
|
||||
To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.
|
||||
See \`config.log' for more details." >&2;}
|
||||
{ (exit 1); exit 1; }; }
|
||||
else
|
||||
XFIXES_CFLAGS=$pkg_cv_XFIXES_CFLAGS
|
||||
XFIXES_LIBS=$pkg_cv_XFIXES_LIBS
|
||||
{ $as_echo "$as_me:$LINENO: result: yes" >&5
|
||||
$as_echo "yes" >&6; }
|
||||
:
|
||||
fi
|
||||
|
||||
ac_config_files="$ac_config_files Makefile src/Makefile man/Makefile xcomposite.pc"
|
||||
|
||||
@ -21153,6 +21302,13 @@ $as_echo "$as_me: error: conditional \"am__fastdepCXX\" was never defined.
|
||||
Usually this means the macro was only invoked conditionally." >&2;}
|
||||
{ (exit 1); exit 1; }; }
|
||||
fi
|
||||
if test -z "${HAVE_XMLTO_TEXT_TRUE}" && test -z "${HAVE_XMLTO_TEXT_FALSE}"; then
|
||||
{ { $as_echo "$as_me:$LINENO: error: conditional \"HAVE_XMLTO_TEXT\" was never defined.
|
||||
Usually this means the macro was only invoked conditionally." >&5
|
||||
$as_echo "$as_me: error: conditional \"HAVE_XMLTO_TEXT\" was never defined.
|
||||
Usually this means the macro was only invoked conditionally." >&2;}
|
||||
{ (exit 1); exit 1; }; }
|
||||
fi
|
||||
if test -z "${HAVE_XMLTO_TRUE}" && test -z "${HAVE_XMLTO_FALSE}"; then
|
||||
{ { $as_echo "$as_me:$LINENO: error: conditional \"HAVE_XMLTO\" was never defined.
|
||||
Usually this means the macro was only invoked conditionally." >&5
|
||||
@ -21489,7 +21645,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 libXcomposite $as_me 0.4.2, which was
|
||||
This file was extended by libXcomposite $as_me 0.4.3, which was
|
||||
generated by GNU Autoconf 2.62. Invocation command line was
|
||||
|
||||
CONFIG_FILES = $CONFIG_FILES
|
||||
@ -21542,7 +21698,7 @@ Report bugs to <bug-autoconf@gnu.org>."
|
||||
_ACEOF
|
||||
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
|
||||
ac_cs_version="\\
|
||||
libXcomposite config.status 0.4.2
|
||||
libXcomposite config.status 0.4.3
|
||||
configured by $0, generated by GNU Autoconf 2.62,
|
||||
with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
|
||||
|
||||
|
||||
@ -33,16 +33,16 @@ dnl that 'revision' number appears in Xcomposite.h and has to be manually
|
||||
dnl synchronized.
|
||||
dnl
|
||||
AC_INIT(libXcomposite,
|
||||
0.4.2,
|
||||
[0.4.3],
|
||||
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
|
||||
libXcomposite)
|
||||
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.6 or later before running autoconf/autogen])])
|
||||
XORG_MACROS_VERSION(1.6)
|
||||
[m4_fatal([must install xorg-macros 1.8 or later before running autoconf/autogen])])
|
||||
XORG_MACROS_VERSION(1.8)
|
||||
AM_CONFIG_HEADER(config.h)
|
||||
|
||||
# Check for progs
|
||||
@ -65,9 +65,8 @@ if test "$VERSION" = "" ; then
|
||||
fi
|
||||
COMPOSITEEXT_VERSION=[`echo $VERSION | sed 's/^\([0-9][0-9]*\.[0-9][0-9]*\).*$/\1/'`]
|
||||
AC_SUBST(COMPOSITEEXT_VERSION)
|
||||
PKG_CHECK_MODULES(XCOMPOSITE, [compositeproto >= $COMPOSITEEXT_VERSION] x11 xfixes xext fixesproto)
|
||||
AC_SUBST(XCOMPOSITE_CFLAGS)
|
||||
AC_SUBST(XCOMPOSITE_LIBS)
|
||||
PKG_CHECK_MODULES(XCOMPOSITE, [compositeproto >= $COMPOSITEEXT_VERSION] x11)
|
||||
PKG_CHECK_MODULES(XFIXES, xfixes)
|
||||
|
||||
AC_OUTPUT([Makefile
|
||||
src/Makefile
|
||||
|
||||
@ -1,12 +1,11 @@
|
||||
libmandir = $(LIB_MAN_DIR)
|
||||
|
||||
LIB_MAN_DIR_SUFFIX = $(LIB_MAN_DIR:@mandir@/man%=%)
|
||||
|
||||
libman_xml = Xcomposite.xml
|
||||
|
||||
libman_PRE = $(libman_xml:xml=man)
|
||||
libman_PRE = $(libman_xml:xml=man) \
|
||||
$(Xcomposite_shadows:=.man)
|
||||
|
||||
Xcomposite_man_aliases = \
|
||||
Xcomposite_shadows = \
|
||||
XCompositeQueryExtension \
|
||||
XCompositeQueryVersion \
|
||||
XCompositeVersion \
|
||||
@ -19,45 +18,21 @@ Xcomposite_man_aliases = \
|
||||
XCompositeGetOverlayWindow \
|
||||
XCompositeReleaseOverlayWindow
|
||||
|
||||
Xcomposite_shadowmen = $(Xcomposite_man_aliases:=.@LIB_MAN_SUFFIX@)
|
||||
|
||||
if INSTALL_MANPAGES
|
||||
libman_DATA = $(libman_PRE:man=@LIB_MAN_SUFFIX@) \
|
||||
$(Xcomposite_shadowmen)
|
||||
libman_DATA = $(libman_PRE:man=@LIB_MAN_SUFFIX@)
|
||||
endif
|
||||
|
||||
EXTRA_DIST = $(libman_PRE) $(libman_xml)
|
||||
|
||||
CLEANFILES = $(libman_DATA)
|
||||
|
||||
MAINTAINERCLEANFILES = $(libman_PRE)
|
||||
|
||||
# Generate man page shadow files (Replaces InstallManPageAliases from Imake)
|
||||
$(Xcomposite_shadowmen):
|
||||
$(AM_V_GEN) echo .so man$(LIB_MAN_DIR_SUFFIX)/Xcomposite.$(LIB_MAN_SUFFIX) > $@
|
||||
|
||||
# Substitute system-specific values in man pages
|
||||
|
||||
XORGRELSTRING = @PACKAGE_STRING@
|
||||
XORGMANNAME = X Version 11
|
||||
|
||||
MAN_SUBSTS = \
|
||||
-e 's|"__vendorversion__"|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \
|
||||
-e 's|__xorgversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \
|
||||
-e 's|__xservername__|Xorg|g' \
|
||||
-e 's|__xconfigfile__|xorg.conf|g' \
|
||||
-e 's|__projectroot__|$(prefix)|g' \
|
||||
-e 's|__apploaddir__|$(appdefaultdir)|' \
|
||||
-e 's|__appmansuffix__|$(APP_MAN_SUFFIX)|g' \
|
||||
-e 's|__libmansuffix__|$(LIB_MAN_SUFFIX)|g' \
|
||||
-e 's|__adminmansuffix__|$(ADMIN_MAN_SUFFIX)|g' \
|
||||
-e 's|__miscmansuffix__|$(MISC_MAN_SUFFIX)|g' \
|
||||
-e 's|__filemansuffix__|$(FILE_MAN_SUFFIX)|g'
|
||||
MAINTAINERCLEANFILES = $(libman_xml:xml=man)
|
||||
|
||||
SUFFIXES = .$(LIB_MAN_SUFFIX) .man .xml
|
||||
|
||||
Xcomposite.$(LIB_MAN_SUFFIX): Xcomposite.man
|
||||
$(AM_V_GEN)sed $(MAN_SUBSTS) < ${srcdir}/Xcomposite.man > Xcomposite.${LIB_MAN_SUFFIX}
|
||||
# String replacements in MAN_SUBSTS now come from xorg-macros.m4 via configure
|
||||
.man.$(LIB_MAN_SUFFIX):
|
||||
$(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@
|
||||
|
||||
# Generate nroff sources from DocBook/xml
|
||||
|
||||
@ -69,5 +44,5 @@ if HAVE_XMLTO
|
||||
else
|
||||
.xml.man:
|
||||
@echo "WARNING: configure did not find xmlto, cannot create $@ without it"
|
||||
cp ${srcdir}/$@ .
|
||||
endif
|
||||
|
||||
|
||||
@ -101,6 +101,8 @@ FILE_MAN_DIR = @FILE_MAN_DIR@
|
||||
FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
|
||||
GREP = @GREP@
|
||||
HAVE_XMLTO_FALSE = @HAVE_XMLTO_FALSE@
|
||||
HAVE_XMLTO_TEXT_FALSE = @HAVE_XMLTO_TEXT_FALSE@
|
||||
HAVE_XMLTO_TEXT_TRUE = @HAVE_XMLTO_TEXT_TRUE@
|
||||
HAVE_XMLTO_TRUE = @HAVE_XMLTO_TRUE@
|
||||
INSTALL_CMD = @INSTALL_CMD@
|
||||
INSTALL_DATA = @INSTALL_DATA@
|
||||
@ -121,19 +123,7 @@ MAINT = @MAINT@
|
||||
MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
|
||||
MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
|
||||
MAKEINFO = @MAKEINFO@
|
||||
MAN_SUBSTS = \
|
||||
-e 's|"__vendorversion__"|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \
|
||||
-e 's|__xorgversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \
|
||||
-e 's|__xservername__|Xorg|g' \
|
||||
-e 's|__xconfigfile__|xorg.conf|g' \
|
||||
-e 's|__projectroot__|$(prefix)|g' \
|
||||
-e 's|__apploaddir__|$(appdefaultdir)|' \
|
||||
-e 's|__appmansuffix__|$(APP_MAN_SUFFIX)|g' \
|
||||
-e 's|__libmansuffix__|$(LIB_MAN_SUFFIX)|g' \
|
||||
-e 's|__adminmansuffix__|$(ADMIN_MAN_SUFFIX)|g' \
|
||||
-e 's|__miscmansuffix__|$(MISC_MAN_SUFFIX)|g' \
|
||||
-e 's|__filemansuffix__|$(FILE_MAN_SUFFIX)|g'
|
||||
|
||||
MAN_SUBSTS = @MAN_SUBSTS@
|
||||
MISC_MAN_DIR = @MISC_MAN_DIR@
|
||||
MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@
|
||||
NMEDIT = @NMEDIT@
|
||||
@ -154,6 +144,8 @@ STRIP = @STRIP@
|
||||
VERSION = @VERSION@
|
||||
XCOMPOSITE_CFLAGS = @XCOMPOSITE_CFLAGS@
|
||||
XCOMPOSITE_LIBS = @XCOMPOSITE_LIBS@
|
||||
XFIXES_CFLAGS = @XFIXES_CFLAGS@
|
||||
XFIXES_LIBS = @XFIXES_LIBS@
|
||||
XMLTO = @XMLTO@
|
||||
XORG_MAN_PAGE = @XORG_MAN_PAGE@
|
||||
ac_ct_CC = @ac_ct_CC@
|
||||
@ -204,10 +196,11 @@ sharedstatedir = @sharedstatedir@
|
||||
sysconfdir = @sysconfdir@
|
||||
target_alias = @target_alias@
|
||||
libmandir = $(LIB_MAN_DIR)
|
||||
LIB_MAN_DIR_SUFFIX = $(LIB_MAN_DIR:@mandir@/man%=%)
|
||||
libman_xml = Xcomposite.xml
|
||||
libman_PRE = $(libman_xml:xml=man)
|
||||
Xcomposite_man_aliases = \
|
||||
libman_PRE = $(libman_xml:xml=man) \
|
||||
$(Xcomposite_shadows:=.man)
|
||||
|
||||
Xcomposite_shadows = \
|
||||
XCompositeQueryExtension \
|
||||
XCompositeQueryVersion \
|
||||
XCompositeVersion \
|
||||
@ -220,17 +213,10 @@ Xcomposite_man_aliases = \
|
||||
XCompositeGetOverlayWindow \
|
||||
XCompositeReleaseOverlayWindow
|
||||
|
||||
Xcomposite_shadowmen = $(Xcomposite_man_aliases:=.@LIB_MAN_SUFFIX@)
|
||||
@INSTALL_MANPAGES_TRUE@libman_DATA = $(libman_PRE:man=@LIB_MAN_SUFFIX@) \
|
||||
@INSTALL_MANPAGES_TRUE@ $(Xcomposite_shadowmen)
|
||||
|
||||
@INSTALL_MANPAGES_TRUE@libman_DATA = $(libman_PRE:man=@LIB_MAN_SUFFIX@)
|
||||
EXTRA_DIST = $(libman_PRE) $(libman_xml)
|
||||
CLEANFILES = $(libman_DATA)
|
||||
MAINTAINERCLEANFILES = $(libman_PRE)
|
||||
|
||||
# Substitute system-specific values in man pages
|
||||
XORGRELSTRING = @PACKAGE_STRING@
|
||||
XORGMANNAME = X Version 11
|
||||
MAINTAINERCLEANFILES = $(libman_xml:xml=man)
|
||||
SUFFIXES = .$(LIB_MAN_SUFFIX) .man .xml
|
||||
all: all-am
|
||||
|
||||
@ -420,12 +406,9 @@ uninstall-am: uninstall-info-am uninstall-libmanDATA
|
||||
uninstall-info-am uninstall-libmanDATA
|
||||
|
||||
|
||||
# Generate man page shadow files (Replaces InstallManPageAliases from Imake)
|
||||
$(Xcomposite_shadowmen):
|
||||
$(AM_V_GEN) echo .so man$(LIB_MAN_DIR_SUFFIX)/Xcomposite.$(LIB_MAN_SUFFIX) > $@
|
||||
|
||||
Xcomposite.$(LIB_MAN_SUFFIX): Xcomposite.man
|
||||
$(AM_V_GEN)sed $(MAN_SUBSTS) < ${srcdir}/Xcomposite.man > Xcomposite.${LIB_MAN_SUFFIX}
|
||||
# String replacements in MAN_SUBSTS now come from xorg-macros.m4 via configure
|
||||
.man.$(LIB_MAN_SUFFIX):
|
||||
$(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@
|
||||
|
||||
# Generate nroff sources from DocBook/xml
|
||||
|
||||
@ -435,6 +418,7 @@ dist-hook: $(libman_PRE)
|
||||
@HAVE_XMLTO_TRUE@ $(AM_V_GEN)$(XMLTO) man $< && mv $*.__libmansuffix__ $@
|
||||
@HAVE_XMLTO_FALSE@.xml.man:
|
||||
@HAVE_XMLTO_FALSE@ @echo "WARNING: configure did not find xmlto, cannot create $@ without it"
|
||||
@HAVE_XMLTO_FALSE@ cp ${srcdir}/$@ .
|
||||
# Tell versions [3.59,3.63) of GNU make to not export all variables.
|
||||
# Otherwise a system limit (for SysV at least) may be exceeded.
|
||||
.NOEXPORT:
|
||||
|
||||
@ -0,0 +1 @@
|
||||
.so man__libmansuffix__/Xcomposite.__libmansuffix__
|
||||
1
lib/libXcomposite/man/XCompositeGetOverlayWindow.man
Normal file
1
lib/libXcomposite/man/XCompositeGetOverlayWindow.man
Normal file
@ -0,0 +1 @@
|
||||
.so man__libmansuffix__/Xcomposite.__libmansuffix__
|
||||
1
lib/libXcomposite/man/XCompositeNameWindowPixmap.man
Normal file
1
lib/libXcomposite/man/XCompositeNameWindowPixmap.man
Normal file
@ -0,0 +1 @@
|
||||
.so man__libmansuffix__/Xcomposite.__libmansuffix__
|
||||
1
lib/libXcomposite/man/XCompositeQueryExtension.man
Normal file
1
lib/libXcomposite/man/XCompositeQueryExtension.man
Normal file
@ -0,0 +1 @@
|
||||
.so man__libmansuffix__/Xcomposite.__libmansuffix__
|
||||
1
lib/libXcomposite/man/XCompositeQueryVersion.man
Normal file
1
lib/libXcomposite/man/XCompositeQueryVersion.man
Normal file
@ -0,0 +1 @@
|
||||
.so man__libmansuffix__/Xcomposite.__libmansuffix__
|
||||
1
lib/libXcomposite/man/XCompositeRedirectSubwindows.man
Normal file
1
lib/libXcomposite/man/XCompositeRedirectSubwindows.man
Normal file
@ -0,0 +1 @@
|
||||
.so man__libmansuffix__/Xcomposite.__libmansuffix__
|
||||
1
lib/libXcomposite/man/XCompositeRedirectWindow.man
Normal file
1
lib/libXcomposite/man/XCompositeRedirectWindow.man
Normal file
@ -0,0 +1 @@
|
||||
.so man__libmansuffix__/Xcomposite.__libmansuffix__
|
||||
1
lib/libXcomposite/man/XCompositeReleaseOverlayWindow.man
Normal file
1
lib/libXcomposite/man/XCompositeReleaseOverlayWindow.man
Normal file
@ -0,0 +1 @@
|
||||
.so man__libmansuffix__/Xcomposite.__libmansuffix__
|
||||
1
lib/libXcomposite/man/XCompositeUnredirectSubwindows.man
Normal file
1
lib/libXcomposite/man/XCompositeUnredirectSubwindows.man
Normal file
@ -0,0 +1 @@
|
||||
.so man__libmansuffix__/Xcomposite.__libmansuffix__
|
||||
1
lib/libXcomposite/man/XCompositeUnredirectWindow.man
Normal file
1
lib/libXcomposite/man/XCompositeUnredirectWindow.man
Normal file
@ -0,0 +1 @@
|
||||
.so man__libmansuffix__/Xcomposite.__libmansuffix__
|
||||
1
lib/libXcomposite/man/XCompositeVersion.man
Normal file
1
lib/libXcomposite/man/XCompositeVersion.man
Normal file
@ -0,0 +1 @@
|
||||
.so man__libmansuffix__/Xcomposite.__libmansuffix__
|
||||
@ -21,7 +21,7 @@
|
||||
# TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
|
||||
# PERFORMANCE OF THIS SOFTWARE.
|
||||
|
||||
AM_CFLAGS = $(CWARNFLAGS) $(XCOMPOSITE_CFLAGS) $(X_CFLAGS)
|
||||
AM_CFLAGS = $(CWARNFLAGS) $(XCOMPOSITE_CFLAGS) $(XFIXES_CFLAGS)
|
||||
AM_CPPFLAGS = -I$(top_srcdir)/include
|
||||
|
||||
lib_LTLIBRARIES = libXcomposite.la
|
||||
@ -30,7 +30,7 @@ libXcomposite_la_SOURCES = \
|
||||
xcompositeint.h \
|
||||
Xcomposite.c
|
||||
|
||||
libXcomposite_la_LIBADD = $(XCOMPOSITE_LIBS) $(X_LIBS) $(XCOMPOSITE_LIBS)
|
||||
libXcomposite_la_LIBADD = $(XCOMPOSITE_LIBS)
|
||||
|
||||
libXcomposite_la_LDFLAGS = -version-number 1:0:0 -no-undefined
|
||||
|
||||
|
||||
@ -81,8 +81,7 @@ am__installdirs = "$(DESTDIR)$(libdir)" \
|
||||
libLTLIBRARIES_INSTALL = $(INSTALL)
|
||||
LTLIBRARIES = $(lib_LTLIBRARIES)
|
||||
am__DEPENDENCIES_1 =
|
||||
libXcomposite_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
|
||||
$(am__DEPENDENCIES_1)
|
||||
libXcomposite_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
|
||||
am_libXcomposite_la_OBJECTS = Xcomposite.lo
|
||||
libXcomposite_la_OBJECTS = $(am_libXcomposite_la_OBJECTS)
|
||||
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
|
||||
@ -147,6 +146,8 @@ FILE_MAN_DIR = @FILE_MAN_DIR@
|
||||
FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
|
||||
GREP = @GREP@
|
||||
HAVE_XMLTO_FALSE = @HAVE_XMLTO_FALSE@
|
||||
HAVE_XMLTO_TEXT_FALSE = @HAVE_XMLTO_TEXT_FALSE@
|
||||
HAVE_XMLTO_TEXT_TRUE = @HAVE_XMLTO_TEXT_TRUE@
|
||||
HAVE_XMLTO_TRUE = @HAVE_XMLTO_TRUE@
|
||||
INSTALL_CMD = @INSTALL_CMD@
|
||||
INSTALL_DATA = @INSTALL_DATA@
|
||||
@ -188,6 +189,8 @@ STRIP = @STRIP@
|
||||
VERSION = @VERSION@
|
||||
XCOMPOSITE_CFLAGS = @XCOMPOSITE_CFLAGS@
|
||||
XCOMPOSITE_LIBS = @XCOMPOSITE_LIBS@
|
||||
XFIXES_CFLAGS = @XFIXES_CFLAGS@
|
||||
XFIXES_LIBS = @XFIXES_LIBS@
|
||||
XMLTO = @XMLTO@
|
||||
XORG_MAN_PAGE = @XORG_MAN_PAGE@
|
||||
ac_ct_CC = @ac_ct_CC@
|
||||
@ -237,14 +240,14 @@ sbindir = @sbindir@
|
||||
sharedstatedir = @sharedstatedir@
|
||||
sysconfdir = @sysconfdir@
|
||||
target_alias = @target_alias@
|
||||
AM_CFLAGS = $(CWARNFLAGS) $(XCOMPOSITE_CFLAGS) $(X_CFLAGS)
|
||||
AM_CFLAGS = $(CWARNFLAGS) $(XCOMPOSITE_CFLAGS) $(XFIXES_CFLAGS)
|
||||
AM_CPPFLAGS = -I$(top_srcdir)/include
|
||||
lib_LTLIBRARIES = libXcomposite.la
|
||||
libXcomposite_la_SOURCES = \
|
||||
xcompositeint.h \
|
||||
Xcomposite.c
|
||||
|
||||
libXcomposite_la_LIBADD = $(XCOMPOSITE_LIBS) $(X_LIBS) $(XCOMPOSITE_LIBS)
|
||||
libXcomposite_la_LIBADD = $(XCOMPOSITE_LIBS)
|
||||
libXcomposite_la_LDFLAGS = -version-number 1:0:0 -no-undefined
|
||||
libXcompositeincludedir = $(includedir)/X11/extensions
|
||||
libXcompositeinclude_HEADERS = $(top_srcdir)/include/X11/extensions/Xcomposite.h
|
||||
|
||||
@ -45,8 +45,6 @@
|
||||
#ifndef _XCOMPOSITEINT_H_
|
||||
#define _XCOMPOSITEINT_H_
|
||||
|
||||
#define NEED_EVENTS
|
||||
#define NEED_REPLIES
|
||||
#include <stdio.h>
|
||||
#include <X11/Xlib.h>
|
||||
#include <X11/Xlibint.h>
|
||||
|
||||
@ -4,9 +4,9 @@ libdir=@libdir@
|
||||
includedir=@includedir@
|
||||
|
||||
Name: Xcomposite
|
||||
Description: X Composite Library
|
||||
Description: X Composite Extension Library
|
||||
Version: @PACKAGE_VERSION@
|
||||
Requires: xproto compositeproto >= @COMPOSITEEXT_VERSION@ xfixes
|
||||
Requires.private: x11 xfixes xext
|
||||
Requires: xproto compositeproto >= @COMPOSITEEXT_VERSION@
|
||||
Requires.private: x11 xfixes
|
||||
Cflags: -I${includedir}
|
||||
Libs: -L${libdir} -lXcomposite
|
||||
|
||||
Loading…
Reference in New Issue
Block a user