[PATCH:libXcursor] Set Xcursor.h version numbers from configure.ac

Alan Coopersmith alan.coopersmith at oracle.com
Fri Sep 16 21:55:24 PDT 2011


Actual changes between previous Xcursor.h & new Xcursor.h.in:

diff --git a/include/X11/Xcursor/Xcursor.h b/include/X11/Xcursor/Xcursor.h.in
similarity index 98%
rename from include/X11/Xcursor/Xcursor.h
rename to include/X11/Xcursor/Xcursor.h.in
index a2c0488..1a14386 100644
--- a/include/X11/Xcursor/Xcursor.h
+++ b/include/X11/Xcursor/Xcursor.h.in
@@ -69,14 +69,13 @@ typedef XcursorUInt XcursorPixel;
  #define XCURSOR_MAGIC  0x72756358  /* "Xcur" LSBFirst */

  /*
- * Current Xcursor version number.  This same number
- * must appear in the Xcursor configure.ac file. Yes,
- * it'a a pain to synchronize version numbers like this.
+ * Current Xcursor version number.  Will be substituted by configure
+ * from the version in the libXcursor configure.ac file.
   */

-#define XCURSOR_LIB_MAJOR      1
-#define XCURSOR_LIB_MINOR      1
-#define XCURSOR_LIB_REVISION   9
+#undef XCURSOR_LIB_MAJOR
+#undef XCURSOR_LIB_MINOR
+#undef XCURSOR_LIB_REVISION
  #define XCURSOR_LIB_VERSION    ((XCURSOR_LIB_MAJOR * 10000) + \
                                  (XCURSOR_LIB_MINOR * 100) + \
                                  (XCURSOR_LIB_REVISION))

Actual changes between previously installed Xcursor.h and the one
installed after this patch:

--- /usr/include/X11/Xcursor/Xcursor.h       2009-10-16 14:27:01.395512651 -0700
+++ /usr/include/X11/Xcursor/Xcursor.h       2011-09-16 21:40:45.855823311 -0700
@@ -1,3 +1,4 @@
+/* include/X11/Xcursor/Xcursor.h.  Generated from Xcursor.h.in by configure.  *
/
  /*
   * Copyright © 2002 Keith Packard
   *
@@ -69,14 +70,13 @@
  #define XCURSOR_MAGIC  0x72756358  /* "Xcur" LSBFirst */

  /*
- * Current Xcursor version number.  This same number
- * must appear in the Xcursor configure.ac file. Yes,
- * it'a a pain to synchronize version numbers like this.
+ * Current Xcursor version number.  Will be substituted by configure
+ * from the version in the libXcursor configure.ac file.
   */

-#define XCURSOR_LIB_MAJOR      1
-#define XCURSOR_LIB_MINOR      1
-#define XCURSOR_LIB_REVISION   9
+#define XCURSOR_LIB_MAJOR 1
+#define XCURSOR_LIB_MINOR 1
+#define XCURSOR_LIB_REVISION 12
  #define XCURSOR_LIB_VERSION    ((XCURSOR_LIB_MAJOR * 10000) + \
                                  (XCURSOR_LIB_MINOR * 100) + \
                                  (XCURSOR_LIB_REVISION))


-- 
	-Alan Coopersmith-        alan.coopersmith at oracle.com
	 Oracle Solaris Platform Engineering: X Window System



More information about the xorg-devel mailing list