update to xclock 1.0.4

1 files changed, 20 insertions, 10 deletions

diff --git a/app/xclock/configure.ac b/app/xclock/configure.ac
index 3ab38fbbb..3b3074f48 100644
--- a/app/xclock/configure.ac
+++ b/app/xclock/configure.ac
@@ -1,6 +1,6 @@
 
 dnl  Copyright 2005 Red Hat, Inc.
-dnl 
+dnl
 dnl  Permission to use, copy, modify, distribute, and sell this software and its
 dnl  documentation for any purpose is hereby granted without fee, provided that
 dnl  the above copyright notice appear in all copies and that both that
@@ -10,7 +10,7 @@ dnl  advertising or publicity pertaining to distribution of the software without
 dnl  specific, written prior permission.  Red Hat makes no
 dnl  representations about the suitability of this software for any purpose.  It
 dnl  is provided "as is" without express or implied warranty.
-dnl 
+dnl
 dnl  RED HAT DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
 dnl  INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
 dnl  EVENT SHALL RED HAT BE LIABLE FOR ANY SPECIAL, INDIRECT OR
@@ -22,20 +22,29 @@ dnl
 dnl Process this file with autoconf to create configure.
 
 AC_PREREQ([2.57])
-AC_INIT(xclock,[1.0.2], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],xclock)
+AC_INIT(xclock,[1.0.4], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],xclock)
 AM_INIT_AUTOMAKE([dist-bzip2])
 AM_MAINTAINER_MODE
 
+# Require xorg-macros: XORG_DEFAULT_OPTIONS
+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)
 
 AC_PROG_CC
 AC_PROG_INSTALL
 
-AC_CHECK_FUNCS([strlcpy])
+XORG_DEFAULT_OPTIONS
+
+AC_CHECK_FUNCS([strlcpy getpid])
+
+AC_SEARCH_LIBS([iconv], [iconv],
+	[AC_DEFINE(HAVE_ICONV, 1, [Define to 1 if iconv() is available.])])
 
 dnl Required dependencies
 PKG_CHECK_MODULES(XCLOCK_X11, x11)
-XAW_CHECK_XPRINT_SUPPORT(XAW)
+PKG_CHECK_MODULES(XAW, xaw7)
 XCLOCK_CFLAGS="$XCLOCK_X11_CFLAGS $XAW_CFLAGS"
 XCLOCK_LIBS="$XCLOCK_X11_LIBS $XAW_LIBS"
 
@@ -48,7 +57,7 @@ if test x$use_xft != xno ; then
 	XCLOCK_LIBS="$XCLOCK_LIBS $XFT_LIBS"
 	AC_DEFINE([XRENDER],1,[Define to use X Render Extension])
 	AC_DEFINE([XFREE86_FT2],1,[Define to use Xft2 library])
-fi	
+fi
 
 AC_ARG_WITH(xkb, AC_HELP_STRING([--with-xkb],[Use XKB to sound bells (Default is YES)]),use_xkb="$withval",use_xkb="try")
 if test x$use_xkb != xno ; then
@@ -62,10 +71,11 @@ AC_SUBST(XCLOCK_CFLAGS)
 AC_SUBST(XCLOCK_LIBS)
 
 PKG_CHECK_MODULES(APPDEFS, xt)
-appdefaultdir=$(pkg-config --variable=appdefaultdir xt)
+xt_appdefaultdir=$(pkg-config --variable=appdefaultdir xt)
+AC_ARG_WITH(appdefaultdir,
+	AC_HELP_STRING([--with-appdefaultdir=<pathname>],
+	  [specify directory for app-defaults files (default is autodetected)]),
+	[appdefaultdir="$withval"], [appdefaultdir="${xt_appdefaultdir}"])
 AC_SUBST(appdefaultdir)
 
-XORG_MANPAGE_SECTIONS
-XORG_RELEASE_VERSION
-
 AC_OUTPUT([Makefile])