diff options
| author | Peter Hutterer <peter@cs.unisa.edu.au> | 2008-05-12 18:04:09 +0930 |
|---|---|---|
| committer | Peter Hutterer <peter@cs.unisa.edu.au> | 2008-05-12 18:04:09 +0930 |
| commit | 7e0b3b9029d3d12c9edf961c1d9db4cdbf021f1d (patch) | |
| tree | 49e200c1cf6aa112da54d6d637874edf02f6a78b | |
| parent | c4b0ae960d63f461d6e9efd64f70084f06a674b3 (diff) | |
| parent | 9884a41dd0282ca3dd19db5bf3a11554ee7eee57 (diff) | |
Merge branch 'master' into xge
| -rw-r--r-- | Makefile.am | 2 | ||||
| -rw-r--r-- | configure.ac | 8 | ||||
| -rw-r--r-- | src/XSecurity.c | 2 |
3 files changed, 8 insertions, 4 deletions
diff --git a/Makefile.am b/Makefile.am index a7443ff..611f6b3 100644 --- a/Makefile.am +++ b/Makefile.am @@ -6,6 +6,8 @@ pkgconfig_DATA = xext.pc EXTRA_DIST=xext.pc.in ChangeLog autogen.sh MAINTAINERCLEANFILES=ChangeLog +.PHONY: ChangeLog + ChangeLog: (GIT_DIR=$(top_srcdir)/.git git-log > .changelog.tmp && mv .changelog.tmp ChangeLog; rm -f .changelog.tmp) || (touch ChangeLog; echo 'git directory not found: installing possibly empty changelog.' >&2) diff --git a/configure.ac b/configure.ac index 6cd40f0..efb0e7d 100644 --- a/configure.ac +++ b/configure.ac @@ -3,7 +3,7 @@ AC_PREREQ(2.57) AC_INIT([libXext], - 1.0.3, + 1.0.4, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], libXext) @@ -21,11 +21,13 @@ XORG_MACROS_VERSION(1.1) # Determine .so library version per platform # based on SharedXextRev in monolith xc/config/cf/*Lib.tmpl AC_CANONICAL_HOST -case $host_os in +if test "x$XEXT_SOREV" = "x" ; then + case $host_os in openbsd*) XEXT_SOREV=8:0 ;; solaris*) XEXT_SOREV=0 ;; *) XEXT_SOREV=6:4:0 ;; -esac + esac +fi AC_SUBST(XEXT_SOREV) # Checks for programs. diff --git a/src/XSecurity.c b/src/XSecurity.c index 161ade3..9a09daa 100644 --- a/src/XSecurity.c +++ b/src/XSecurity.c @@ -78,7 +78,7 @@ static XExtensionHooks Security_extension_hooks = { }; static char *security_error_list[] = { - "BadAuthorization" + "BadAuthorization", "BadAuthorizationProtocol" }; |