Author: branden Date: 2004-04-19 12:03:13 -0500 (Mon, 19 Apr 2004) New Revision: 46
Added: vendor/AUTHORS Modified: vendor/ChangeLog vendor/Xcursor.h vendor/configure.ac vendor/xcursorint.h Log: Import Xcursor 1.1.3 (upstream CVS tag XCURSOR-1_1_3-RELEASE). Added: vendor/AUTHORS =================================================================== --- vendor/AUTHORS 2004-04-19 17:00:34 UTC (rev 45) +++ vendor/AUTHORS 2004-04-19 17:03:13 UTC (rev 46) @@ -0,0 +1,2 @@ +Keith Packard, HP + Modified: vendor/ChangeLog =================================================================== --- vendor/ChangeLog 2004-04-19 17:00:34 UTC (rev 45) +++ vendor/ChangeLog 2004-04-19 17:03:13 UTC (rev 46) @@ -1,3 +1,26 @@ +2004-04-13 Daniel Stone <[EMAIL PROTECTED]> + + * ChangeLog: + Tag 1.1.3, for xlibs 1.0.1. + +2004-04-07 Keith Packard <[EMAIL PROTECTED]> + + reviewed by: Michel Dänzer <[EMAIL PROTECTED]> + + * configure.ac: + Make sure X_CFLAGS/X_LIBS are substituted in the xcursor.pc file + +2004-02-24 Fredrik H�glund <[EMAIL PROTECTED]> + + * configure.ac: + * xcursorint.h: + Make the Xfixes code actually work by including the Xfixes.h + header file. + +2004-02-03 Jim Gettys <[EMAIL PROTECTED]> + + * AUTHORS: Add contents to author's file + 2004-01-17 Daniel Stone <[EMAIL PROTECTED]> * Xcursor.h: * configure.ac: Modified: vendor/Xcursor.h =================================================================== --- vendor/Xcursor.h 2004-04-19 17:00:34 UTC (rev 45) +++ vendor/Xcursor.h 2004-04-19 17:03:13 UTC (rev 46) @@ -1,5 +1,5 @@ /* - * $Id: Xcursor.h,v 1.11 2004/01/17 04:38:26 daniel Exp $ + * $Id: Xcursor.h,v 1.12 2004/04/12 14:11:12 daniel Exp $ * * Copyright � 2002 Keith Packard * @@ -77,7 +77,7 @@ #define XCURSOR_LIB_MAJOR 1 #define XCURSOR_LIB_MINOR 1 -#define XCURSOR_LIB_REVISION 2 +#define XCURSOR_LIB_REVISION 3 #define XCURSOR_LIB_VERSION ((XCURSOR_LIB_MAJOR * 10000) + \ (XCURSOR_LIB_MINOR * 100) + \ (XCURSOR_LIB_REVISION)) Modified: vendor/configure.ac =================================================================== --- vendor/configure.ac 2004-04-19 17:00:34 UTC (rev 45) +++ vendor/configure.ac 2004-04-19 17:03:13 UTC (rev 46) @@ -1,5 +1,5 @@ dnl -dnl $Id: configure.ac,v 1.11 2004/01/17 04:38:26 daniel Exp $ +dnl $Id: configure.ac,v 1.14 2004/04/12 14:11:12 daniel Exp $ dnl dnl Copyright © 2003 Keith Packard dnl @@ -30,7 +30,7 @@ dnl Yes, it is a pain to synchronize version numbers. Unfortunately, it's dnl not possible to extract the version number here from Xcursor.h dnl -AC_INIT([libXcursor],1.1.2,[EMAIL PROTECTED],[libXcursor]) +AC_INIT([libXcursor],1.1.3,[EMAIL PROTECTED],[libXcursor]) AM_INIT_AUTOMAKE([dist-bzip2]) AC_CONFIG_SRCDIR([Makefile.am]) AM_MAINTAINER_MODE @@ -102,6 +102,9 @@ fi fi +AC_SUBST(X_CFLAGS) +AC_SUBST(X_LIBS) + PKG_CHECK_MODULES(XRENDER, xrender >= 0.8.2, [xrender_found_with_pkgconfig=yes], [xrender_found_with_pkgconfig=no]) case "$xrender_found_with_pkgconfig" in @@ -132,7 +135,7 @@ esac ;; esac -PKG_CHECK_MODULES(XFIXES, xfixes) +PKG_CHECK_MODULES(XFIXES, xfixes, [AC_DEFINE_UNQUOTED(HAVE_XFIXES, 1, [Define to 1 if you have Xfixes])]) AC_SUBST(XRENDER_LIBS) AC_SUBST(XRENDER_CFLAGS) Modified: vendor/xcursorint.h =================================================================== --- vendor/xcursorint.h 2004-04-19 17:00:34 UTC (rev 45) +++ vendor/xcursorint.h 2004-04-19 17:03:13 UTC (rev 46) @@ -1,5 +1,5 @@ /* - * $Id: xcursorint.h,v 1.7 2003/09/30 05:28:20 keithp Exp $ + * $Id: xcursorint.h,v 1.8 2004/02/24 18:16:09 fredrik Exp $ * * Copyright � 2002 Keith Packard * @@ -32,6 +32,11 @@ #include <X11/Xlib.h> #include <X11/cursorfont.h> #include <X11/extensions/Xrender.h> + +#ifdef HAVE_XFIXES +#include <X11/extensions/Xfixes.h> +#endif + #include "Xcursor.h" #include "config.h"