diff options
| author | marha <marha@users.sourceforge.net> | 2013-01-16 08:45:43 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2013-01-16 08:45:43 +0100 |
| commit | b8219a4680768e14b7fe4930adf86e9be261b31f (patch) | |
| tree | 193855ef8d48765d67cc11153a15e3c1e2568e50 /apps/xcalc/configure.ac | |
| parent | 15cdb95b194cb051a5d469cc9eb73eb0eed4db41 (diff) | |
| parent | 811d1bcf6d61ea49551abdd7f2294c5af2776913 (diff) | |
| download | vcxsrv-b8219a4680768e14b7fe4930adf86e9be261b31f.tar.gz vcxsrv-b8219a4680768e14b7fe4930adf86e9be261b31f.tar.bz2 vcxsrv-b8219a4680768e14b7fe4930adf86e9be261b31f.zip | |
Merge remote-tracking branch 'origin/released'
* origin/released:
Switched to xcalc-1.0.5
Switched to bdftopcf-1.0.4
libxtrans fontconfig glproto libX11 libXau libXext libXft libXinerama libXmu libfontenc mesa xkeyboard-config
Diffstat (limited to 'apps/xcalc/configure.ac')
| -rw-r--r-- | apps/xcalc/configure.ac | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/apps/xcalc/configure.ac b/apps/xcalc/configure.ac index c511b46ef..3a0fb2a87 100644 --- a/apps/xcalc/configure.ac +++ b/apps/xcalc/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 @@ -23,7 +23,7 @@ dnl Process this file with autoconf to create configure. # Initialize Autoconf AC_PREREQ([2.60]) -AC_INIT([xcalc], [1.0.4.1], +AC_INIT([xcalc], [1.0.5], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], [xcalc]) AC_CONFIG_SRCDIR([Makefile.am]) AC_CONFIG_HEADERS([config.h]) @@ -44,10 +44,13 @@ PKG_CHECK_MODULES(XCALC, xaw7 xt x11) 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 |