From 5720842b607a6d77c99230071d83fc9c0735bc45 Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Tue, 23 Jun 2015 16:24:56 +0200 Subject: library clean-up: No autotools cruft in nx-libs. --- nx-X11/lib/Xcomposite/AUTHORS | 1 - nx-X11/lib/Xcomposite/COPYING | 22 -- nx-X11/lib/Xcomposite/ChangeLog | 19 -- nx-X11/lib/Xcomposite/INSTALL | 8 - nx-X11/lib/Xcomposite/Imakefile | 12 - nx-X11/lib/Xcomposite/NEWS | 0 nx-X11/lib/Xcomposite/README | 10 - nx-X11/lib/Xcomposite/autogen.sh | 3 - nx-X11/lib/Xcomposite/configure.ac | 102 -------- nx-X11/lib/Xcomposite/xcomposite.pc.in | 10 - nx-X11/lib/Xfixes/AUTHORS | 1 - nx-X11/lib/Xfixes/COPYING | 22 -- nx-X11/lib/Xfixes/ChangeLog | 102 -------- nx-X11/lib/Xfixes/INSTALL | 8 - nx-X11/lib/Xfixes/Imakefile | 12 - nx-X11/lib/Xfixes/NEWS | 0 nx-X11/lib/Xfixes/README | 10 - nx-X11/lib/Xfixes/autogen.sh | 3 - nx-X11/lib/Xfixes/configure.ac | 99 ------- nx-X11/lib/Xfixes/xfixes.pc.in | 10 - nx-X11/lib/Xrender/AUTHORS | 3 - nx-X11/lib/Xrender/COPYING | 22 -- nx-X11/lib/Xrender/ChangeLog | 456 --------------------------------- nx-X11/lib/Xrender/INSTALL | 8 - nx-X11/lib/Xrender/Imakefile | 11 - nx-X11/lib/Xrender/NEWS | 0 nx-X11/lib/Xrender/README | 0 nx-X11/lib/Xrender/autogen.sh | 3 - nx-X11/lib/Xrender/config-subst | 10 - nx-X11/lib/Xrender/configure.ac | 113 -------- nx-X11/lib/Xrender/xrender.pc.in | 11 - 31 files changed, 1091 deletions(-) delete mode 100644 nx-X11/lib/Xcomposite/AUTHORS delete mode 100644 nx-X11/lib/Xcomposite/COPYING delete mode 100644 nx-X11/lib/Xcomposite/ChangeLog delete mode 100644 nx-X11/lib/Xcomposite/INSTALL delete mode 100644 nx-X11/lib/Xcomposite/NEWS delete mode 100644 nx-X11/lib/Xcomposite/README delete mode 100755 nx-X11/lib/Xcomposite/autogen.sh delete mode 100644 nx-X11/lib/Xcomposite/configure.ac delete mode 100644 nx-X11/lib/Xcomposite/xcomposite.pc.in delete mode 100644 nx-X11/lib/Xfixes/AUTHORS delete mode 100644 nx-X11/lib/Xfixes/COPYING delete mode 100644 nx-X11/lib/Xfixes/ChangeLog delete mode 100644 nx-X11/lib/Xfixes/INSTALL delete mode 100644 nx-X11/lib/Xfixes/NEWS delete mode 100644 nx-X11/lib/Xfixes/README delete mode 100755 nx-X11/lib/Xfixes/autogen.sh delete mode 100644 nx-X11/lib/Xfixes/configure.ac delete mode 100644 nx-X11/lib/Xfixes/xfixes.pc.in delete mode 100644 nx-X11/lib/Xrender/AUTHORS delete mode 100644 nx-X11/lib/Xrender/COPYING delete mode 100644 nx-X11/lib/Xrender/ChangeLog delete mode 100644 nx-X11/lib/Xrender/INSTALL delete mode 100644 nx-X11/lib/Xrender/NEWS delete mode 100644 nx-X11/lib/Xrender/README delete mode 100755 nx-X11/lib/Xrender/autogen.sh delete mode 100644 nx-X11/lib/Xrender/config-subst delete mode 100644 nx-X11/lib/Xrender/configure.ac delete mode 100644 nx-X11/lib/Xrender/xrender.pc.in (limited to 'nx-X11') diff --git a/nx-X11/lib/Xcomposite/AUTHORS b/nx-X11/lib/Xcomposite/AUTHORS deleted file mode 100644 index 8e18f9b42..000000000 --- a/nx-X11/lib/Xcomposite/AUTHORS +++ /dev/null @@ -1 +0,0 @@ -Keith Packard, HP diff --git a/nx-X11/lib/Xcomposite/COPYING b/nx-X11/lib/Xcomposite/COPYING deleted file mode 100644 index e85d981e7..000000000 --- a/nx-X11/lib/Xcomposite/COPYING +++ /dev/null @@ -1,22 +0,0 @@ -$Id: COPYING,v 1.1 2004/07/31 05:50:39 anholt Exp $ - -Copyright © 2001,2003 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. - diff --git a/nx-X11/lib/Xcomposite/ChangeLog b/nx-X11/lib/Xcomposite/ChangeLog deleted file mode 100644 index f70ce6605..000000000 --- a/nx-X11/lib/Xcomposite/ChangeLog +++ /dev/null @@ -1,19 +0,0 @@ -2004-07-08 Keith Packard - - * Makefile.am: - * Xcomposite.c: (XCompositeVersion), (XCompositeNameWindowPixmap): - * Xcomposite.h: - * configure.ac: - Add library API for Composite 0.2 changes - Add XCompositeVersion to get the run-time library version number - Fix package version number in configure.ac and Xcomposite.h - -2004-02-03 Jim Gettys - - * AUTHORS: Add authors to AUTHORS file - -2004-01-15 Daniel Stone - * Tag release 1.0 for first freedesktop.org clientside lib release. - -2004-01-15 Harold L Hunt II - * Makefile.am: Pass -no-undefined to libtool via LDFLAGS. diff --git a/nx-X11/lib/Xcomposite/INSTALL b/nx-X11/lib/Xcomposite/INSTALL deleted file mode 100644 index 25a014e2e..000000000 --- a/nx-X11/lib/Xcomposite/INSTALL +++ /dev/null @@ -1,8 +0,0 @@ -Xcomposite is built with the traditional configure script: - - $ ./configure --prefix=/usr/X11R6 - -This should generate valid Makefiles, then: - - $ make - $ make install diff --git a/nx-X11/lib/Xcomposite/Imakefile b/nx-X11/lib/Xcomposite/Imakefile index 0f3c44da4..a8e4077fa 100644 --- a/nx-X11/lib/Xcomposite/Imakefile +++ b/nx-X11/lib/Xcomposite/Imakefile @@ -54,15 +54,3 @@ SUBSTVARS=prefix="$(PROJECTROOT)" \ #include DependTarget() - -all:: xcomposite.pc - -xcomposite.pc: xcomposite.pc.in - RemoveFile($@) - sh ../Xrender/config-subst $(SUBSTVARS) < xcomposite.pc.in > $@ - -InstallNonExecFile(xcomposite.pc,$(USRLIBDIR)/pkgconfig) - -clean:: - RemoveFile(xcomposite.pc) - diff --git a/nx-X11/lib/Xcomposite/NEWS b/nx-X11/lib/Xcomposite/NEWS deleted file mode 100644 index e69de29bb..000000000 diff --git a/nx-X11/lib/Xcomposite/README b/nx-X11/lib/Xcomposite/README deleted file mode 100644 index 9968c6bdf..000000000 --- a/nx-X11/lib/Xcomposite/README +++ /dev/null @@ -1,10 +0,0 @@ - RandR - X RandR Extension - Version 1.0 - 2002-10-4 - -This package contains header files and documentation for the X RandR -extension. Library and server implementations are separate. - -Keith Packard -keithp@keithp.com diff --git a/nx-X11/lib/Xcomposite/autogen.sh b/nx-X11/lib/Xcomposite/autogen.sh deleted file mode 100755 index b1376df5a..000000000 --- a/nx-X11/lib/Xcomposite/autogen.sh +++ /dev/null @@ -1,3 +0,0 @@ -#! /bin/sh -autoreconf -v --install || exit 1 -./configure --enable-maintainer-mode "$@" diff --git a/nx-X11/lib/Xcomposite/configure.ac b/nx-X11/lib/Xcomposite/configure.ac deleted file mode 100644 index 8e8848194..000000000 --- a/nx-X11/lib/Xcomposite/configure.ac +++ /dev/null @@ -1,102 +0,0 @@ -dnl -dnl $Id: configure.ac,v 1.1 2004/07/31 05:50:39 anholt Exp $ -dnl -dnl Copyright © 2003 Keith Packard, Noah Levitt -dnl -dnl Permission to use, copy, modify, distribute, and sell this software and its -dnl documentation for any purpose is hereby granted without fee, provided that -dnl the above copyright notice appear in all copies and that both that -dnl copyright notice and this permission notice appear in supporting -dnl documentation, and that the name of Keith Packard not be used in -dnl advertising or publicity pertaining to distribution of the software without -dnl specific, written prior permission. Keith Packard makes no -dnl representations about the suitability of this software for any purpose. It -dnl is provided "as is" without express or implied warranty. -dnl -dnl KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, -dnl INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO -dnl EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR -dnl CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, -dnl DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER -dnl TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR -dnl PERFORMANCE OF THIS SOFTWARE. -dnl -dnl Process this file with autoconf to create configure. - -AC_PREREQ([2.57]) - -dnl -dnl Version should match the current XComposite version. XCompositeQueryVersion -dnl returns the version from xcompositewire.h, NOT the version we set here. But we -dnl try to keep these the same. Note that the library has an extra -dnl digit in the version number to track changes which don't affect the -dnl protocol, so Xcomposite version l.n.m corresponds to protocol version l.n -dnl that 'revision' number appears in Xcomposite.h and has to be manually -dnl synchronized. -dnl -AC_INIT(libXcomposite, 0.2.0, [keithp@keithp.com], libXcomposite) -AM_INIT_AUTOMAKE([dist-bzip2]) -AM_MAINTAINER_MODE - -AM_CONFIG_HEADER(config.h) -AC_CONFIG_AUX_DIR(.) - -# Check for progs -AC_PROG_CC -AC_PROG_LIBTOOL - -# Check for X -PKG_CHECK_MODULES(X, x11, - [x_found_with_pkgconfig=yes], - [x_found_with_pkgconfig=no]) -AC_SUBST(X_CFLAGS) -AC_SUBST(X_LIBS) - -if test "$x_found_with_pkgconfig" = "no" -then - AC_PATH_XTRA - X_LIBS="$X_LIBS -lX11" - - if test "x$no_x" = "xyes" - then - AC_MSG_ERROR([X is required, but it was either disabled or not found.]) - fi - - save_LIBS="$LIBS" - save_CFLAGS="$CFLAGS" - CFLAGS="$CFLAGS $X_CFLAGS" - LIBS="$LIBS $X_LIBS" - - AC_MSG_CHECKING([for XTHREADS in Xlib]) - AC_RUN_IFELSE( - [AC_LANG_PROGRAM([[#include ]], - [[return XInitThreads() == 0 ? 0 : 1;]])], - [xthreads=no], - [xthreads=yes], - [xthreads=yes]) - - AC_MSG_RESULT($xthreads) - - LIBS="$save_LIBS" - CFLAGS="$save_CFLAGS" - - if test "x$xthreads" = "xyes" - then - X_CFLAGS="$X_CFLAGS -DXTHREADS" - fi -fi - -# Check compositeext configuration, strip extra digits from package version to -# find the required protocol version - -if test "$VERSION" = "" ; then - VERSION=$PACKAGE_VERSION; -fi -COMPOSITEEXT_VERSION=[`echo $VERSION | sed 's/^\([0-9][0-9]*\.[0-9][0-9]*\).*$/\1/'`] -PKG_CHECK_MODULES(XCOMPOSITE, [compositeext >= $COMPOSITEEXT_VERSION] xfixes) -AC_SUBST(XCOMPOSITE_CFLAGS) -AC_SUBST(XCOMPOSITE_LIBS) - -AC_OUTPUT([Makefile - xcomposite.pc]) - diff --git a/nx-X11/lib/Xcomposite/xcomposite.pc.in b/nx-X11/lib/Xcomposite/xcomposite.pc.in deleted file mode 100644 index c319694f1..000000000 --- a/nx-X11/lib/Xcomposite/xcomposite.pc.in +++ /dev/null @@ -1,10 +0,0 @@ -prefix=@prefix@ -exec_prefix=@exec_prefix@ -libdir=@libdir@ -includedir=@includedir@ - -Name: Xcomposite -Description: X Composite Library -Version: @VERSION@ -Cflags: -I${includedir} @XCOMPOSITE_CFLAGS@ @X_CFLAGS@ -Libs: -L${libdir} -lNX_Xcomposite @XCOMPOSITE_LIBS@ @X_LIBS@ diff --git a/nx-X11/lib/Xfixes/AUTHORS b/nx-X11/lib/Xfixes/AUTHORS deleted file mode 100644 index ab0e01b06..000000000 --- a/nx-X11/lib/Xfixes/AUTHORS +++ /dev/null @@ -1 +0,0 @@ -Keith Packard, HP and XFree86. diff --git a/nx-X11/lib/Xfixes/COPYING b/nx-X11/lib/Xfixes/COPYING deleted file mode 100644 index e85d981e7..000000000 --- a/nx-X11/lib/Xfixes/COPYING +++ /dev/null @@ -1,22 +0,0 @@ -$Id: COPYING,v 1.1 2004/07/31 05:50:39 anholt Exp $ - -Copyright © 2001,2003 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. - diff --git a/nx-X11/lib/Xfixes/ChangeLog b/nx-X11/lib/Xfixes/ChangeLog deleted file mode 100644 index cf2da5a94..000000000 --- a/nx-X11/lib/Xfixes/ChangeLog +++ /dev/null @@ -1,102 +0,0 @@ -Tue May 17 13:00:21 2005 Søren Sandmann - - * *.c: Conditionally include - -2004-07-26 Keith Packard - - * Makefile.am: - * Region.c: (XFixesFetchRegion), (XFixesFetchRegionAndBounds), - (XFixesExpandRegion): - * Xfixes.c: (XFixesVersion): - * Xfixes.h: - * configure.ac: - Add XFixesExpandRegion and XFixesFetchRegionAndBounds - -2004-04-13 Daniel Stone - - * Bump version to 2.0.2 for xlibs 1.0.1; no other changes. - -2004-04-01 Keith Packard - - reviewed by: Bill Haneman - - * Region.c: (XFixesFetchRegion): - Forgot to store the region operand in the protocol request. - Made this function completely broken. - -2004-03-08 Keith Packard - - * Cursor.c: (XFixesGetCursorImage), (XFixesSetCursorName), - (XFixesChangeCursorByName): - * Xfixes.h: - Use 'const' in API to make C++ happy - -2004-02-03 Jim Gettys - - * AUTHORS: Get a author file with contents. - -2004-01-15 Daniel Stone - * Tag release 2.0.1 for first freedesktop.org clientside lib release. - -2004-01-15 Harold L Hunt II - * Makefile.am: Pass -no-undefined to libtool via LDFLAGS. - -2003-11-21 Keith Packard - - * Region.c: (XFixesCopyRegion), (XFixesUnionRegion), - (XFixesIntersectRegion), (XFixesSubtractRegion), - (XFixesInvertRegion), (XFixesTranslateRegion): - * Xfixes.h: - Eliminate offset arguments in combining operators, - create separate XFixesCopyRegion and XFixesTranslateRegion functions. - -2003-11-02 Keith Packard - - * Cursor.c: (XFixesSelectCursorInput), (XFixesGetCursorImage), - (XFixesSetCursorName), (XFixesGetCursorName), (XFixesChangeCursor), - (XFixesChangeCursorByName): - * Makefile.am: - * Region.c: (XFixesCreateRegion), (XFixesCreateRegionFromBitmap), - (XFixesCreateRegionFromWindow), (XFixesCreateRegionFromGC), - (XFixesCreateRegionFromPicture), (XFixesDestroyRegion), - (XFixesSetRegion), (XFixesUnionRegion), (XFixesIntersectRegion), - (XFixesSubtractRegion), (XFixesInvertRegion), - (XFixesRegionExtents), (XFixesFetchRegion), - (XFixesSetGCClipRegion), (XFixesSetWindowShapeRegion), - (XFixesSetPictureClipRegion): - * SaveSet.c: (XFixesChangeSaveSet): - * Selection.c: (XFixesSelectSelectionInput): - * Xfixes.c: (XFixesExtAddDisplay), (XFixesExtRemoveDisplay), - (XFixesExtFindDisplay), (XFixesFindDisplay), (XFixesCloseDisplay), - (XFixesWireToEvent), (XFixesEventToWire), (XFixesQueryExtension), - (XFixesQueryVersion): - * Xfixes.h: - * Xfixesint.h: - * configure.ac: - * xfixes.pc.in: - Merge in xfixes_2_branch - -2003-10-19 Keith Packard - - * Cursor.c - * Region.c - * Makefile.am - * SaveSet.c - * Selection.c - * Xfixes.c - * Xfixes.h - * Xfixesint.h - * configure.ac - * xfixes.pc.in - Eliminate dependency on libXext by in-lining trivial code. - Switch to Xfixes 2.0, adding region and cursor name functions - -2003-09-16 Anders Carlsson - - * configure.ac: - * randr-uninstalled.pc.in: - Add uninstalled pc file. - -2003-04-21 Keith Packard - - + Added ChangeLog diff --git a/nx-X11/lib/Xfixes/INSTALL b/nx-X11/lib/Xfixes/INSTALL deleted file mode 100644 index 557b5e871..000000000 --- a/nx-X11/lib/Xfixes/INSTALL +++ /dev/null @@ -1,8 +0,0 @@ -Xfixes is built with the traditional configure script: - - $ ./configure --prefix=/usr/X11R6 - -This should generate valid Makefiles, then: - - $ make - $ make install diff --git a/nx-X11/lib/Xfixes/Imakefile b/nx-X11/lib/Xfixes/Imakefile index 3dc1bd983..ca1fe046b 100644 --- a/nx-X11/lib/Xfixes/Imakefile +++ b/nx-X11/lib/Xfixes/Imakefile @@ -61,15 +61,3 @@ MANSUFFIX=$(LIBMANSUFFIX) InstallManPage(Xfixes,$(LIBMANDIR)) DependTarget() - -all:: xfixes.pc - -xfixes.pc: xfixes.pc.in - RemoveFile($@) - sh ../Xrender/config-subst $(SUBSTVARS) < xfixes.pc.in > $@ - -InstallNonExecFile(xfixes.pc,$(USRLIBDIR)/pkgconfig) - -clean:: - RemoveFile(xfixes.pc) - diff --git a/nx-X11/lib/Xfixes/NEWS b/nx-X11/lib/Xfixes/NEWS deleted file mode 100644 index e69de29bb..000000000 diff --git a/nx-X11/lib/Xfixes/README b/nx-X11/lib/Xfixes/README deleted file mode 100644 index 67cf1d8be..000000000 --- a/nx-X11/lib/Xfixes/README +++ /dev/null @@ -1,10 +0,0 @@ - Xfixes - XFIXES Extension - Version 2.0.1 - 2002-10-4 - -This package contains header files and documentation for the XFIXES -extension. Library and server implementations are separate. - -Keith Packard -keithp@keithp.com diff --git a/nx-X11/lib/Xfixes/autogen.sh b/nx-X11/lib/Xfixes/autogen.sh deleted file mode 100755 index b1376df5a..000000000 --- a/nx-X11/lib/Xfixes/autogen.sh +++ /dev/null @@ -1,3 +0,0 @@ -#! /bin/sh -autoreconf -v --install || exit 1 -./configure --enable-maintainer-mode "$@" diff --git a/nx-X11/lib/Xfixes/configure.ac b/nx-X11/lib/Xfixes/configure.ac deleted file mode 100644 index 37b123516..000000000 --- a/nx-X11/lib/Xfixes/configure.ac +++ /dev/null @@ -1,99 +0,0 @@ -dnl -dnl $Id: configure.ac,v 1.1 2004/07/31 05:50:39 anholt Exp $ -dnl -dnl Copyright © 2003 Keith Packard, Noah Levitt -dnl -dnl Permission to use, copy, modify, distribute, and sell this software and its -dnl documentation for any purpose is hereby granted without fee, provided that -dnl the above copyright notice appear in all copies and that both that -dnl copyright notice and this permission notice appear in supporting -dnl documentation, and that the name of Keith Packard not be used in -dnl advertising or publicity pertaining to distribution of the software without -dnl specific, written prior permission. Keith Packard makes no -dnl representations about the suitability of this software for any purpose. It -dnl is provided "as is" without express or implied warranty. -dnl -dnl KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, -dnl INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO -dnl EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR -dnl CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, -dnl DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER -dnl TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR -dnl PERFORMANCE OF THIS SOFTWARE. -dnl -dnl Process this file with autoconf to create configure. - -AC_PREREQ([2.57]) - -dnl -dnl Version should match the current XFixes version. XFixesQueryVersion -dnl returns the version from xfixeswire.h, NOT the version we set here. But we -dnl try to keep these the same. Note that the library has an extra -dnl digit in the version number to track changes which don't affect the -dnl protocol, so Xfixes version l.n.m corresponds to protocol version l.n, -dnl that 'revision' number appears in Xfixes.h and has to be manually -dnl synchronized. -dnl -AC_INIT(libXfixes, 3.0.0, [keithp@keithp.com], libXfixes) -AM_INIT_AUTOMAKE([dist-bzip2]) -AM_MAINTAINER_MODE - -AM_CONFIG_HEADER(config.h) -AC_CONFIG_AUX_DIR(.) - -# Check for progs -AC_PROG_CC -AC_PROG_LIBTOOL - -# Check for X -PKG_CHECK_MODULES(X, x11, - [x_found_with_pkgconfig=yes], - [x_found_with_pkgconfig=no]) -AC_SUBST(X_CFLAGS) -AC_SUBST(X_LIBS) - -if test "$x_found_with_pkgconfig" = "no" -then - AC_PATH_XTRA - X_LIBS="$X_LIBS -lX11" - - if test "x$no_x" = "xyes" - then - AC_MSG_ERROR([X is required, but it was either disabled or not found.]) - fi - - save_LIBS="$LIBS" - save_CFLAGS="$CFLAGS" - CFLAGS="$CFLAGS $X_CFLAGS" - LIBS="$LIBS $X_LIBS" - - AC_MSG_CHECKING([for XTHREADS in Xlib]) - AC_RUN_IFELSE( - [AC_LANG_PROGRAM([[#include ]], - [[return XInitThreads() == 0 ? 0 : 1;]])], - [xthreads=no], - [xthreads=yes], - [xthreads=yes]) - - AC_MSG_RESULT($xthreads) - - LIBS="$save_LIBS" - CFLAGS="$save_CFLAGS" - - if test "x$xthreads" = "xyes" - then - X_CFLAGS="$X_CFLAGS -DXTHREADS" - fi -fi - -# Check fixesext configuration, strip extra digits from package version to -# find the required protocol version - -FIXESEXT_VERSION=[`echo $VERSION | sed 's/^\([0-9][0-9]*\.[0-9][0-9]*\).*$/\1/'`] -PKG_CHECK_MODULES(FIXESEXT, [fixesext >= $FIXESEXT_VERSION]) -AC_SUBST(FIXESEXT_CFLAGS) -AC_SUBST(FIXESEXT_LIBS) - -AC_OUTPUT([Makefile - xfixes.pc]) - diff --git a/nx-X11/lib/Xfixes/xfixes.pc.in b/nx-X11/lib/Xfixes/xfixes.pc.in deleted file mode 100644 index 54e9ac709..000000000 --- a/nx-X11/lib/Xfixes/xfixes.pc.in +++ /dev/null @@ -1,10 +0,0 @@ -prefix=@prefix@ -exec_prefix=@exec_prefix@ -libdir=@libdir@ -includedir=@includedir@ - -Name: Xfixes -Description: X Fixes Library -Version: @VERSION@ -Cflags: -I${includedir} @X_CFLAGS@ -Libs: -L${libdir} -lNX_Xfixes @X_LIBS@ diff --git a/nx-X11/lib/Xrender/AUTHORS b/nx-X11/lib/Xrender/AUTHORS deleted file mode 100644 index 5f6c46a80..000000000 --- a/nx-X11/lib/Xrender/AUTHORS +++ /dev/null @@ -1,3 +0,0 @@ -Keith Packard, of SuSE, XFree86 and Hewlett-Packard - -Noah Levitt, autotooling. diff --git a/nx-X11/lib/Xrender/COPYING b/nx-X11/lib/Xrender/COPYING deleted file mode 100644 index a232c2bea..000000000 --- a/nx-X11/lib/Xrender/COPYING +++ /dev/null @@ -1,22 +0,0 @@ -$Id: COPYING,v 1.2 2004/04/23 18:43:50 eich Exp $ - -Copyright © 2001,2003 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. - diff --git a/nx-X11/lib/Xrender/ChangeLog b/nx-X11/lib/Xrender/ChangeLog deleted file mode 100644 index 1fae6e0d2..000000000 --- a/nx-X11/lib/Xrender/ChangeLog +++ /dev/null @@ -1,456 +0,0 @@ -Thu May 19 15:22:19 2005 Søren Sandmann - - * *.c: Conditionallyu include config.h - -2004-02-03 Jim Gettys - - * AUTHORS: Get a author's list going. - -2004-01-15 Daniel Stone - * Tag release 0.8.4 for first freedesktop.org clientside lib release. - -2004-01-15 Harold L Hunt II - * Makefile.am: Pass -no-undefined to libtool via LDFLAGS. - -2003-12-12 Keith Packard - - * configure.ac: - * xrender.pc.in: - Use Requires: in xrender.pc when x11.pc exists - -2003-06-08 10:56 keithp - - * Filter.c, Makefile.am, Xrender.c, Xrenderint.h, configure.ac: - Bail on bogus Xsun servers, compile with -DXTHREADS if necessary, - get rid of unecessary cast to XRenderInfo * - -2003-05-06 09:05 branden - - * ChangeLog: Huh. Did Keith tag xrender-0_8_2 *before* running - cvs2cl? Running it again. - -2003-05-05 20:56 keithp - - * ChangeLog: Update ChangeLog with spiffy cvs2cl script (thanks - Branden) - -2003-05-05 20:49 keithp - - * configure.ac: Update version to 0.8.2, add some version-related - comments - -2003-05-05 20:18 branden - - * debian/: changelog, compat, control, copyright, - libxrender-dev.install, libxrender-dev.postrm, - libxrender-dev.preinst, libxrender1-dbg.install, - libxrender1-dbg.postrm, libxrender1-dbg.preinst, - libxrender1.install, libxrender1.postrm, libxrender1.preinst, - rules: Check in Debian packaging infrastructure per Keith's - request. This is the stuff that corresponds to Debian's xrender - 0.8.1-1 package. - -2003-05-05 19:06 keithp - - * Xrenderint.h, configure.ac: Remove bogus Xext.h include. Fix - Render version comparison - -2003-05-03 13:00 keithp - - * Makefile.am, configure.ac: Bump to version 0.8.1, library version - 1.2.2 after extutil was removed - -2003-04-26 08:52 nlevitt - - * Xrenderint.h: Get rid of reference to XMissingExtension. It's in - libXext, which we don't link, and we don't want to print an error - message anyway. - -2003-04-23 20:29 nlevitt - - * ChangeLog, Composite.c, Cursor.c, FillRect.c, FillRects.c, - Filter.c, Glyph.c, Makefile.am, Picture.c, Trap.c, Tri.c, - Xrender.c, Xrenderint.h, configure.ac, extutil.h, xrender.pc.in: - Get rid of libXext dependency. - -2003-04-22 09:59 nlevitt - - * .cvsignore: Testing syncmail. - -2003-04-21 23:41 nlevitt - - * xrender.pc.in: Xrender.h #includes render.h, so it needs the - Render CFLAGS. - -2003-04-21 23:12 nlevitt - - * xrender.pc.in: s/@PACKAGE_VERSION@/@VERSION@/ (Jeff Waugh, bug - #71) - -2003-04-21 21:46 nlevitt - - * Makefile.am, Xrenderint.h, configure.ac: Use local extutil.h if - not installed on the system. - -2003-04-21 10:36 keithp - - * COPYING, ChangeLog, INSTALL, configure.ac: Fix render header - version check to use VERSION, eliminate duplicate version numbers - from configure.ac - -2003-04-21 10:22 keithp - - * Color.c, Composite.c, Cursor.c, FillRects.c, Filter.c, Glyph.c, - Picture.c, Poly.c, Trap.c, Tri.c, Xrender-def.cpp, Xrender.h, - Xrenderint.h, extutil.h: Switch CVS id tags so regular CVS can cope - -2003-04-21 09:47 keithp - - * Makefile.am: Xrender .so is 1.2. switch order of dependent - libraries - -2003-04-20 23:49 nlevitt - - * FillRect.c: Testing syncmail again. - -2003-04-20 23:44 nlevitt - - * Xrender.c: Testing syncmail. - -2003-04-19 16:02 nlevitt - - * xrender.pc.in: Add X libs to pkg-config --libs. - -2003-04-19 11:32 nlevitt - - * Makefile.am: Link with -lX11 -lXext. - -2003-04-19 11:21 nlevitt - - * Makefile.am, Xrenderint.h, configure.ac: Use installed - . (Thanks, jdub). Make sure X is found - at ./configure time. Bump .so version to 1.1.1. - -2003-04-17 17:43 nlevitt - - * configure.ac: Xrender version is the same as Render. - -2003-04-17 16:41 nlevitt - - * .cvsignore: Quiet, please. - -2003-04-17 15:53 nlevitt - - * xrender.pc.in: Fix typo - -2003-04-17 15:49 nlevitt - - * Imakefile, Makefile.am, Xrenderint.h, autogen.sh, configure.ac, - extutil.h, region.h, xrender.pc.in: Initial automake support. - -2003-03-24 20:18 dawes - - * Xrender-def.cpp: 26. Updates for building on OS/2 (#5650, Frank - Giessler). - -2002-11-24 13:46 tsi - - * Cursor.c: Warning fix - -2002-11-22 18:34 keithp - - * Cursor.c, Xrender.h: Add animate cursor support, client side - -2002-11-21 18:10 keithp - - * Xrender.c: Skip unexpected data in QueryFormats. Deal with - broken X servers a bit better - -2002-11-14 13:01 tsi - - * Imakefile: First pass at imake warnings. + some ATI driver - formatting changes. - - Please ensure these changes are reflected in DRI's CVS. - -2002-11-06 14:47 keithp - - * Xrender.c, Xrender.h: XRenderQueryPictIndexValues support (from - Olivier Chapuis). Bump Render version to 0.7 - -2002-11-05 15:22 keithp - - * Glyph.c, Trap.c, Tri.c, Xrenderint.h: Render uses int for 32 - bits, Xlib uses long. This matters on alpha - -2002-10-17 18:13 keithp - - * Glyph.c: Miscomputing request length for String16 and String32 - -2002-10-01 07:31 alanh - - * Xrender-def.cpp: 358. Enable version controlled .dll's on - Cygwin/XFree86 (Alexander Gottwald). - 357. Some build fixes for Cygwin/XFree86 (Alan Hourihane). - -2002-09-29 16:39 keithp - - * Xrender.c, Xrender.h: Update RandR to 1.0 (library version 2.0) - -2002-09-27 09:40 keithp - - * Trap.c: Obey max request length even with BIG-REQUESTS - -2002-09-25 19:56 keithp - - * Filter.c, Imakefile, Picture.c, Xrender.c, Xrender.h, - Xrenderint.h: Add image transformation and sub-pixel ordering to - Render - -2002-08-31 11:15 keithp - - * Glyph.c: Remember not to write code at 1am. - CompositeText{8,16,32} werent switching glyphsets at the right - time. - -2002-08-30 23:52 keithp - - * Glyph.c: CompositeGlyphs functions were re-using overwritten data - and trashing the output buffer - -2002-08-22 22:48 keithp - - * Cursor.c, Imakefile, Xrender.h: Add CreateCursor request to - Render - -2002-07-24 08:26 tsi - - * Imakefile: Make libXrender buildable in non-XFree86 environments. - -2002-06-07 11:04 keithp - - * Imakefile: Get Xrender to build out of the XFree86 environment - -2002-06-04 16:22 keithp - - * Poly.c: Free edges structure after drawing Render polygons - -2002-05-30 23:38 keithp - - * Imakefile: Fix up support for building Xft1, Xrender and - fontconfig out of the tree - -2002-05-21 13:39 keithp - - * Poly.c: Xrender library didnt render some concave polygons right - -2002-05-17 16:54 keithp - - * Xrender.c: standard 1-bit render format had incorrect depth in - spec - -2002-05-17 15:34 keithp - - * Color.c, Imakefile, Xrender.h: Add Render color parse routine for - rgba colorspace - -2002-05-16 23:54 keithp - - * Poly.c: Another tesselation fix for Rendered polygons - -2002-05-16 08:28 tsi - - * Poly.c: Warning fix - -2002-05-14 23:43 keithp - - * Tri.c: Fix up triangle request encodings - -2002-05-14 23:42 keithp - - * Xrender.c, Xrender.h: Add XRenderFindStandardFormat - -2002-05-14 23:39 keithp - - * Poly.c: Redo tesselation to match foley and vanDam - -2002-05-13 00:21 keithp - - * Poly.c: Make tesselation function do something reasonable - -2002-05-12 22:21 keithp - - * Imakefile, Xrender.h, Poly.c, Trap.c, Tri.c: Update render - extension to include trapezoids - -2002-02-11 23:17 keithp - - * Glyph.c: XRenderFreeGlyphs wasnt sending the glyphset - -2002-01-02 11:57 tsi - - * Glyph.c, Xrender.h: Resync with today's trunk. - -2001-12-26 17:16 keithp - - * Glyph.c, Xrender.h: Add Render equivalents of XPolyText* - -2001-12-18 09:08 tsi - - * FillRect.c, FillRects.c, Glyph.c, Picture.c, Xrender.c, - Xrender.h: Another resync with HEAD branch. - -2001-12-16 10:27 keithp - - * FillRect.c, FillRects.c, Glyph.c, Picture.c, Xrender.c, - Xrender.h: lib/Xrender: add a bunch of _Xconst to make c++ happier - -2001-10-10 20:26 keithp - - * Xrender.c: Check malloc return for Xrender query reply temp data - -2001-09-05 13:13 mvojkovi - - * Xrender.c: - Missing SyncHandle() in XRenderQueryFormats. - -2001-07-31 17:44 tsi - - * Xrender.h: 168. Fix 16bpp colour maps on Mach64's (Marc La - France). - 167. Fix Mach64 DPMS bug (Marc La France). - 166. Fix bug that prevented hardware cursors on Mach64 CT's (Marc - La France). - 165. Document what a ChipAdjustFrame() function should to to - prevent moving - of hardware cursors during mode switches (Marc La France). - 164. -Wimplicit warning cleanup [`make World` >required<] (Marc La - France). - 163. Ensure installed headers can find the headers they, in turn, - #include - (Marc La France). - 162. Make imake pass its -W* flags to cpp (Marc La France). - 161. More accomodations for newer GCC's (Mike A. Harris). - -2001-07-06 13:46 keithp - - * Xrender.c: Fix a couple of locking bugs in Xrender library - -2001-05-16 03:33 keithp - - * Xrender.c: Clean up memory leaks in Xrender library - -2001-02-13 11:19 dawes - - * Xrender-def.cpp: 135. Updates for Cygwin support (#4433, Suhaib - M. Siddiqi). - 134. Fix a bug in the fonts.sgml doc (#4432, Juliusz Chroboczek). - 133. Fix the xdpyinfo so that it will build when the XKB extension - isn't - defined (#4422, Jim Gettys). - 132. Fix the xdm greeter so that it will build when the XKB - extension isn't - defined (#4421, Jim Gettys). - 131. Only build setxkbmap when building the XKB lib support (based - on #4420, - Jim Gettys). - 130. Improve the mga driver messages when the HAL module isn't - available - (#4451, David Woodhouse). - 129. Add G450 support to the mga driver (#4416, Luugi Marsan - (Matrox), - 4449, David Woodhouse). - 128. Mga driver updates, including HAL cleanups, add a Crtc2Ram - option, - and merge with Matrox beta4 source (#4415, Antii Tapaninen, - #4423, - Simon Hosie). - 127. Fix a rounding problem in the wacom driver that was causing - some - position instability (#4417, Hannes Eriksson). - -2000-12-07 15:55 keithp - - * Picture.c: Xrender: missing mask field in ChangePictureAttributes - request encoding - -2000-12-04 23:42 keithp - - * Picture.c: Xft,Xrender: make clip rectangles actually work - -2000-12-04 19:13 keithp - - * Picture.c, Xrender.h: Xft,Xrender,Render: c++ support, clip - rectangles, warnings - -2000-12-04 13:01 dawes - - * Xrender-def.cpp: missing ident lines - -2000-12-04 10:49 dawes - - * Xrender-def.cpp: 1085. Updates for Hurd support (#A.209, Marcus - Brinkmann). 1084. Bump the minor revisions of libXmu (UTF8_STRING) - and libX11 (Xutf8LookupString). 1083. Fixes for all known - bugs in the CompoundText parser and generator, (#4333, Bruno - Haible). 1082. Fix documentation for XSetOMValues() (#4332, Bruno - Haible). 1081. Fix namespace polution in introduced - with patch #4293 (#4331, Bruno Haible). 1080. Fix a bug in - the newly introduced Xutf8LookupString() function that loses - input not representable in the locale encoding (#4330, Bruno - Haible). 1079. Avoid four new gcc warnings about const in lcUTF8.c - introduced by patch #4293 (#4329, Bruno Haible). 1078. Fix - some additional cases of confusing local typedef for wchar_t - (#4328, Bruno Haible). 1077. Fix some round-trip conversion errors - in COMPOUND_TEXT -> UTF8_STRING -> COMPOUND_TEXT due to wrong - tables introduced by patches #4214, 4215 (#4327, Pablo - Saratxaga). 1076. Cygwin update for building Xrender DLL (#4326, - Suhaib M. Siddiqi). 1075. Fix an undefined SUBDIRS in - xc/lib/GL/mesa/src/drv/Imakefile when compiling on something - other than x86, alpha or sparc (#4325, Brian Paul). 1074. - Don't have the neomagic driver disable stretching when a mode that - fills the panel is selected (#4324, Andrew C. Aitchison). - 1073. Fix a bug in Xlib's _XimLocalMbLookupString() that causes a - crash when a zero keycode keypress event is received (#4322, - HIBINO Kei). - -2000-12-03 15:41 keithp - - * Xrender.h: Xrender: prototype using "template" collides with - reserved c++ word - -2000-12-02 01:38 keithp - - * Glyph.c: Xrender: 16/32 bit glyph functions using wrong minor - request code - -2000-12-01 13:31 keithp - - * Glyph.c, Picture.c, Xrender.c, Xrender.h: Xrender/Xft: handle - long strings, use unsigned int for 32-bit glyphs - -2000-11-29 00:25 keithp - - * Glyph.c, Xrender.h: add 16/32 bit glyph rendering to Xrender - library - -2000-11-19 23:13 keithp - - * FillRect.c, FillRects.c, Imakefile, Picture.c, Xrender.h: Add - component alpha to Render extension - -2000-08-27 19:43 tsi - - * Composite.c, Glyph.c, Picture.c, Xrender.c, Xrender.h, - Xrenderint.h: Ident lines - -2000-08-26 09:37 keithp - - * Imakefile: Get render library to actually build and install - correctly - -2000-08-25 17:38 keithp - - * Composite.c, Glyph.c, Imakefile, Picture.c, Xrender.c, Xrender.h, - Xrenderint.h: Add Xrender library - diff --git a/nx-X11/lib/Xrender/INSTALL b/nx-X11/lib/Xrender/INSTALL deleted file mode 100644 index 835f6080a..000000000 --- a/nx-X11/lib/Xrender/INSTALL +++ /dev/null @@ -1,8 +0,0 @@ -Xrender is built with the traditional configure script: - - $ ./configure --prefix=/usr/X11R6 - -This should generate valid Makefiles, then: - - $ make - $ make install diff --git a/nx-X11/lib/Xrender/Imakefile b/nx-X11/lib/Xrender/Imakefile index 72d149a20..35d826b22 100644 --- a/nx-X11/lib/Xrender/Imakefile +++ b/nx-X11/lib/Xrender/Imakefile @@ -147,14 +147,3 @@ DependTarget() distclean:: clean RemoveFile(Makefile) #endif - -all:: xrender.pc - -xrender.pc: xrender.pc.in - RemoveFile($@) - sh config-subst $(SUBSTVARS) < xrender.pc.in > $@ - -InstallNonExecFile(xrender.pc,$(USRLIBDIR)/pkgconfig) - -clean:: - RemoveFile(xrender.pc) diff --git a/nx-X11/lib/Xrender/NEWS b/nx-X11/lib/Xrender/NEWS deleted file mode 100644 index e69de29bb..000000000 diff --git a/nx-X11/lib/Xrender/README b/nx-X11/lib/Xrender/README deleted file mode 100644 index e69de29bb..000000000 diff --git a/nx-X11/lib/Xrender/autogen.sh b/nx-X11/lib/Xrender/autogen.sh deleted file mode 100755 index b1376df5a..000000000 --- a/nx-X11/lib/Xrender/autogen.sh +++ /dev/null @@ -1,3 +0,0 @@ -#! /bin/sh -autoreconf -v --install || exit 1 -./configure --enable-maintainer-mode "$@" diff --git a/nx-X11/lib/Xrender/config-subst b/nx-X11/lib/Xrender/config-subst deleted file mode 100644 index 5907e0328..000000000 --- a/nx-X11/lib/Xrender/config-subst +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/sh -script=config-subst.$$ -trap "rm $script" 0 -rm -f $script -for i in ${1+"$@"}; do - var="`echo "$i" | sed 's/=.*$//'`" - val="`echo "$i" | sed 's/^[^=]*=//'`" - echo "s;@$var@;$val;" >> $script -done -sed -f $script diff --git a/nx-X11/lib/Xrender/configure.ac b/nx-X11/lib/Xrender/configure.ac deleted file mode 100644 index a190657f3..000000000 --- a/nx-X11/lib/Xrender/configure.ac +++ /dev/null @@ -1,113 +0,0 @@ -dnl -dnl $Id: configure.ac,v 1.3 2004/08/07 00:40:40 keithp Exp $ -dnl -dnl Copyright © 2003 Keith Packard, Noah Levitt -dnl -dnl Permission to use, copy, modify, distribute, and sell this software and its -dnl documentation for any purpose is hereby granted without fee, provided that -dnl the above copyright notice appear in all copies and that both that -dnl copyright notice and this permission notice appear in supporting -dnl documentation, and that the name of Keith Packard not be used in -dnl advertising or publicity pertaining to distribution of the software without -dnl specific, written prior permission. Keith Packard makes no -dnl representations about the suitability of this software for any purpose. It -dnl is provided "as is" without express or implied warranty. -dnl -dnl KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, -dnl INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO -dnl EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR -dnl CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, -dnl DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER -dnl TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR -dnl PERFORMANCE OF THIS SOFTWARE. -dnl -dnl Process this file with autoconf to create configure. - -AC_PREREQ([2.57]) - -dnl -dnl Version should match the current Render version. XRenderQueryVersion -dnl returns the version from render.h, NOT the version we set here. But we -dnl try to keep these the same. Note that the library has an extra -dnl digit in the version number to track changes which don't affect the -dnl protocol, so Xrender version l.n.m corresponds to protocol version l.n -dnl -AC_INIT(libXrender, 0.9.0, [keithp@keithp.com], libXrender) -AM_INIT_AUTOMAKE([dist-bzip2]) -AM_MAINTAINER_MODE - -AM_CONFIG_HEADER(config.h) -AC_CONFIG_AUX_DIR(.) - -# Check for progs -AC_PROG_CC -AC_PROG_LIBTOOL - -# Check for X -PKG_CHECK_MODULES(X, x11, - [x_found_with_pkgconfig=yes], - [x_found_with_pkgconfig=no]) - -if test "$x_found_with_pkgconfig" = "yes" -then - X_REQUIRES="x11" - X_NON_PKG_CFLAGS="" - X_NON_PKG_LIBS="" -else - AC_PATH_XTRA - - if test "x$no_x" = "xyes" - then - AC_MSG_ERROR([X is required, but it was either disabled or not found.]) - fi - - # pkg-config adds the -l flag while AC_PATH_XTRA does not - - X_LIBS="$X_LIBS -lX11" - - # - # Check for XTHREADS support - # - save_LIBS="$LIBS" - save_CFLAGS="$CFLAGS" - CFLAGS="$CFLAGS $X_CFLAGS" - LIBS="$LIBS $X_LIBS" - - AC_MSG_CHECKING([for XTHREADS in Xlib]) - AC_RUN_IFELSE( - [AC_LANG_PROGRAM([[#include ]], - [[return XInitThreads() == 0 ? 0 : 1;]])], - [xthreads=no], - [xthreads=yes], - [xthreads=yes]) - - AC_MSG_RESULT($xthreads) - - LIBS="$save_LIBS" - CFLAGS="$save_CFLAGS" - - if test "x$xthreads" = "xyes" - then - X_CFLAGS="$X_CFLAGS -DXTHREADS" - fi - - X_REQUIRES="" - X_NON_PKG_CFLAGS="$X_CFLAGS" - X_NON_PKG_LIBS="$X_LIBS" -fi -AC_SUBST(X_REQUIRES) -AC_SUBST(X_NON_PKG_CFLAGS) -AC_SUBST(X_NON_PKG_LIBS) - -# Check render configuration, strip extra digits from package version to -# find the required protocol version - -if test "$VERSION" = "" ; then - VERSION=$PACKAGE_VERSION; -fi -RENDER_VERSION=[`echo $VERSION | sed 's/^\([0-9][0-9]*\.[0-9][0-9]*\).*$/\1/'`] -PKG_CHECK_MODULES(RENDER, render >= $RENDER_VERSION) - -AC_OUTPUT([Makefile - xrender.pc]) - diff --git a/nx-X11/lib/Xrender/xrender.pc.in b/nx-X11/lib/Xrender/xrender.pc.in deleted file mode 100644 index ec8abb5aa..000000000 --- a/nx-X11/lib/Xrender/xrender.pc.in +++ /dev/null @@ -1,11 +0,0 @@ -prefix=@prefix@ -exec_prefix=@exec_prefix@ -libdir=@libdir@ -includedir=@includedir@ - -Name: Xrender -Description: X Render Library -Version: @VERSION@ -Requires: @X_REQUIRES@ -Cflags: -I${includedir} @RENDER_CFLAGS@ @X_NON_PKG_CFLAGS@ -Libs: -L${libdir} -lNX_Xrender @X_NON_PKG_LIBS@ -- cgit v1.2.3