libXmu: Branch 'master' - 3 commits

Alan Coopersmith alanc at kemper.freedesktop.org
Wed Sep 23 18:19:25 PDT 2009


 README          |    3 +++
 configure.ac    |   14 +++++---------
 src/Makefile.am |    2 +-
 3 files changed, 9 insertions(+), 10 deletions(-)

New commits:
commit c2c76abe51878f55e22c44c747f1243e56a4344b
Author: Alan Coopersmith <alan.coopersmith at sun.com>
Date:   Wed Sep 23 17:53:41 2009 -0700

    libXmu 1.0.5
    
    Signed-off-by: Alan Coopersmith <alan.coopersmith at sun.com>

diff --git a/configure.ac b/configure.ac
index 78c292b..f521572 100644
--- a/configure.ac
+++ b/configure.ac
@@ -5,7 +5,7 @@
 AC_PREREQ(2.57)
 
 AC_INIT([libXmu],
-        1.0.4,
+        1.0.5,
         [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
         libXmu)
 
commit 5b31bee92b56147e2c17d19e46e09145d765fdb4
Author: Alan Coopersmith <alan.coopersmith at sun.com>
Date:   Wed Sep 23 17:49:27 2009 -0700

    Migrate to xorg macros 1.3 & XORG_DEFAULT_OPTIONS
    
    Signed-off-by: Alan Coopersmith <alan.coopersmith at sun.com>

diff --git a/configure.ac b/configure.ac
index 48e2829..78c292b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -15,20 +15,19 @@ AM_INIT_AUTOMAKE([dist-bzip2])
 
 AM_MAINTAINER_MODE
 
-# Require xorg-macros: XORG_CWARNFLAGS, XORG_CHANGELOG, XORG_WITH_LINT
-m4_ifndef([XORG_MACROS_VERSION], [AC_FATAL([must install xorg-macros 1.2 or later before running autoconf/autogen])])
-XORG_MACROS_VERSION(1.2)
+# Require xorg-macros: XORG_DEFAULT_OPTIONS, XORG_WITH_LINT
+m4_ifndef([XORG_MACROS_VERSION], [AC_FATAL([must install xorg-macros 1.3 or later before running autoconf/autogen])])
+XORG_MACROS_VERSION(1.3)
 AM_CONFIG_HEADER([config.h])
 
 
 # Checks for programs.
 AC_PROG_LIBTOOL
 AC_PROG_CC
-XORG_CWARNFLAGS
+XORG_DEFAULT_OPTIONS
 
 # Checks for pkg-config packages
 PKG_CHECK_MODULES(XMU, xt xext x11 xextproto)
-XMU_CFLAGS="$CWARNFLAGS $XMU_CFLAGS"
 AC_SUBST(XMU_CFLAGS)
 AC_SUBST(XMU_LIBS)
 
@@ -63,9 +62,6 @@ XORG_LINT_LIBRARY([Xmu])
 LINTLIBUU=`echo $LINTLIB | sed s/Xmu/Xmuu/`
 AC_SUBST(LINTLIBUU)
 
-XORG_RELEASE_VERSION
-XORG_CHANGELOG
-
 AC_OUTPUT([Makefile
            include/Makefile
 	   src/Makefile
diff --git a/src/Makefile.am b/src/Makefile.am
index 0f19c5e..ad5b55d 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -7,7 +7,7 @@ AM_CPPFLAGS = \
 	-I${top_srcdir}/include/X11/Xmu \
 	$(BITMAP_DEFINES) -D_BSD_SOURCE
 
-AM_CFLAGS = $(XMU_CFLAGS)
+AM_CFLAGS = $(CWARNFLAGS) $(XMU_CFLAGS)
 
 libXmu_la_LDFLAGS = -version-number 6:2:0 -no-undefined
 libXmuu_la_LDFLAGS = -version-number 1:0:0 -no-undefined
commit fef063d82e332b96bcb12ce41abefce868821577
Author: Alan Coopersmith <alan.coopersmith at sun.com>
Date:   Wed Sep 23 17:47:16 2009 -0700

    Add pointer to API docs in xorg-docs to README
    
    Signed-off-by: Alan Coopersmith <alan.coopersmith at sun.com>

diff --git a/README b/README
index a77cc62..c7f4dcc 100644
--- a/README
+++ b/README
@@ -7,6 +7,9 @@ may choose not to distribute this library if they wish.  Therefore,
 applications developers who depend on this library should be prepared to
 treat it as part of their software base when porting.
 
+API documentation for this library is provided in the xorg-docs module,
+in the file specs/Xmu/Xmu.ms.
+
 All questions regarding this software should be directed at the
 Xorg mailing list:
 


More information about the xorg-commit mailing list