From bbf68f536efd4f4e03ccaee9ebcd1438c5b0a66b Mon Sep 17 00:00:00 2001 From: Alan Coopersmith Date: Mon, 27 Aug 2007 15:35:25 -0700 Subject: Change xset_CFLAGS to AM_CFLAGS to make automake-1.10 happier --- Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile.am b/Makefile.am index ababd43..765c7a1 100644 --- a/Makefile.am +++ b/Makefile.am @@ -21,7 +21,7 @@ bin_PROGRAMS = xset -xset_CFLAGS = $(XSET_CFLAGS) -D_BSD_SOURCE +AM_CFLAGS = $(XSET_CFLAGS) -D_BSD_SOURCE xset_LDADD = $(XSET_LIBS) xset_SOURCES = \ -- cgit v1.2.3 From ef35876a808a3cfbefecf59434118cb4d5cd3c3e Mon Sep 17 00:00:00 2001 From: Alan Coopersmith Date: Mon, 27 Aug 2007 15:55:30 -0700 Subject: Add *~ to .gitignore to skip emacs/patch droppings --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 0131547..6e89fb1 100644 --- a/.gitignore +++ b/.gitignore @@ -17,3 +17,4 @@ missing stamp-h1 xset xset.1 +*~ -- cgit v1.2.3 From 44d9468edbbbb19d73c488345ceef1073d1df3a7 Mon Sep 17 00:00:00 2001 From: Alan Coopersmith Date: Mon, 27 Aug 2007 15:56:14 -0700 Subject: Use autoconf to check for usleep before falling into twisty #ifdef maze --- configure.ac | 3 +++ xset.c | 10 ++++++++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index 3c91865..a43b200 100644 --- a/configure.ac +++ b/configure.ac @@ -30,6 +30,9 @@ AM_CONFIG_HEADER(config.h) AC_PROG_CC AC_PROG_INSTALL +# Checks for system functions +AC_CHECK_FUNCS([usleep]) + # Checks for pkg-config packages PKG_CHECK_MODULES(XSET, xmuu) diff --git a/xset.c b/xset.c index a77d977..c2676e0 100644 --- a/xset.c +++ b/xset.c @@ -87,8 +87,10 @@ in this Software without prior written authorization from The Open Group. #endif #undef BOOL #endif -#if defined(SVR4) && defined(sun) -#include +#ifndef HAVE_USLEEP +# if defined(SVR4) && defined(sun) +# include +# endif #endif #endif /* DPMSExtension */ @@ -575,6 +577,9 @@ for (i = 1; i < argc; ) { * * On OS/2, use _sleep2() */ +#ifdef HAVE_USLEEP +# define Usleep(us) usleep((us)) +#else #ifdef SVR4 # ifdef sun /* Anything to avoid linking with -lposix4 */ @@ -610,6 +615,7 @@ for (i = 1; i < argc; ) { # define Usleep(us) usleep((us)) # endif #endif +#endif /* HAVE_USLEEP */ if (strcmp(arg, "on") == 0) { DPMSEnable(dpy); -- cgit v1.2.3 From 4eca5d1de51926b640fd3d38db1a683740c64dd0 Mon Sep 17 00:00:00 2001 From: Alan Coopersmith Date: Mon, 27 Aug 2007 16:36:47 -0700 Subject: Replace static ChangeLog with dist-hook to generate from git log --- ChangeLog | 70 ------------------------------------------------------------- Makefile.am | 10 ++++++++- 2 files changed, 9 insertions(+), 71 deletions(-) delete mode 100644 ChangeLog diff --git a/ChangeLog b/ChangeLog deleted file mode 100644 index 490a352..0000000 --- a/ChangeLog +++ /dev/null @@ -1,70 +0,0 @@ -2006-04-26 Adam Jackson - - * configure.ac: - Bump to 1.0.2 - -2006-04-06 Alan Coopersmith - - * xset.c (set_lock): - Free modifier map when done with it (Coverity #823 & 824) - - * xset.c (xkbset_repeatrate): - Free Xkb keyboard description when done with it (Coverity #825) - -2005-12-20 Kevin E. Martin - - * configure.ac: - Update package version for X11R7 release. - -2005-12-14 Kevin E. Martin - - * configure.ac: - Update package version number for final X11R7 release candidate. - -2005-12-06 Kevin E. Martin - - * Makefile.am: - Change *man_SOURCES ==> *man_PRE to fix autotools warnings. - -2005-12-03 Kevin E. Martin - - * configure.ac: - Update package version number for X11R7 RC3 release. - -2005-11-20 Alan Coopersmith - - * configure.ac: - Change dependency from xmu to xmuu since the full xmu - (with all its baggage like Xt) is not needed here. - -2005-11-19 Alan Coopersmith - - * configure.ac: - Fix typo in XSET_LIBS setting so libXext is linked in properly. - -2005-11-19 Kevin E. Martin - - * configure.ac: - Update dependencies to work with separate build roots. - -2005-11-09 Kevin E. Martin - - * configure.ac: - Update package version number for X11R7 RC2 release. - -2005-10-20 Eric Anholt - - * configure.ac: - Fix check for fontcache to look for "xfontcache" (Bill Crawford) - -2005-10-18 Kevin E. Martin - - * configure.ac: - Update package version number for RC1 release. - -2005-08-29 Daniel Stone - - Bump to 0.99.1. - - * configure.ac: - Add support for more extensions. diff --git a/Makefile.am b/Makefile.am index 765c7a1..1ec91cd 100644 --- a/Makefile.am +++ b/Makefile.am @@ -35,8 +35,16 @@ appmandir = $(APP_MAN_DIR) appman_DATA = $(appman_PRE:man=@APP_MAN_SUFFIX@) -EXTRA_DIST = $(appman_PRE) +EXTRA_DIST = $(appman_PRE) ChangeLog autogen.sh CLEANFILES = $(appman_DATA) +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) + +dist-hook: ChangeLog SED = sed -- cgit v1.2.3 From 3decc85623f023a31b8c19526b29092a9f2d0357 Mon Sep 17 00:00:00 2001 From: Alan Coopersmith Date: Mon, 27 Aug 2007 16:37:20 -0700 Subject: Version bump: 1.0.3 --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index a43b200..815fd75 100644 --- a/configure.ac +++ b/configure.ac @@ -21,7 +21,7 @@ dnl dnl Process this file with autoconf to create configure. AC_PREREQ([2.57]) -AC_INIT(xset,[1.0.2], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],xset) +AC_INIT(xset,[1.0.3], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],xset) AM_INIT_AUTOMAKE([dist-bzip2]) AM_MAINTAINER_MODE -- cgit v1.2.3