diff options
| author | marha <marha@users.sourceforge.net> | 2010-10-05 10:44:08 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2010-10-05 10:44:08 +0000 |
| commit | bfa0c2fa423efa7ece6e54d5f30bbe95ca4bfc2a (patch) | |
| tree | 37c4a2982fb317254b1ea14dd06c355f9da7826a /apps/xclock/configure.ac | |
| parent | fe234aa555e2b16ac7836fee297878a6e3efe343 (diff) | |
| parent | 51f3d1e140307561f64c47dae1d44f912accb5cf (diff) | |
| download | vcxsrv-bfa0c2fa423efa7ece6e54d5f30bbe95ca4bfc2a.tar.gz vcxsrv-bfa0c2fa423efa7ece6e54d5f30bbe95ca4bfc2a.tar.bz2 vcxsrv-bfa0c2fa423efa7ece6e54d5f30bbe95ca4bfc2a.zip | |
svn merge ^/branches/released .
Diffstat (limited to 'apps/xclock/configure.ac')
| -rw-r--r-- | apps/xclock/configure.ac | 25 |
1 files changed, 13 insertions, 12 deletions
diff --git a/apps/xclock/configure.ac b/apps/xclock/configure.ac index 3b3074f48..85cef18b0 100644 --- a/apps/xclock/configure.ac +++ b/apps/xclock/configure.ac @@ -21,21 +21,25 @@ dnl PERFORMANCE OF THIS SOFTWARE. dnl dnl Process this file with autoconf to create configure. -AC_PREREQ([2.57]) -AC_INIT(xclock,[1.0.4], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],xclock) -AM_INIT_AUTOMAKE([dist-bzip2]) +AC_PREREQ([2.60]) +AC_INIT([xclock], + [1.0.5], + [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], + [xclock]) +AM_INIT_AUTOMAKE([foreign 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) +# Require X.Org macros 1.8 or later for MAN_SUBSTS set by XORG_MANPAGE_SECTIONS +m4_ifndef([XORG_MACROS_VERSION], + [m4_fatal([must install xorg-macros 1.8 or later before running autoconf/autogen])]) +XORG_MACROS_VERSION(1.8) +XORG_DEFAULT_OPTIONS AM_CONFIG_HEADER(config.h) AC_PROG_CC AC_PROG_INSTALL -XORG_DEFAULT_OPTIONS AC_CHECK_FUNCS([strlcpy getpid]) @@ -43,10 +47,7 @@ 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) -PKG_CHECK_MODULES(XAW, xaw7) -XCLOCK_CFLAGS="$XCLOCK_X11_CFLAGS $XAW_CFLAGS" -XCLOCK_LIBS="$XCLOCK_X11_LIBS $XAW_LIBS" +PKG_CHECK_MODULES(XCLOCK, xaw7 xmu x11) 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") @@ -71,7 +72,7 @@ AC_SUBST(XCLOCK_CFLAGS) AC_SUBST(XCLOCK_LIBS) PKG_CHECK_MODULES(APPDEFS, xt) -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)]), |