diff options
| -rw-r--r-- | ChangeLog | 109 | ||||
| -rw-r--r-- | configure.ac | 41 |
2 files changed, 8 insertions, 142 deletions
@@ -1,108 +1,9 @@ -2005-04-16 Josh Triplett <josh@freedesktop.org> - - * Makefile.am: Tell automake about the manpage. - -2004-11-22 Carl Worth <cworth@cworth.org> - - * configure.ac: Remove AC_CONFIG_AUX_DIR (it was in the wrong - place for automake-1.9, and it was set to the default value - anyway). - -2004-07-26 Keith Packard <keithp@keithp.com> - - * Makefile.am: - * Region.c: (XFixesFetchRegion), (XFixesFetchRegionAndBounds), - (XFixesExpandRegion): - * Xfixes.c: (XFixesVersion): - * Xfixes.h: - * configure.ac: - Add XFixesExpandRegion and XFixesFetchRegionAndBounds - -2004-04-13 Daniel Stone <daniel@freedesktop.org> - - * Bump version to 2.0.2 for xlibs 1.0.1; no other changes. - -2004-04-01 Keith Packard <keithp@keithp.com> - - reviewed by: Bill Haneman - - * Region.c: (XFixesFetchRegion): - Forgot to store the region operand in the protocol request. - Made this function completely broken. +2005-05-17 <ssp@aware-of-vacuity.boston.redhat.com> -2004-03-08 Keith Packard <keithp@keithp.com> + * configure.ac: Remove rest of half-removed if statement - * Cursor.c: (XFixesGetCursorImage), (XFixesSetCursorName), - (XFixesChangeCursorByName): - * Xfixes.h: - Use 'const' in API to make C++ happy + * ChangeLog: remove irrelevant entries -2004-02-03 Jim Gettys <jg@freedesktop.org.org> - - * AUTHORS: Get a author file with contents. - -2004-01-15 Daniel Stone <daniel@fooishbar.org> - * Tag release 2.0.1 for first freedesktop.org clientside lib release. - -2004-01-15 Harold L Hunt II <huntharo@msu.edu> - * Makefile.am: Pass -no-undefined to libtool via LDFLAGS. - -2003-11-21 Keith Packard <keithp@keithp.com> - - * 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 <keithp@keithp.com> - - * 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 <keithp@keithp.com> - - * 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 <andersca@gnome.org> - - * configure.ac: - * randr-uninstalled.pc.in: - Add uninstalled pc file. - -2003-04-21 Keith Packard <keithp@keithp.com> +2005-04-16 Josh Triplett <josh@freedesktop.org> - + Added ChangeLog + * Makefile.am: Tell automake about the manpage. diff --git a/configure.ac b/configure.ac index 48f72c0..1195487 100644 --- a/configure.ac +++ b/configure.ac @@ -45,51 +45,16 @@ AC_PROG_CC AC_PROG_LIBTOOL # Check for X -PKG_CHECK_MODULES(X, x11, - [x_found_with_pkgconfig=yes], - [x_found_with_pkgconfig=no]) +PKG_CHECK_MODULES(X, x11) + 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 <X11/Xlib.h>]], - [[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]) +PKG_CHECK_MODULES(FIXESEXT, [fixesproto >= $FIXESEXT_VERSION]) AC_SUBST(FIXESEXT_CFLAGS) AC_SUBST(FIXESEXT_LIBS) |