aboutsummaryrefslogtreecommitdiff
path: root/apps/xclock/configure.ac
diff options
context:
space:
mode:
Diffstat (limited to 'apps/xclock/configure.ac')
-rw-r--r--apps/xclock/configure.ac23
1 files changed, 11 insertions, 12 deletions
diff --git a/apps/xclock/configure.ac b/apps/xclock/configure.ac
index 85cef18b0..c7ec91b76 100644
--- a/apps/xclock/configure.ac
+++ b/apps/xclock/configure.ac
@@ -23,7 +23,7 @@ dnl Process this file with autoconf to create configure.
AC_PREREQ([2.60])
AC_INIT([xclock],
- [1.0.5],
+ [1.0.6],
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
[xclock])
AM_INIT_AUTOMAKE([foreign dist-bzip2])
@@ -35,22 +35,20 @@ m4_ifndef([XORG_MACROS_VERSION],
XORG_MACROS_VERSION(1.8)
XORG_DEFAULT_OPTIONS
-AM_CONFIG_HEADER(config.h)
+AC_CONFIG_HEADERS([config.h])
-AC_PROG_CC
-AC_PROG_INSTALL
AC_CHECK_FUNCS([strlcpy getpid])
-AC_SEARCH_LIBS([iconv], [iconv],
- [AC_DEFINE(HAVE_ICONV, 1, [Define to 1 if iconv() is available.])])
+AM_ICONV
dnl Required dependencies
PKG_CHECK_MODULES(XCLOCK, xaw7 xmu x11)
+XCLOCK_LIBS="$XCLOCK_LIBS $LIBICONV"
dnl Optional dependencies
-AC_ARG_WITH(xft, AC_HELP_STRING([--with-xft],[Use Xft2 and Xrender for rendering (Default is YES)]),use_xft="$withval",use_xft="try")
+AC_ARG_WITH(xft, AS_HELP_STRING([--with-xft],[Use Xft2 and Xrender for rendering (Default is YES)]),use_xft="$withval",use_xft="try")
if test x$use_xft != xno ; then
PKG_CHECK_MODULES(XFT, [xrender xft])
AC_SEARCH_LIBS(sqrt, [m])
@@ -60,7 +58,7 @@ if test x$use_xft != xno ; then
AC_DEFINE([XFREE86_FT2],1,[Define to use Xft2 library])
fi
-AC_ARG_WITH(xkb, AC_HELP_STRING([--with-xkb],[Use XKB to sound bells (Default is YES)]),use_xkb="$withval",use_xkb="try")
+AC_ARG_WITH(xkb, AS_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
PKG_CHECK_MODULES(XKB, xkbfile)
XCLOCK_CFLAGS="$XCLOCK_CFLAGS $XKB_CFLAGS"
@@ -68,15 +66,16 @@ if test x$use_xkb != xno ; then
AC_DEFINE([XKB],1,[Define to use XkbStdBell])
fi
-AC_SUBST(XCLOCK_CFLAGS)
-AC_SUBST(XCLOCK_LIBS)
PKG_CHECK_MODULES(APPDEFS, xt)
xt_appdefaultdir=`$PKG_CONFIG --variable=appdefaultdir xt`
AC_ARG_WITH(appdefaultdir,
- AC_HELP_STRING([--with-appdefaultdir=<pathname>],
+ AS_HELP_STRING([--with-appdefaultdir=<pathname>],
[specify directory for app-defaults files (default is autodetected)]),
[appdefaultdir="$withval"], [appdefaultdir="${xt_appdefaultdir}"])
AC_SUBST(appdefaultdir)
-AC_OUTPUT([Makefile])
+AC_CONFIG_FILES([
+ Makefile
+ man/Makefile])
+AC_OUTPUT