summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
Diffstat (limited to 'app')
-rw-r--r--app/xcalc/ChangeLog146
-rw-r--r--app/xcalc/Makefile.in15
-rw-r--r--app/xcalc/aclocal.m4215
-rw-r--r--app/xcalc/actions.c169
-rw-r--r--app/xcalc/compile347
-rw-r--r--app/xcalc/config.h.in3
-rw-r--r--app/xcalc/configure721
-rw-r--r--app/xcalc/configure.ac7
-rw-r--r--app/xcalc/man/Makefile.in9
-rw-r--r--app/xcalc/math.c149
-rw-r--r--app/xcalc/xcalc.h17
11 files changed, 1219 insertions, 579 deletions
diff --git a/app/xcalc/ChangeLog b/app/xcalc/ChangeLog
index 61f32b47c..67a31586b 100644
--- a/app/xcalc/ChangeLog
+++ b/app/xcalc/ChangeLog
@@ -1,3 +1,149 @@
+commit 0fba659f91bebe1f92f4de2660bf806fd049350b
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Mon Jan 19 21:26:22 2015 -0800
+
+ xcalc 1.0.6
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit a647c9bd255c136f9e6e3e274ecf4253e9ead6d6
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Thu Aug 7 19:20:44 2014 -0700
+
+ Replace index() call with strchr()
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit a91574fe283263a3f9d91fb257ecb2c5b0a97541
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Mon Jun 2 22:10:55 2014 -0700
+
+ autogen.sh: Honor NOCONFIGURE=1
+
+ See http://people.gnome.org/~walters/docs/build-api.txt
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit 6387133e231ec16da4204fddaffafe70d077e5d8
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Mon Jun 2 22:10:55 2014 -0700
+
+ configure: Drop AM_MAINTAINER_MODE
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit 8afe5270310698d24fff370276c7fd91eb816720
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Tue Dec 17 08:24:45 2013 -0500
+
+ Replace signal_t with void
+
+ Now that Imake SIGNALRETURNSINT has been removed, the signal handler
+ function return type can only be void.
+
+ Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+ Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
+
+commit 40911339c45a880abbe6ad60dac4718a402d88ab
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Mon Dec 16 10:04:46 2013 -0500
+
+ Assume signal handlers return void, as C89 requires
+
+ Drops use of Imake's obsolete SIGNALRETURNSINT.
+
+ Reviewd-by: Mark Kettenis <kettenis@openbsd.org>
+ Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
+
+commit 25454313c637f2b6983ba289deed96141cec8000
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Tue Jul 9 23:01:23 2013 -0700
+
+ Mark functions noreturn as suggested by gcc -Wmissing-noreturn
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit de0e13ada857191a59c0e8f985d2317a7c41f43b
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Tue Jul 9 22:56:02 2013 -0700
+
+ Rename "e" arguments to "ev" to avoid shadowing e() function
+
+ Resolves many gcc warnings of the form:
+ actions.c: In function ‘add’:
+ actions.c:142:35: warning: declaration of ‘e’ shadows a global declaration
+ actions.c:57:13: warning: shadowed declaration is here [-Wshadow]
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit 40da34202dffa96197c6248a9d80894611e27921
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Tue Jul 9 22:53:07 2013 -0700
+
+ Remove redundant redeclaration of ‘factorial’
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit 1de8253f0ede02ec87d28b028de97da79adc12e2
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Tue Jul 9 22:49:21 2013 -0700
+
+ Replace sprintf & strcpy calls with snprintf & strlcpy
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit 3d58c22c4c2729d52b5278c0e6350c0f9f44cfa8
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Sat Jul 6 20:45:40 2013 -0700
+
+ Remove unused min & max macros from math.c
+
+ Flagged by clang:
+
+ math.c:33:9: warning: macro is not used [-Wunused-macros]
+ #define min(a,b) ((a) < (b) ? (a) : (b))
+ ^
+ math.c:34:9: warning: macro is not used [-Wunused-macros]
+ #define max(a,b) ((a) > (b) ? (a) : (b))
+ ^
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit 3e6d23bb9d57ae3d19e9eb47ced654669fca4d7c
+Author: Stéphane Aulery <lkppo@free.fr>
+Date: Sun Jul 7 02:02:46 2013 +0200
+
+ Use the new M_E symbol from math.h
+
+ Use the new M_E symbol from math.h and fix and a value of the same
+ accuracy if it's necessary to redefine M_E.
+
+ Signed-off-by: Stéphane Aulery <lkppo@free.fr>
+ Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit f3b065f03a7b68310b489d5d97b11985ef36e977
+Author: Stéphane Aulery <lkppo@free.fr>
+Date: Sun Jul 7 02:02:38 2013 +0200
+
+ Use the new M_PI symbol from math.h
+
+ Use the new M_PI symbol from math.h and fix and a value of the same
+ accuracy if it's necessary to redefine M_PI.
+
+ Signed-off-by: Stéphane Aulery <lkppo@free.fr>
+ Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit b9a89876666a42ad8692e8384a5a826456e6ae56
+Author: Stéphane Aulery <lkppo@free.fr>
+Date: Sat Jul 6 15:39:07 2013 +0200
+
+ Drop CRAY support
+
+ Signed-off-by: Stéphane Aulery <lkppo@free.fr>
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
commit 7e67bcb9563302f4e89be7a2afb1ae30c185689e
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Mon Jan 14 23:08:54 2013 -0800
diff --git a/app/xcalc/Makefile.in b/app/xcalc/Makefile.in
index 772e78464..f119df9e6 100644
--- a/app/xcalc/Makefile.in
+++ b/app/xcalc/Makefile.in
@@ -76,8 +76,8 @@ bin_PROGRAMS = xcalc$(EXEEXT)
subdir = .
DIST_COMMON = README $(am__configure_deps) $(dist_appdefault_DATA) \
$(srcdir)/Makefile.am $(srcdir)/Makefile.in \
- $(srcdir)/config.h.in $(top_srcdir)/configure AUTHORS COPYING \
- ChangeLog INSTALL NEWS config.guess config.sub depcomp \
+ $(srcdir)/config.h.in $(top_srcdir)/configure COPYING \
+ ChangeLog INSTALL NEWS compile config.guess config.sub depcomp \
install-sh missing
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/configure.ac
@@ -262,7 +262,6 @@ LIBS = @LIBS@
LIB_MAN_DIR = @LIB_MAN_DIR@
LIB_MAN_SUFFIX = @LIB_MAN_SUFFIX@
LTLIBOBJS = @LTLIBOBJS@
-MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
MAN_SUBSTS = @MAN_SUBSTS@
MISC_MAN_DIR = @MISC_MAN_DIR@
@@ -278,6 +277,8 @@ PACKAGE_URL = @PACKAGE_URL@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
@@ -362,7 +363,7 @@ all: config.h
.SUFFIXES: .c .o .obj
am--refresh: Makefile
@:
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
+$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
@for dep in $?; do \
case '$(am__configure_deps)' in \
*$$dep*) \
@@ -389,9 +390,9 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
$(SHELL) ./config.status --recheck
-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+$(top_srcdir)/configure: $(am__configure_deps)
$(am__cd) $(srcdir) && $(AUTOCONF)
-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): $(am__aclocal_m4_deps)
$(am__cd) $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
$(am__aclocal_m4_deps):
@@ -402,7 +403,7 @@ config.h: stamp-h1
stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status
@rm -f stamp-h1
cd $(top_builddir) && $(SHELL) ./config.status config.h
-$(srcdir)/config.h.in: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+$(srcdir)/config.h.in: $(am__configure_deps)
($(am__cd) $(top_srcdir) && $(AUTOHEADER))
rm -f stamp-h1
touch $@
diff --git a/app/xcalc/aclocal.m4 b/app/xcalc/aclocal.m4
index 342604fe9..ab0fe6a65 100644
--- a/app/xcalc/aclocal.m4
+++ b/app/xcalc/aclocal.m4
@@ -20,6 +20,7 @@ If you have problems, you may need to regenerate the build system entirely.
To do so, use the procedure documented by the package, typically 'autoreconf'.])])
# pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*-
+# serial 1 (pkg-config-0.24)
#
# Copyright © 2004 Scott James Remnant <scott@netsplit.com>.
#
@@ -46,8 +47,12 @@ To do so, use the procedure documented by the package, typically 'autoreconf'.])
# ----------------------------------
AC_DEFUN([PKG_PROG_PKG_CONFIG],
[m4_pattern_forbid([^_?PKG_[A-Z_]+$])
-m4_pattern_allow([^PKG_CONFIG(_PATH)?$])
-AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])dnl
+m4_pattern_allow([^PKG_CONFIG(_(PATH|LIBDIR|SYSROOT_DIR|ALLOW_SYSTEM_(CFLAGS|LIBS)))?$])
+m4_pattern_allow([^PKG_CONFIG_(DISABLE_UNINSTALLED|TOP_BUILD_DIR|DEBUG_SPEW)$])
+AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])
+AC_ARG_VAR([PKG_CONFIG_PATH], [directories to add to pkg-config's search path])
+AC_ARG_VAR([PKG_CONFIG_LIBDIR], [path overriding pkg-config's built-in search path])
+
if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
AC_PATH_TOOL([PKG_CONFIG], [pkg-config])
fi
@@ -60,7 +65,6 @@ if test -n "$PKG_CONFIG"; then
AC_MSG_RESULT([no])
PKG_CONFIG=""
fi
-
fi[]dnl
])# PKG_PROG_PKG_CONFIG
@@ -69,34 +73,32 @@ fi[]dnl
# Check to see whether a particular set of modules exists. Similar
# to PKG_CHECK_MODULES(), but does not set variables or print errors.
#
-#
-# Similar to PKG_CHECK_MODULES, make sure that the first instance of
-# this or PKG_CHECK_MODULES is called, or make sure to call
-# PKG_CHECK_EXISTS manually
+# Please remember that m4 expands AC_REQUIRE([PKG_PROG_PKG_CONFIG])
+# only at the first occurence in configure.ac, so if the first place
+# it's called might be skipped (such as if it is within an "if", you
+# have to call PKG_CHECK_EXISTS manually
# --------------------------------------------------------------
AC_DEFUN([PKG_CHECK_EXISTS],
[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
if test -n "$PKG_CONFIG" && \
AC_RUN_LOG([$PKG_CONFIG --exists --print-errors "$1"]); then
- m4_ifval([$2], [$2], [:])
+ m4_default([$2], [:])
m4_ifvaln([$3], [else
$3])dnl
fi])
-
# _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES])
# ---------------------------------------------
m4_define([_PKG_CONFIG],
-[if test -n "$PKG_CONFIG"; then
- if test -n "$$1"; then
- pkg_cv_[]$1="$$1"
- else
- PKG_CHECK_EXISTS([$3],
- [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`],
- [pkg_failed=yes])
- fi
-else
- pkg_failed=untried
+[if test -n "$$1"; then
+ pkg_cv_[]$1="$$1"
+ elif test -n "$PKG_CONFIG"; then
+ PKG_CHECK_EXISTS([$3],
+ [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`
+ test "x$?" != "x0" && pkg_failed=yes ],
+ [pkg_failed=yes])
+ else
+ pkg_failed=untried
fi[]dnl
])# _PKG_CONFIG
@@ -138,16 +140,17 @@ and $1[]_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.])
if test $pkg_failed = yes; then
+ AC_MSG_RESULT([no])
_PKG_SHORT_ERRORS_SUPPORTED
if test $_pkg_short_errors_supported = yes; then
- $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$2"`
+ $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$2" 2>&1`
else
- $1[]_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"`
+ $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$2" 2>&1`
fi
# Put the nasty error message in config.log where it belongs
echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD
- ifelse([$4], , [AC_MSG_ERROR(dnl
+ m4_default([$4], [AC_MSG_ERROR(
[Package requirements ($2) were not met:
$$1_PKG_ERRORS
@@ -155,28 +158,67 @@ $$1_PKG_ERRORS
Consider adjusting the PKG_CONFIG_PATH environment variable if you
installed software in a non-standard prefix.
-_PKG_TEXT
-])],
- [AC_MSG_RESULT([no])
- $4])
+_PKG_TEXT])[]dnl
+ ])
elif test $pkg_failed = untried; then
- ifelse([$4], , [AC_MSG_FAILURE(dnl
+ AC_MSG_RESULT([no])
+ m4_default([$4], [AC_MSG_FAILURE(
[The pkg-config script could not be found or is too old. Make sure it
is in your PATH or set the PKG_CONFIG environment variable to the full
path to pkg-config.
_PKG_TEXT
-To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.])],
- [$4])
+To get pkg-config, see <http://pkg-config.freedesktop.org/>.])[]dnl
+ ])
else
$1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS
$1[]_LIBS=$pkg_cv_[]$1[]_LIBS
AC_MSG_RESULT([yes])
- ifelse([$3], , :, [$3])
+ $3
fi[]dnl
])# PKG_CHECK_MODULES
+
+# PKG_INSTALLDIR(DIRECTORY)
+# -------------------------
+# Substitutes the variable pkgconfigdir as the location where a module
+# should install pkg-config .pc files. By default the directory is
+# $libdir/pkgconfig, but the default can be changed by passing
+# DIRECTORY. The user can override through the --with-pkgconfigdir
+# parameter.
+AC_DEFUN([PKG_INSTALLDIR],
+[m4_pushdef([pkg_default], [m4_default([$1], ['${libdir}/pkgconfig'])])
+m4_pushdef([pkg_description],
+ [pkg-config installation directory @<:@]pkg_default[@:>@])
+AC_ARG_WITH([pkgconfigdir],
+ [AS_HELP_STRING([--with-pkgconfigdir], pkg_description)],,
+ [with_pkgconfigdir=]pkg_default)
+AC_SUBST([pkgconfigdir], [$with_pkgconfigdir])
+m4_popdef([pkg_default])
+m4_popdef([pkg_description])
+]) dnl PKG_INSTALLDIR
+
+
+# PKG_NOARCH_INSTALLDIR(DIRECTORY)
+# -------------------------
+# Substitutes the variable noarch_pkgconfigdir as the location where a
+# module should install arch-independent pkg-config .pc files. By
+# default the directory is $datadir/pkgconfig, but the default can be
+# changed by passing DIRECTORY. The user can override through the
+# --with-noarch-pkgconfigdir parameter.
+AC_DEFUN([PKG_NOARCH_INSTALLDIR],
+[m4_pushdef([pkg_default], [m4_default([$1], ['${datadir}/pkgconfig'])])
+m4_pushdef([pkg_description],
+ [pkg-config arch-independent installation directory @<:@]pkg_default[@:>@])
+AC_ARG_WITH([noarch-pkgconfigdir],
+ [AS_HELP_STRING([--with-noarch-pkgconfigdir], pkg_description)],,
+ [with_noarch_pkgconfigdir=]pkg_default)
+AC_SUBST([noarch_pkgconfigdir], [$with_noarch_pkgconfigdir])
+m4_popdef([pkg_default])
+m4_popdef([pkg_description])
+]) dnl PKG_NOARCH_INSTALLDIR
+
# Copyright (C) 2002-2012 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
@@ -757,44 +799,6 @@ fi
rmdir .tst 2>/dev/null
AC_SUBST([am__leading_dot])])
-# Add --enable-maintainer-mode option to configure. -*- Autoconf -*-
-# From Jim Meyering
-
-# Copyright (C) 1996-2012 Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# AM_MAINTAINER_MODE([DEFAULT-MODE])
-# ----------------------------------
-# Control maintainer-specific portions of Makefiles.
-# Default is to disable them, unless 'enable' is passed literally.
-# For symmetry, 'disable' may be passed as well. Anyway, the user
-# can override the default with the --enable/--disable switch.
-AC_DEFUN([AM_MAINTAINER_MODE],
-[m4_case(m4_default([$1], [disable]),
- [enable], [m4_define([am_maintainer_other], [disable])],
- [disable], [m4_define([am_maintainer_other], [enable])],
- [m4_define([am_maintainer_other], [enable])
- m4_warn([syntax], [unexpected argument to AM@&t@_MAINTAINER_MODE: $1])])
-AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles])
- dnl maintainer-mode's default is 'disable' unless 'enable' is passed
- AC_ARG_ENABLE([maintainer-mode],
- [AS_HELP_STRING([--]am_maintainer_other[-maintainer-mode],
- am_maintainer_other[ make rules and dependencies not useful
- (and sometimes confusing) to the casual installer])],
- [USE_MAINTAINER_MODE=$enableval],
- [USE_MAINTAINER_MODE=]m4_if(am_maintainer_other, [enable], [no], [yes]))
- AC_MSG_RESULT([$USE_MAINTAINER_MODE])
- AM_CONDITIONAL([MAINTAINER_MODE], [test $USE_MAINTAINER_MODE = yes])
- MAINT=$MAINTAINER_MODE_TRUE
- AC_SUBST([MAINT])dnl
-]
-)
-
-AU_DEFUN([jm_MAINTAINER_MODE], [AM_MAINTAINER_MODE])
-
# Check to see how 'make' treats includes. -*- Autoconf -*-
# Copyright (C) 2001-2012 Free Software Foundation, Inc.
@@ -1201,7 +1205,7 @@ AC_SUBST([am__untar])
dnl xorg-macros.m4. Generated from xorg-macros.m4.in xorgversion.m4 by configure.
dnl
dnl Copyright (c) 2005, 2006, Oracle and/or its affiliates. All rights reserved.
-dnl
+dnl
dnl Permission is hereby granted, free of charge, to any person obtaining a
dnl copy of this software and associated documentation files (the "Software"),
dnl to deal in the Software without restriction, including without limitation
@@ -1234,10 +1238,10 @@ dnl DEALINGS IN THE SOFTWARE.
# [m4_fatal([must install xorg-macros 1.1 or later before running autoconf/autogen])])
#
#
-# See the "minimum version" comment for each macro you use to see what
+# See the "minimum version" comment for each macro you use to see what
# version you require.
m4_defun([XORG_MACROS_VERSION],[
-m4_define([vers_have], [1.17])
+m4_define([vers_have], [1.19.0])
m4_define([maj_have], m4_substr(vers_have, 0, m4_index(vers_have, [.])))
m4_define([maj_needed], m4_substr([$1], 0, m4_index([$1], [.])))
m4_if(m4_cmp(maj_have, maj_needed), 0,,
@@ -1257,7 +1261,7 @@ m4_undefine([maj_needed])
# such as man pages and config files
AC_DEFUN([XORG_PROG_RAWCPP],[
AC_REQUIRE([AC_PROG_CPP])
-AC_PATH_PROGS(RAWCPP, [cpp], [${CPP}],
+AC_PATH_PROGS(RAWCPP, [cpp], [${CPP}],
[$PATH:/bin:/usr/bin:/usr/lib:/usr/libexec:/usr/ccs/lib:/usr/ccs/lbin:/lib])
# Check for flag to avoid builtin definitions - assumes unix is predefined,
@@ -1287,6 +1291,7 @@ if test `${RAWCPP} < conftest.$ac_ext | grep -c 'preserve \"'` -eq 1 ; then
AC_MSG_RESULT([no])
else
if test `${RAWCPP} -traditional < conftest.$ac_ext | grep -c 'preserve \"'` -eq 1 ; then
+ TRADITIONALCPPFLAGS="-traditional"
RAWCPPFLAGS="${RAWCPPFLAGS} -traditional"
AC_MSG_RESULT([yes])
else
@@ -1295,6 +1300,7 @@ else
fi
rm -f conftest.$ac_ext
AC_SUBST(RAWCPPFLAGS)
+AC_SUBST(TRADITIONALCPPFLAGS)
]) # XORG_PROG_RAWCPP
# XORG_MANPAGE_SECTIONS()
@@ -1819,9 +1825,10 @@ AM_CONDITIONAL([HAVE_ASCIIDOC], [test "$have_asciidoc" = yes])
]) # XORG_WITH_ASCIIDOC
# XORG_WITH_DOXYGEN([MIN-VERSION], [DEFAULT])
-# --------------------------------
+# -------------------------------------------
# Minimum version: 1.5.0
# Minimum version for optional DEFAULT argument: 1.11.0
+# Minimum version for optional DOT checking: 1.18.0
#
# Documentation tools are not always available on all platforms and sometimes
# not at the appropriate level. This macro enables a module to test for the
@@ -1841,6 +1848,7 @@ AM_CONDITIONAL([HAVE_ASCIIDOC], [test "$have_asciidoc" = yes])
#
AC_DEFUN([XORG_WITH_DOXYGEN],[
AC_ARG_VAR([DOXYGEN], [Path to doxygen command])
+AC_ARG_VAR([DOT], [Path to the dot graphics utility])
m4_define([_defopt], m4_default([$2], [auto]))
AC_ARG_WITH(doxygen,
AS_HELP_STRING([--with-doxygen],
@@ -1884,6 +1892,20 @@ m4_ifval([$1],
AC_MSG_ERROR([doxygen version $doxygen_version found, but $1 needed])
fi])
fi])
+
+dnl Check for DOT if we have doxygen. The caller decides if it is mandatory
+dnl HAVE_DOT is a variable that can be used in your doxygen.in config file:
+dnl HAVE_DOT = @HAVE_DOT@
+HAVE_DOT=no
+if test "x$have_doxygen" = "xyes"; then
+ AC_PATH_PROG([DOT], [dot])
+ if test "x$DOT" != "x"; then
+ HAVE_DOT=yes
+ fi
+fi
+
+AC_SUBST([HAVE_DOT])
+AM_CONDITIONAL([HAVE_DOT], [test "$HAVE_DOT" = "yes"])
AM_CONDITIONAL([HAVE_DOXYGEN], [test "$have_doxygen" = yes])
]) # XORG_WITH_DOXYGEN
@@ -2066,6 +2088,29 @@ fi])
AM_CONDITIONAL([HAVE_FOP], [test "$have_fop" = yes])
]) # XORG_WITH_FOP
+# XORG_WITH_M4([MIN-VERSION])
+# ---------------------------
+# Minimum version: 1.19.0
+#
+# This macro attempts to locate an m4 macro processor which supports
+# -I option and is only useful for modules relying on M4 in order to
+# expand macros in source code files.
+#
+# Interface to module:
+# M4: returns the path of the m4 program found
+# returns the path set by the user in the environment
+#
+AC_DEFUN([XORG_WITH_M4], [
+AC_CACHE_CHECK([for m4 that supports -I option], [ac_cv_path_M4],
+ [AC_PATH_PROGS_FEATURE_CHECK([M4], [m4 gm4],
+ [[$ac_path_M4 -I. /dev/null > /dev/null 2>&1 && \
+ ac_cv_path_M4=$ac_path_M4 ac_path_M4_found=:]],
+ [AC_MSG_ERROR([could not find m4 that supports -I option])],
+ [$PATH:/usr/gnu/bin])])
+
+AC_SUBST([M4], [$ac_cv_path_M4])
+]) # XORG_WITH_M4
+
# XORG_WITH_PS2PDF([DEFAULT])
# ----------------
# Minimum version: 1.6.0
@@ -2520,7 +2565,8 @@ AC_ARG_ENABLE(malloc0returnsnull,
AC_MSG_CHECKING([whether malloc(0) returns NULL])
if test "x$MALLOC_ZERO_RETURNS_NULL" = xauto; then
- AC_RUN_IFELSE([AC_LANG_PROGRAM([
+AC_CACHE_VAL([xorg_cv_malloc0_returns_null],
+ [AC_RUN_IFELSE([AC_LANG_PROGRAM([
#include <stdlib.h>
],[
char *m0, *r0, *c0, *p;
@@ -2530,9 +2576,9 @@ if test "x$MALLOC_ZERO_RETURNS_NULL" = xauto; then
c0 = calloc(0,10);
exit((m0 == 0 || r0 == 0 || c0 == 0) ? 0 : 1);
])],
- [MALLOC_ZERO_RETURNS_NULL=yes],
- [MALLOC_ZERO_RETURNS_NULL=no],
- [MALLOC_ZERO_RETURNS_NULL=yes])
+ [xorg_cv_malloc0_returns_null=yes],
+ [xorg_cv_malloc0_returns_null=no])])
+MALLOC_ZERO_RETURNS_NULL=$xorg_cv_malloc0_returns_null
fi
AC_MSG_RESULT([$MALLOC_ZERO_RETURNS_NULL])
@@ -2743,18 +2789,18 @@ fi
found="no"
m4_foreach([flag], m4_cdr($@), [
if test $found = "no" ; then
- if test "x$xorg_testset_unknown_warning_option" = "xyes" ; then
+ if test "x$xorg_testset_]CACHE_PREFIX[_unknown_warning_option" = "xyes" ; then
PREFIX[FLAGS]="$PREFIX[FLAGS] -Werror=unknown-warning-option"
fi
- if test "x$xorg_testset_unused_command_line_argument" = "xyes" ; then
+ if test "x$xorg_testset_]CACHE_PREFIX[_unused_command_line_argument" = "xyes" ; then
PREFIX[FLAGS]="$PREFIX[FLAGS] -Werror=unused-command-line-argument"
fi
PREFIX[FLAGS]="$PREFIX[FLAGS] ]flag["
dnl Some hackery here since AC_CACHE_VAL can't handle a non-literal varname
- AC_MSG_CHECKING([if ]COMPILER[ supports]flag[])
+ AC_MSG_CHECKING([if ]COMPILER[ supports ]flag[])
cacheid=AS_TR_SH([xorg_cv_]CACHE_PREFIX[_flag_]flag[])
AC_CACHE_VAL($cacheid,
[AC_LINK_IFELSE([AC_LANG_PROGRAM([int i;])],
@@ -2821,7 +2867,7 @@ AC_LANG_CASE(
XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Wmissing-prototypes])
XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Wnested-externs])
XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Wbad-function-cast])
- XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Wold-style-definition])
+ XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Wold-style-definition], [-fd])
XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Wdeclaration-after-statement])
]
)
@@ -2830,16 +2876,17 @@ AC_LANG_CASE(
XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Wunused])
XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Wuninitialized])
XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Wshadow])
-XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Wcast-qual])
XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Wmissing-noreturn])
XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Wmissing-format-attribute])
+# XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Wredundant-decls])
+XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Wlogical-op])
# These are currently disabled because they are noisy. They will be enabled
# in the future once the codebase is sufficiently modernized to silence
# them. For now, I don't want them to drown out the other warnings.
-# XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Wlogical-op])
# XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Wparentheses])
# XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Wcast-align])
+# XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Wcast-qual])
# Turn some warnings into errors, so we don't accidently get successful builds
# when there are problems that should be fixed.
@@ -3013,7 +3060,7 @@ dnl
# XORG_RELEASE_VERSION
# --------------------
# Defines PACKAGE_VERSION_{MAJOR,MINOR,PATCHLEVEL} for modules to use.
-
+
AC_DEFUN([XORG_RELEASE_VERSION],[
AC_DEFINE_UNQUOTED([PACKAGE_VERSION_MAJOR],
[`echo $PACKAGE_VERSION | cut -d . -f 1`],
diff --git a/app/xcalc/actions.c b/app/xcalc/actions.c
index 69bed4cc2..50bf7b476 100644
--- a/app/xcalc/actions.c
+++ b/app/xcalc/actions.c
@@ -45,48 +45,47 @@ from the X Consortium.
#define XCALC_PRE_OP(keynum) if (pre_op(keynum)) return;
#endif
-static void add(Widget w, XEvent *e, String *vector, Cardinal *count);
-static void back(Widget w, XEvent *e, String *vector, Cardinal *count);
-static void bell(Widget w, XEvent *e, String *vector, Cardinal *count);
-static void clearit(Widget w, XEvent *e, String *vector, Cardinal *count);
-static void cosine(Widget w, XEvent *e, String *vector, Cardinal *count);
-static void decimal(Widget w, XEvent *e, String *vector, Cardinal *count);
-static void degree(Widget w, XEvent *e, String *vector, Cardinal *count);
-static void digit(Widget w, XEvent *e, String *vector, Cardinal *count);
-static void divide(Widget w, XEvent *e, String *vector, Cardinal *count);
-static void e(Widget w, XEvent *e, String *vector, Cardinal *count);
-static void enter(Widget w, XEvent *e, String *vector, Cardinal *count);
-static void epower(Widget w, XEvent *e, String *vector, Cardinal *count);
-static void equal(Widget w, XEvent *e, String *vector, Cardinal *count);
-static void exchange(Widget w, XEvent *e, String *vector, Cardinal *count);
-static void factorial(Widget w, XEvent *e, String *vector, Cardinal *count);
-static void inverse(Widget w, XEvent *e, String *vector, Cardinal *count);
-static void leftParen(Widget w, XEvent *e, String *vector, Cardinal *count);
-static void logarithm(Widget w, XEvent *e, String *vector, Cardinal *count);
-static void multiply(Widget w, XEvent *e, String *vector, Cardinal *count);
-static void naturalLog(Widget w, XEvent *e, String *vector, Cardinal *count);
-static void factorial(Widget w, XEvent *e, String *vector, Cardinal *count);
-static void negate(Widget w, XEvent *e, String *vector, Cardinal *count);
-static void nop(Widget w, XEvent *e, String *vector, Cardinal *count);
-static void off(Widget w, XEvent *e, String *vector, Cardinal *count);
-static void pi(Widget w, XEvent *e, String *vector, Cardinal *count);
-static void power(Widget w, XEvent *e, String *vector, Cardinal *count);
-static void quit(Widget w, XEvent *e, String *vector, Cardinal *count);
-static void recall(Widget w, XEvent *e, String *vector, Cardinal *count);
-static void reciprocal(Widget w, XEvent *e, String *vector, Cardinal *count);
-static void rightParen(Widget w, XEvent *e, String *vector, Cardinal *count);
-static void roll(Widget w, XEvent *e, String *vector, Cardinal *count);
-static void scientific(Widget w, XEvent *e, String *vector, Cardinal *count);
-static void selection(Widget w, XEvent *e, String *vector, Cardinal *count);
-static void sine(Widget w, XEvent *e, String *vector, Cardinal *count);
-static void square(Widget w, XEvent *e, String *vector, Cardinal *count);
-static void squareRoot(Widget w, XEvent *e, String *vector, Cardinal *count);
-static void store(Widget w, XEvent *e, String *vector, Cardinal *count);
-static void subtract(Widget w, XEvent *e, String *vector, Cardinal *count);
-static void sum(Widget w, XEvent *e, String *vector, Cardinal *count);
-static void tangent(Widget w, XEvent *e, String *vector, Cardinal *count);
-static void tenpower(Widget w, XEvent *e, String *vector, Cardinal *count);
-static void XexchangeY(Widget w, XEvent *e, String *vector, Cardinal *count);
+static void add(Widget w, XEvent *ev, String *vector, Cardinal *count);
+static void back(Widget w, XEvent *ev, String *vector, Cardinal *count);
+static void bell(Widget w, XEvent *ev, String *vector, Cardinal *count);
+static void clearit(Widget w, XEvent *ev, String *vector, Cardinal *count);
+static void cosine(Widget w, XEvent *ev, String *vector, Cardinal *count);
+static void decimal(Widget w, XEvent *ev, String *vector, Cardinal *count);
+static void degree(Widget w, XEvent *ev, String *vector, Cardinal *count);
+static void digit(Widget w, XEvent *ev, String *vector, Cardinal *count);
+static void divide(Widget w, XEvent *ev, String *vector, Cardinal *count);
+static void e(Widget w, XEvent *ev, String *vector, Cardinal *count);
+static void enter(Widget w, XEvent *ev, String *vector, Cardinal *count);
+static void epower(Widget w, XEvent *ev, String *vector, Cardinal *count);
+static void equal(Widget w, XEvent *ev, String *vector, Cardinal *count);
+static void exchange(Widget w, XEvent *ev, String *vector, Cardinal *count);
+static void factorial(Widget w, XEvent *ev, String *vector, Cardinal *count);
+static void inverse(Widget w, XEvent *ev, String *vector, Cardinal *count);
+static void leftParen(Widget w, XEvent *ev, String *vector, Cardinal *count);
+static void logarithm(Widget w, XEvent *ev, String *vector, Cardinal *count);
+static void multiply(Widget w, XEvent *ev, String *vector, Cardinal *count);
+static void naturalLog(Widget w, XEvent *ev, String *vector, Cardinal *count);
+static void negate(Widget w, XEvent *ev, String *vector, Cardinal *count);
+static void nop(Widget w, XEvent *ev, String *vector, Cardinal *count);
+static void off(Widget w, XEvent *ev, String *vector, Cardinal *count);
+static void pi(Widget w, XEvent *ev, String *vector, Cardinal *count);
+static void power(Widget w, XEvent *ev, String *vector, Cardinal *count);
+static void quit(Widget w, XEvent *ev, String *vector, Cardinal *count);
+static void recall(Widget w, XEvent *ev, String *vector, Cardinal *count);
+static void reciprocal(Widget w, XEvent *ev, String *vector, Cardinal *count);
+static void rightParen(Widget w, XEvent *ev, String *vector, Cardinal *count);
+static void roll(Widget w, XEvent *ev, String *vector, Cardinal *count);
+static void scientific(Widget w, XEvent *ev, String *vector, Cardinal *count);
+static void selection(Widget w, XEvent *ev, String *vector, Cardinal *count);
+static void sine(Widget w, XEvent *ev, String *vector, Cardinal *count);
+static void square(Widget w, XEvent *ev, String *vector, Cardinal *count);
+static void squareRoot(Widget w, XEvent *ev, String *vector, Cardinal *count);
+static void store(Widget w, XEvent *ev, String *vector, Cardinal *count);
+static void subtract(Widget w, XEvent *ev, String *vector, Cardinal *count);
+static void sum(Widget w, XEvent *ev, String *vector, Cardinal *count);
+static void tangent(Widget w, XEvent *ev, String *vector, Cardinal *count);
+static void tenpower(Widget w, XEvent *ev, String *vector, Cardinal *count);
+static void XexchangeY(Widget w, XEvent *ev, String *vector, Cardinal *count);
/*
* calculator action table
@@ -139,7 +138,7 @@ XtActionsRec Actions[] = {
int ActionsCount = XtNumber(Actions);
/*ARGSUSED*/
-static void add(Widget w, XEvent *e, String *vector, Cardinal *count)
+static void add(Widget w, XEvent *ev, String *vector, Cardinal *count)
{
XCALC_PRE_OP(kADD);
rpn ? twof(kADD) : twoop(kADD);
@@ -147,7 +146,7 @@ static void add(Widget w, XEvent *e, String *vector, Cardinal *count)
}
/*ARGSUSED*/
-static void back(Widget w, XEvent *e, String *vector, Cardinal *count)
+static void back(Widget w, XEvent *ev, String *vector, Cardinal *count)
{
XCALC_PRE_OP(kBKSP);
bkspf();
@@ -155,13 +154,13 @@ static void back(Widget w, XEvent *e, String *vector, Cardinal *count)
}
/*ARGSUSED*/
-static void bell(Widget w, XEvent *e, String *vector, Cardinal *count)
+static void bell(Widget w, XEvent *ev, String *vector, Cardinal *count)
{
ringbell();
}
/*ARGSUSED*/
-static void clearit(Widget w, XEvent *e, String *vector, Cardinal *count)
+static void clearit(Widget w, XEvent *ev, String *vector, Cardinal *count)
{
XCALC_PRE_OP(kCLR);
clearf();
@@ -169,7 +168,7 @@ static void clearit(Widget w, XEvent *e, String *vector, Cardinal *count)
}
/*ARGSUSED*/
-static void cosine(Widget w, XEvent *e, String *vector, Cardinal *count)
+static void cosine(Widget w, XEvent *ev, String *vector, Cardinal *count)
{
XCALC_PRE_OP(kCOS);
oneop(kCOS);
@@ -177,7 +176,7 @@ static void cosine(Widget w, XEvent *e, String *vector, Cardinal *count)
}
/*ARGSUSED*/
-static void decimal(Widget w, XEvent *e, String *vector, Cardinal *count)
+static void decimal(Widget w, XEvent *ev, String *vector, Cardinal *count)
{
XCALC_PRE_OP(kDEC);
decf();
@@ -185,7 +184,7 @@ static void decimal(Widget w, XEvent *e, String *vector, Cardinal *count)
}
/*ARGSUSED*/
-static void degree(Widget w, XEvent *e, String *vector, Cardinal *count)
+static void degree(Widget w, XEvent *ev, String *vector, Cardinal *count)
{
XCALC_PRE_OP(kDRG);
drgf();
@@ -193,7 +192,7 @@ static void degree(Widget w, XEvent *e, String *vector, Cardinal *count)
}
/*ARGSUSED*/
-static void digit(Widget w, XEvent *e, String *vector, Cardinal *count)
+static void digit(Widget w, XEvent *ev, String *vector, Cardinal *count)
{
switch (vector[0][0])
{
@@ -212,7 +211,7 @@ static void digit(Widget w, XEvent *e, String *vector, Cardinal *count)
}
/*ARGSUSED*/
-static void divide(Widget w, XEvent *e, String *vector, Cardinal *count)
+static void divide(Widget w, XEvent *ev, String *vector, Cardinal *count)
{
XCALC_PRE_OP(kDIV);
rpn ? twof(kDIV) : twoop(kDIV);
@@ -220,7 +219,7 @@ static void divide(Widget w, XEvent *e, String *vector, Cardinal *count)
}
/*ARGSUSED*/
-static void e(Widget w, XEvent *e, String *vector, Cardinal *count)
+static void e(Widget w, XEvent *ev, String *vector, Cardinal *count)
{
XCALC_PRE_OP(kE);
oneop(kE);
@@ -228,7 +227,7 @@ static void e(Widget w, XEvent *e, String *vector, Cardinal *count)
}
/*ARGSUSED*/
-static void enter(Widget w, XEvent *e, String *vector, Cardinal *count)
+static void enter(Widget w, XEvent *ev, String *vector, Cardinal *count)
{
XCALC_PRE_OP(kENTR);
entrf();
@@ -236,7 +235,7 @@ static void enter(Widget w, XEvent *e, String *vector, Cardinal *count)
}
/*ARGSUSED*/
-static void epower(Widget w, XEvent *e, String *vector, Cardinal *count)
+static void epower(Widget w, XEvent *ev, String *vector, Cardinal *count)
{
XCALC_PRE_OP(kEXP);
oneop(kEXP);
@@ -244,7 +243,7 @@ static void epower(Widget w, XEvent *e, String *vector, Cardinal *count)
}
/*ARGSUSED*/
-static void equal(Widget w, XEvent *e, String *vector, Cardinal *count)
+static void equal(Widget w, XEvent *ev, String *vector, Cardinal *count)
{
XCALC_PRE_OP(kEQU);
equf();
@@ -252,7 +251,7 @@ static void equal(Widget w, XEvent *e, String *vector, Cardinal *count)
}
/*ARGSUSED*/
-static void exchange(Widget w, XEvent *e, String *vector, Cardinal *count)
+static void exchange(Widget w, XEvent *ev, String *vector, Cardinal *count)
{
XCALC_PRE_OP(kEXC);
oneop(kEXC);
@@ -260,7 +259,7 @@ static void exchange(Widget w, XEvent *e, String *vector, Cardinal *count)
}
/*ARGSUSED*/
-static void factorial(Widget w, XEvent *e, String *vector, Cardinal *count)
+static void factorial(Widget w, XEvent *ev, String *vector, Cardinal *count)
{
XCALC_PRE_OP(kFACT);
oneop(kFACT);
@@ -268,7 +267,7 @@ static void factorial(Widget w, XEvent *e, String *vector, Cardinal *count)
}
/*ARGSUSED*/
-static void inverse(Widget w, XEvent *e, String *vector, Cardinal *count)
+static void inverse(Widget w, XEvent *ev, String *vector, Cardinal *count)
{
XCALC_PRE_OP(kINV);
invf();
@@ -276,7 +275,7 @@ static void inverse(Widget w, XEvent *e, String *vector, Cardinal *count)
}
/*ARGSUSED*/
-static void leftParen(Widget w, XEvent *e, String *vector, Cardinal *count)
+static void leftParen(Widget w, XEvent *ev, String *vector, Cardinal *count)
{
XCALC_PRE_OP(kLPAR);
lparf();
@@ -284,7 +283,7 @@ static void leftParen(Widget w, XEvent *e, String *vector, Cardinal *count)
}
/*ARGSUSED*/
-static void logarithm(Widget w, XEvent *e, String *vector, Cardinal *count)
+static void logarithm(Widget w, XEvent *ev, String *vector, Cardinal *count)
{
XCALC_PRE_OP(kLOG);
oneop(kLOG);
@@ -292,7 +291,7 @@ static void logarithm(Widget w, XEvent *e, String *vector, Cardinal *count)
}
/*ARGSUSED*/
-static void multiply(Widget w, XEvent *e, String *vector, Cardinal *count)
+static void multiply(Widget w, XEvent *ev, String *vector, Cardinal *count)
{
XCALC_PRE_OP(kMUL);
rpn ? twof(kMUL) : twoop(kMUL);
@@ -300,7 +299,7 @@ static void multiply(Widget w, XEvent *e, String *vector, Cardinal *count)
}
/*ARGSUSED*/
-static void naturalLog(Widget w, XEvent *e, String *vector, Cardinal *count)
+static void naturalLog(Widget w, XEvent *ev, String *vector, Cardinal *count)
{
XCALC_PRE_OP(kLN);
oneop(kLN);
@@ -308,7 +307,7 @@ static void naturalLog(Widget w, XEvent *e, String *vector, Cardinal *count)
}
/*ARGSUSED*/
-static void negate(Widget w, XEvent *e, String *vector, Cardinal *count)
+static void negate(Widget w, XEvent *ev, String *vector, Cardinal *count)
{
XCALC_PRE_OP(kNEG);
negf();
@@ -316,13 +315,13 @@ static void negate(Widget w, XEvent *e, String *vector, Cardinal *count)
}
/*ARGSUSED*/
-static void nop(Widget w, XEvent *e, String *vector, Cardinal *count)
+static void nop(Widget w, XEvent *ev, String *vector, Cardinal *count)
{
ringbell();
}
/*ARGSUSED*/
-static void off(Widget w, XEvent *e, String *vector, Cardinal *count)
+static void off(Widget w, XEvent *ev, String *vector, Cardinal *count)
{
XCALC_PRE_OP(kOFF);
offf();
@@ -330,7 +329,7 @@ static void off(Widget w, XEvent *e, String *vector, Cardinal *count)
}
/*ARGSUSED*/
-static void pi(Widget w, XEvent *e, String *vector, Cardinal *count)
+static void pi(Widget w, XEvent *ev, String *vector, Cardinal *count)
{
XCALC_PRE_OP(kPI);
oneop(kPI);
@@ -338,7 +337,7 @@ static void pi(Widget w, XEvent *e, String *vector, Cardinal *count)
}
/*ARGSUSED*/
-static void power(Widget w, XEvent *e, String *vector, Cardinal *count)
+static void power(Widget w, XEvent *ev, String *vector, Cardinal *count)
{
XCALC_PRE_OP(kPOW);
rpn ? twof(kPOW) : twoop(kPOW);
@@ -346,16 +345,16 @@ static void power(Widget w, XEvent *e, String *vector, Cardinal *count)
}
/*ARGSUSED*/
-static void quit(Widget w, XEvent *e, String *vector, Cardinal *count)
+static void quit(Widget w, XEvent *ev, String *vector, Cardinal *count)
{
- if (e->type == ClientMessage && e->xclient.data.l[0] != wm_delete_window)
+ if (ev->type == ClientMessage && ev->xclient.data.l[0] != wm_delete_window)
ringbell();
else
Quit();
}
/*ARGSUSED*/
-static void recall(Widget w, XEvent *e, String *vector, Cardinal *count)
+static void recall(Widget w, XEvent *ev, String *vector, Cardinal *count)
{
XCALC_PRE_OP(kRCL);
rpn ? memf(kRCL) : oneop(kRCL);
@@ -363,7 +362,7 @@ static void recall(Widget w, XEvent *e, String *vector, Cardinal *count)
}
/*ARGSUSED*/
-static void reciprocal(Widget w, XEvent *e, String *vector, Cardinal *count)
+static void reciprocal(Widget w, XEvent *ev, String *vector, Cardinal *count)
{
XCALC_PRE_OP(kRECIP);
oneop(kRECIP);
@@ -371,7 +370,7 @@ static void reciprocal(Widget w, XEvent *e, String *vector, Cardinal *count)
}
/*ARGSUSED*/
-static void rightParen(Widget w, XEvent *e, String *vector, Cardinal *count)
+static void rightParen(Widget w, XEvent *ev, String *vector, Cardinal *count)
{
XCALC_PRE_OP(kRPAR);
rparf();
@@ -379,7 +378,7 @@ static void rightParen(Widget w, XEvent *e, String *vector, Cardinal *count)
}
/*ARGSUSED*/
-static void roll(Widget w, XEvent *e, String *vector, Cardinal *count)
+static void roll(Widget w, XEvent *ev, String *vector, Cardinal *count)
{
XCALC_PRE_OP(kROLL);
rollf();
@@ -387,7 +386,7 @@ static void roll(Widget w, XEvent *e, String *vector, Cardinal *count)
}
/*ARGSUSED*/
-static void scientific(Widget w, XEvent *e, String *vector, Cardinal *count)
+static void scientific(Widget w, XEvent *ev, String *vector, Cardinal *count)
{
XCALC_PRE_OP(kEE);
eef();
@@ -395,13 +394,13 @@ static void scientific(Widget w, XEvent *e, String *vector, Cardinal *count)
}
/*ARGSUSED*/
-static void selection(Widget w, XEvent *e, String *vector, Cardinal *count)
+static void selection(Widget w, XEvent *ev, String *vector, Cardinal *count)
{
- do_select(((XButtonReleasedEvent *)e)->time);
+ do_select(((XButtonReleasedEvent *)ev)->time);
}
/*ARGSUSED*/
-static void sine(Widget w, XEvent *e, String *vector, Cardinal *count)
+static void sine(Widget w, XEvent *ev, String *vector, Cardinal *count)
{
XCALC_PRE_OP(kSIN);
oneop(kSIN);
@@ -409,7 +408,7 @@ static void sine(Widget w, XEvent *e, String *vector, Cardinal *count)
}
/*ARGSUSED*/
-static void square(Widget w, XEvent *e, String *vector, Cardinal *count)
+static void square(Widget w, XEvent *ev, String *vector, Cardinal *count)
{
XCALC_PRE_OP(kSQR);
oneop(kSQR);
@@ -417,7 +416,7 @@ static void square(Widget w, XEvent *e, String *vector, Cardinal *count)
}
/*ARGSUSED*/
-static void squareRoot(Widget w, XEvent *e, String *vector, Cardinal *count)
+static void squareRoot(Widget w, XEvent *ev, String *vector, Cardinal *count)
{
XCALC_PRE_OP(kSQRT);
oneop(kSQRT);
@@ -425,7 +424,7 @@ static void squareRoot(Widget w, XEvent *e, String *vector, Cardinal *count)
}
/*ARGSUSED*/
-static void store(Widget w, XEvent *e, String *vector, Cardinal *count)
+static void store(Widget w, XEvent *ev, String *vector, Cardinal *count)
{
XCALC_PRE_OP(kSTO);
rpn ? memf(kSTO) : oneop(kSTO);
@@ -433,7 +432,7 @@ static void store(Widget w, XEvent *e, String *vector, Cardinal *count)
}
/*ARGSUSED*/
-static void subtract(Widget w, XEvent *e, String *vector, Cardinal *count)
+static void subtract(Widget w, XEvent *ev, String *vector, Cardinal *count)
{
XCALC_PRE_OP(kSUB);
rpn ? twof(kSUB) : twoop(kSUB);
@@ -441,7 +440,7 @@ static void subtract(Widget w, XEvent *e, String *vector, Cardinal *count)
}
/*ARGSUSED*/
-static void sum(Widget w, XEvent *e, String *vector, Cardinal *count)
+static void sum(Widget w, XEvent *ev, String *vector, Cardinal *count)
{
XCALC_PRE_OP(kSUM);
rpn ? memf(kSUM) : oneop(kSUM);
@@ -449,7 +448,7 @@ static void sum(Widget w, XEvent *e, String *vector, Cardinal *count)
}
/*ARGSUSED*/
-static void tangent(Widget w, XEvent *e, String *vector, Cardinal *count)
+static void tangent(Widget w, XEvent *ev, String *vector, Cardinal *count)
{
XCALC_PRE_OP(kTAN);
oneop(kTAN);
@@ -457,7 +456,7 @@ static void tangent(Widget w, XEvent *e, String *vector, Cardinal *count)
}
/*ARGSUSED*/
-static void tenpower(Widget w, XEvent *e, String *vector, Cardinal *count)
+static void tenpower(Widget w, XEvent *ev, String *vector, Cardinal *count)
{
XCALC_PRE_OP(k10X);
oneop(k10X);
@@ -465,7 +464,7 @@ static void tenpower(Widget w, XEvent *e, String *vector, Cardinal *count)
}
/*ARGSUSED*/
-static void XexchangeY(Widget w, XEvent *e, String *vector, Cardinal *count)
+static void XexchangeY(Widget w, XEvent *ev, String *vector, Cardinal *count)
{
XCALC_PRE_OP(kXXY);
twof(kXXY);
diff --git a/app/xcalc/compile b/app/xcalc/compile
new file mode 100644
index 000000000..a85b723c7
--- /dev/null
+++ b/app/xcalc/compile
@@ -0,0 +1,347 @@
+#! /bin/sh
+# Wrapper for compilers which do not understand '-c -o'.
+
+scriptversion=2012-10-14.11; # UTC
+
+# Copyright (C) 1999-2014 Free Software Foundation, Inc.
+# Written by Tom Tromey <tromey@cygnus.com>.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program that contains a
+# configuration script generated by Autoconf, you may include it under
+# the same distribution terms that you use for the rest of that program.
+
+# This file is maintained in Automake, please report
+# bugs to <bug-automake@gnu.org> or send patches to
+# <automake-patches@gnu.org>.
+
+nl='
+'
+
+# We need space, tab and new line, in precisely that order. Quoting is
+# there to prevent tools from complaining about whitespace usage.
+IFS=" "" $nl"
+
+file_conv=
+
+# func_file_conv build_file lazy
+# Convert a $build file to $host form and store it in $file
+# Currently only supports Windows hosts. If the determined conversion
+# type is listed in (the comma separated) LAZY, no conversion will
+# take place.
+func_file_conv ()
+{
+ file=$1
+ case $file in
+ / | /[!/]*) # absolute file, and not a UNC file
+ if test -z "$file_conv"; then
+ # lazily determine how to convert abs files
+ case `uname -s` in
+ MINGW*)
+ file_conv=mingw
+ ;;
+ CYGWIN*)
+ file_conv=cygwin
+ ;;
+ *)
+ file_conv=wine
+ ;;
+ esac
+ fi
+ case $file_conv/,$2, in
+ *,$file_conv,*)
+ ;;
+ mingw/*)
+ file=`cmd //C echo "$file " | sed -e 's/"\(.*\) " *$/\1/'`
+ ;;
+ cygwin/*)
+ file=`cygpath -m "$file" || echo "$file"`
+ ;;
+ wine/*)
+ file=`winepath -w "$file" || echo "$file"`
+ ;;
+ esac
+ ;;
+ esac
+}
+
+# func_cl_dashL linkdir
+# Make cl look for libraries in LINKDIR
+func_cl_dashL ()
+{
+ func_file_conv "$1"
+ if test -z "$lib_path"; then
+ lib_path=$file
+ else
+ lib_path="$lib_path;$file"
+ fi
+ linker_opts="$linker_opts -LIBPATH:$file"
+}
+
+# func_cl_dashl library
+# Do a library search-path lookup for cl
+func_cl_dashl ()
+{
+ lib=$1
+ found=no
+ save_IFS=$IFS
+ IFS=';'
+ for dir in $lib_path $LIB
+ do
+ IFS=$save_IFS
+ if $shared && test -f "$dir/$lib.dll.lib"; then
+ found=yes
+ lib=$dir/$lib.dll.lib
+ break
+ fi
+ if test -f "$dir/$lib.lib"; then
+ found=yes
+ lib=$dir/$lib.lib
+ break
+ fi
+ if test -f "$dir/lib$lib.a"; then
+ found=yes
+ lib=$dir/lib$lib.a
+ break
+ fi
+ done
+ IFS=$save_IFS
+
+ if test "$found" != yes; then
+ lib=$lib.lib
+ fi
+}
+
+# func_cl_wrapper cl arg...
+# Adjust compile command to suit cl
+func_cl_wrapper ()
+{
+ # Assume a capable shell
+ lib_path=
+ shared=:
+ linker_opts=
+ for arg
+ do
+ if test -n "$eat"; then
+ eat=
+ else
+ case $1 in
+ -o)
+ # configure might choose to run compile as 'compile cc -o foo foo.c'.
+ eat=1
+ case $2 in
+ *.o | *.[oO][bB][jJ])
+ func_file_conv "$2"
+ set x "$@" -Fo"$file"
+ shift
+ ;;
+ *)
+ func_file_conv "$2"
+ set x "$@" -Fe"$file"
+ shift
+ ;;
+ esac
+ ;;
+ -I)
+ eat=1
+ func_file_conv "$2" mingw
+ set x "$@" -I"$file"
+ shift
+ ;;
+ -I*)
+ func_file_conv "${1#-I}" mingw
+ set x "$@" -I"$file"
+ shift
+ ;;
+ -l)
+ eat=1
+ func_cl_dashl "$2"
+ set x "$@" "$lib"
+ shift
+ ;;
+ -l*)
+ func_cl_dashl "${1#-l}"
+ set x "$@" "$lib"
+ shift
+ ;;
+ -L)
+ eat=1
+ func_cl_dashL "$2"
+ ;;
+ -L*)
+ func_cl_dashL "${1#-L}"
+ ;;
+ -static)
+ shared=false
+ ;;
+ -Wl,*)
+ arg=${1#-Wl,}
+ save_ifs="$IFS"; IFS=','
+ for flag in $arg; do
+ IFS="$save_ifs"
+ linker_opts="$linker_opts $flag"
+ done
+ IFS="$save_ifs"
+ ;;
+ -Xlinker)
+ eat=1
+ linker_opts="$linker_opts $2"
+ ;;
+ -*)
+ set x "$@" "$1"
+ shift
+ ;;
+ *.cc | *.CC | *.cxx | *.CXX | *.[cC]++)
+ func_file_conv "$1"
+ set x "$@" -Tp"$file"
+ shift
+ ;;
+ *.c | *.cpp | *.CPP | *.lib | *.LIB | *.Lib | *.OBJ | *.obj | *.[oO])
+ func_file_conv "$1" mingw
+ set x "$@" "$file"
+ shift
+ ;;
+ *)
+ set x "$@" "$1"
+ shift
+ ;;
+ esac
+ fi
+ shift
+ done
+ if test -n "$linker_opts"; then
+ linker_opts="-link$linker_opts"
+ fi
+ exec "$@" $linker_opts
+ exit 1
+}
+
+eat=
+
+case $1 in
+ '')
+ echo "$0: No command. Try '$0 --help' for more information." 1>&2
+ exit 1;
+ ;;
+ -h | --h*)
+ cat <<\EOF
+Usage: compile [--help] [--version] PROGRAM [ARGS]
+
+Wrapper for compilers which do not understand '-c -o'.
+Remove '-o dest.o' from ARGS, run PROGRAM with the remaining
+arguments, and rename the output as expected.
+
+If you are trying to build a whole package this is not the
+right script to run: please start by reading the file 'INSTALL'.
+
+Report bugs to <bug-automake@gnu.org>.
+EOF
+ exit $?
+ ;;
+ -v | --v*)
+ echo "compile $scriptversion"
+ exit $?
+ ;;
+ cl | *[/\\]cl | cl.exe | *[/\\]cl.exe )
+ func_cl_wrapper "$@" # Doesn't return...
+ ;;
+esac
+
+ofile=
+cfile=
+
+for arg
+do
+ if test -n "$eat"; then
+ eat=
+ else
+ case $1 in
+ -o)
+ # configure might choose to run compile as 'compile cc -o foo foo.c'.
+ # So we strip '-o arg' only if arg is an object.
+ eat=1
+ case $2 in
+ *.o | *.obj)
+ ofile=$2
+ ;;
+ *)
+ set x "$@" -o "$2"
+ shift
+ ;;
+ esac
+ ;;
+ *.c)
+ cfile=$1
+ set x "$@" "$1"
+ shift
+ ;;
+ *)
+ set x "$@" "$1"
+ shift
+ ;;
+ esac
+ fi
+ shift
+done
+
+if test -z "$ofile" || test -z "$cfile"; then
+ # If no '-o' option was seen then we might have been invoked from a
+ # pattern rule where we don't need one. That is ok -- this is a
+ # normal compilation that the losing compiler can handle. If no
+ # '.c' file was seen then we are probably linking. That is also
+ # ok.
+ exec "$@"
+fi
+
+# Name of file we expect compiler to create.
+cofile=`echo "$cfile" | sed 's|^.*[\\/]||; s|^[a-zA-Z]:||; s/\.c$/.o/'`
+
+# Create the lock directory.
+# Note: use '[/\\:.-]' here to ensure that we don't use the same name
+# that we are using for the .o file. Also, base the name on the expected
+# object file name, since that is what matters with a parallel build.
+lockdir=`echo "$cofile" | sed -e 's|[/\\:.-]|_|g'`.d
+while true; do
+ if mkdir "$lockdir" >/dev/null 2>&1; then
+ break
+ fi
+ sleep 1
+done
+# FIXME: race condition here if user kills between mkdir and trap.
+trap "rmdir '$lockdir'; exit 1" 1 2 15
+
+# Run the compile.
+"$@"
+ret=$?
+
+if test -f "$cofile"; then
+ test "$cofile" = "$ofile" || mv "$cofile" "$ofile"
+elif test -f "${cofile}bj"; then
+ test "${cofile}bj" = "$ofile" || mv "${cofile}bj" "$ofile"
+fi
+
+rmdir "$lockdir"
+exit $ret
+
+# Local Variables:
+# mode: shell-script
+# sh-indentation: 2
+# eval: (add-hook 'write-file-hooks 'time-stamp)
+# time-stamp-start: "scriptversion="
+# time-stamp-format: "%:y-%02m-%02d.%02H"
+# time-stamp-time-zone: "UTC"
+# time-stamp-end: "; # UTC"
+# End:
diff --git a/app/xcalc/config.h.in b/app/xcalc/config.h.in
index 7c9cfb1c0..509f82f40 100644
--- a/app/xcalc/config.h.in
+++ b/app/xcalc/config.h.in
@@ -18,6 +18,9 @@
/* Define to 1 if you have the <string.h> header file. */
#undef HAVE_STRING_H
+/* Define to 1 if you have the `strlcpy' function. */
+#undef HAVE_STRLCPY
+
/* Define to 1 if you have the <sys/stat.h> header file. */
#undef HAVE_SYS_STAT_H
diff --git a/app/xcalc/configure b/app/xcalc/configure
index 7d7de1b8d..9a1bda37f 100644
--- a/app/xcalc/configure
+++ b/app/xcalc/configure
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for xcalc 1.0.5.
+# Generated by GNU Autoconf 2.69 for xcalc 1.0.6.
#
# Report bugs to <https://bugs.freedesktop.org/enter_bug.cgi?product=xorg>.
#
@@ -581,8 +581,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='xcalc'
PACKAGE_TARNAME='xcalc'
-PACKAGE_VERSION='1.0.5'
-PACKAGE_STRING='xcalc 1.0.5'
+PACKAGE_VERSION='1.0.6'
+PACKAGE_STRING='xcalc 1.0.6'
PACKAGE_BUGREPORT='https://bugs.freedesktop.org/enter_bug.cgi?product=xorg'
PACKAGE_URL=''
@@ -660,6 +660,8 @@ build_vendor
build_cpu
build
INSTALL_CMD
+PKG_CONFIG_LIBDIR
+PKG_CONFIG_PATH
PKG_CONFIG
CHANGELOG_CMD
STRICT_CFLAGS
@@ -685,9 +687,6 @@ CPPFLAGS
LDFLAGS
CFLAGS
CC
-MAINT
-MAINTAINER_MODE_FALSE
-MAINTAINER_MODE_TRUE
am__untar
am__tar
AMTAR
@@ -752,7 +751,6 @@ SHELL'
ac_subst_files=''
ac_user_opts='
enable_option_checking
-enable_maintainer_mode
enable_dependency_tracking
enable_selective_werror
enable_strict_compilation
@@ -769,6 +767,8 @@ LIBS
CPPFLAGS
CPP
PKG_CONFIG
+PKG_CONFIG_PATH
+PKG_CONFIG_LIBDIR
XCALC_CFLAGS
XCALC_LIBS
APPDEFS_CFLAGS
@@ -1313,7 +1313,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures xcalc 1.0.5 to adapt to many kinds of systems.
+\`configure' configures xcalc 1.0.6 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1383,7 +1383,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of xcalc 1.0.5:";;
+ short | recursive ) echo "Configuration of xcalc 1.0.6:";;
esac
cat <<\_ACEOF
@@ -1391,9 +1391,6 @@ Optional Features:
--disable-option-checking ignore unrecognized --enable/--with options
--disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no)
--enable-FEATURE[=ARG] include FEATURE [ARG=yes]
- --enable-maintainer-mode
- enable make rules and dependencies not useful (and
- sometimes confusing) to the casual installer
--enable-dependency-tracking
do not reject slow dependency extractors
--disable-dependency-tracking
@@ -1424,6 +1421,10 @@ Some influential environment variables:
you have headers in a nonstandard directory <include dir>
CPP C preprocessor
PKG_CONFIG path to pkg-config utility
+ PKG_CONFIG_PATH
+ directories to add to pkg-config's search path
+ PKG_CONFIG_LIBDIR
+ path overriding pkg-config's built-in search path
XCALC_CFLAGS
C compiler flags for XCALC, overriding pkg-config
XCALC_LIBS linker flags for XCALC, overriding pkg-config
@@ -1498,7 +1499,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-xcalc configure 1.0.5
+xcalc configure 1.0.6
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1751,11 +1752,78 @@ fi
as_fn_set_status $ac_retval
} # ac_fn_c_try_link
+
+# ac_fn_c_check_func LINENO FUNC VAR
+# ----------------------------------
+# Tests whether FUNC exists, setting the cache variable VAR accordingly
+ac_fn_c_check_func ()
+{
+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
+$as_echo_n "checking for $2... " >&6; }
+if eval \${$3+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+/* Define $2 to an innocuous variant, in case <limits.h> declares $2.
+ For example, HP-UX 11i <limits.h> declares gettimeofday. */
+#define $2 innocuous_$2
+
+/* System header to define __stub macros and hopefully few prototypes,
+ which can conflict with char $2 (); below.
+ Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+ <limits.h> exists even on freestanding compilers. */
+
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
+
+#undef $2
+
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
+#ifdef __cplusplus
+extern "C"
+#endif
+char $2 ();
+/* The GNU C library defines this for functions which it implements
+ to always fail with ENOSYS. Some functions are actually named
+ something starting with __ and the normal name is an alias. */
+#if defined __stub_$2 || defined __stub___$2
+choke me
+#endif
+
+int
+main ()
+{
+return $2 ();
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+ eval "$3=yes"
+else
+ eval "$3=no"
+fi
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+fi
+eval ac_res=\$$3
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+
+} # ac_fn_c_check_func
cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by xcalc $as_me 1.0.5, which was
+It was created by xcalc $as_me 1.0.6, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -2584,7 +2652,7 @@ fi
# Define the identity of the package.
PACKAGE='xcalc'
- VERSION='1.0.5'
+ VERSION='1.0.6'
cat >>confdefs.h <<_ACEOF
@@ -2631,29 +2699,6 @@ am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable maintainer-specific portions of Makefiles" >&5
-$as_echo_n "checking whether to enable maintainer-specific portions of Makefiles... " >&6; }
- # Check whether --enable-maintainer-mode was given.
-if test "${enable_maintainer_mode+set}" = set; then :
- enableval=$enable_maintainer_mode; USE_MAINTAINER_MODE=$enableval
-else
- USE_MAINTAINER_MODE=no
-fi
-
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $USE_MAINTAINER_MODE" >&5
-$as_echo "$USE_MAINTAINER_MODE" >&6; }
- if test $USE_MAINTAINER_MODE = yes; then
- MAINTAINER_MODE_TRUE=
- MAINTAINER_MODE_FALSE='#'
-else
- MAINTAINER_MODE_TRUE='#'
- MAINTAINER_MODE_FALSE=
-fi
-
- MAINT=$MAINTAINER_MODE_TRUE
-
-
-
# Require X.Org macros 1.8 or later for MAN_SUBSTS set by XORG_MANPAGE_SECTIONS
@@ -4249,6 +4294,11 @@ fi
+
+
+
+
+
if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
@@ -4361,7 +4411,6 @@ $as_echo "yes" >&6; }
$as_echo "no" >&6; }
PKG_CONFIG=""
fi
-
fi
# Make sure we can run config.sub.
$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
@@ -4596,18 +4645,18 @@ fi
found="no"
if test $found = "no" ; then
- if test "x$xorg_testset_unknown_warning_option" = "xyes" ; then
+ if test "x$xorg_testset_cc_unknown_warning_option" = "xyes" ; then
CFLAGS="$CFLAGS -Werror=unknown-warning-option"
fi
- if test "x$xorg_testset_unused_command_line_argument" = "xyes" ; then
+ if test "x$xorg_testset_cc_unused_command_line_argument" = "xyes" ; then
CFLAGS="$CFLAGS -Werror=unused-command-line-argument"
fi
CFLAGS="$CFLAGS -Wall"
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports-Wall" >&5
-$as_echo_n "checking if $CC supports-Wall... " >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wall" >&5
+$as_echo_n "checking if $CC supports -Wall... " >&6; }
cacheid=xorg_cv_cc_flag__Wall
if eval \${$cacheid+:} false; then :
$as_echo_n "(cached) " >&6
@@ -4714,18 +4763,18 @@ fi
found="no"
if test $found = "no" ; then
- if test "x$xorg_testset_unknown_warning_option" = "xyes" ; then
+ if test "x$xorg_testset_cc_unknown_warning_option" = "xyes" ; then
CFLAGS="$CFLAGS -Werror=unknown-warning-option"
fi
- if test "x$xorg_testset_unused_command_line_argument" = "xyes" ; then
+ if test "x$xorg_testset_cc_unused_command_line_argument" = "xyes" ; then
CFLAGS="$CFLAGS -Werror=unused-command-line-argument"
fi
CFLAGS="$CFLAGS -Wpointer-arith"
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports-Wpointer-arith" >&5
-$as_echo_n "checking if $CC supports-Wpointer-arith... " >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wpointer-arith" >&5
+$as_echo_n "checking if $CC supports -Wpointer-arith... " >&6; }
cacheid=xorg_cv_cc_flag__Wpointer_arith
if eval \${$cacheid+:} false; then :
$as_echo_n "(cached) " >&6
@@ -4832,18 +4881,18 @@ fi
found="no"
if test $found = "no" ; then
- if test "x$xorg_testset_unknown_warning_option" = "xyes" ; then
+ if test "x$xorg_testset_cc_unknown_warning_option" = "xyes" ; then
CFLAGS="$CFLAGS -Werror=unknown-warning-option"
fi
- if test "x$xorg_testset_unused_command_line_argument" = "xyes" ; then
+ if test "x$xorg_testset_cc_unused_command_line_argument" = "xyes" ; then
CFLAGS="$CFLAGS -Werror=unused-command-line-argument"
fi
CFLAGS="$CFLAGS -Wmissing-declarations"
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports-Wmissing-declarations" >&5
-$as_echo_n "checking if $CC supports-Wmissing-declarations... " >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wmissing-declarations" >&5
+$as_echo_n "checking if $CC supports -Wmissing-declarations... " >&6; }
cacheid=xorg_cv_cc_flag__Wmissing_declarations
if eval \${$cacheid+:} false; then :
$as_echo_n "(cached) " >&6
@@ -4950,18 +4999,18 @@ fi
found="no"
if test $found = "no" ; then
- if test "x$xorg_testset_unknown_warning_option" = "xyes" ; then
+ if test "x$xorg_testset_cc_unknown_warning_option" = "xyes" ; then
CFLAGS="$CFLAGS -Werror=unknown-warning-option"
fi
- if test "x$xorg_testset_unused_command_line_argument" = "xyes" ; then
+ if test "x$xorg_testset_cc_unused_command_line_argument" = "xyes" ; then
CFLAGS="$CFLAGS -Werror=unused-command-line-argument"
fi
CFLAGS="$CFLAGS -Wformat=2"
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports-Wformat=2" >&5
-$as_echo_n "checking if $CC supports-Wformat=2... " >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wformat=2" >&5
+$as_echo_n "checking if $CC supports -Wformat=2... " >&6; }
cacheid=xorg_cv_cc_flag__Wformat_2
if eval \${$cacheid+:} false; then :
$as_echo_n "(cached) " >&6
@@ -4999,18 +5048,18 @@ $as_echo "$supported" >&6; }
fi
if test $found = "no" ; then
- if test "x$xorg_testset_unknown_warning_option" = "xyes" ; then
+ if test "x$xorg_testset_cc_unknown_warning_option" = "xyes" ; then
CFLAGS="$CFLAGS -Werror=unknown-warning-option"
fi
- if test "x$xorg_testset_unused_command_line_argument" = "xyes" ; then
+ if test "x$xorg_testset_cc_unused_command_line_argument" = "xyes" ; then
CFLAGS="$CFLAGS -Werror=unused-command-line-argument"
fi
CFLAGS="$CFLAGS -Wformat"
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports-Wformat" >&5
-$as_echo_n "checking if $CC supports-Wformat... " >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wformat" >&5
+$as_echo_n "checking if $CC supports -Wformat... " >&6; }
cacheid=xorg_cv_cc_flag__Wformat
if eval \${$cacheid+:} false; then :
$as_echo_n "(cached) " >&6
@@ -5119,18 +5168,18 @@ fi
found="no"
if test $found = "no" ; then
- if test "x$xorg_testset_unknown_warning_option" = "xyes" ; then
+ if test "x$xorg_testset_cc_unknown_warning_option" = "xyes" ; then
CFLAGS="$CFLAGS -Werror=unknown-warning-option"
fi
- if test "x$xorg_testset_unused_command_line_argument" = "xyes" ; then
+ if test "x$xorg_testset_cc_unused_command_line_argument" = "xyes" ; then
CFLAGS="$CFLAGS -Werror=unused-command-line-argument"
fi
CFLAGS="$CFLAGS -Wstrict-prototypes"
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports-Wstrict-prototypes" >&5
-$as_echo_n "checking if $CC supports-Wstrict-prototypes... " >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wstrict-prototypes" >&5
+$as_echo_n "checking if $CC supports -Wstrict-prototypes... " >&6; }
cacheid=xorg_cv_cc_flag__Wstrict_prototypes
if eval \${$cacheid+:} false; then :
$as_echo_n "(cached) " >&6
@@ -5237,18 +5286,18 @@ fi
found="no"
if test $found = "no" ; then
- if test "x$xorg_testset_unknown_warning_option" = "xyes" ; then
+ if test "x$xorg_testset_cc_unknown_warning_option" = "xyes" ; then
CFLAGS="$CFLAGS -Werror=unknown-warning-option"
fi
- if test "x$xorg_testset_unused_command_line_argument" = "xyes" ; then
+ if test "x$xorg_testset_cc_unused_command_line_argument" = "xyes" ; then
CFLAGS="$CFLAGS -Werror=unused-command-line-argument"
fi
CFLAGS="$CFLAGS -Wmissing-prototypes"
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports-Wmissing-prototypes" >&5
-$as_echo_n "checking if $CC supports-Wmissing-prototypes... " >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wmissing-prototypes" >&5
+$as_echo_n "checking if $CC supports -Wmissing-prototypes... " >&6; }
cacheid=xorg_cv_cc_flag__Wmissing_prototypes
if eval \${$cacheid+:} false; then :
$as_echo_n "(cached) " >&6
@@ -5355,18 +5404,18 @@ fi
found="no"
if test $found = "no" ; then
- if test "x$xorg_testset_unknown_warning_option" = "xyes" ; then
+ if test "x$xorg_testset_cc_unknown_warning_option" = "xyes" ; then
CFLAGS="$CFLAGS -Werror=unknown-warning-option"
fi
- if test "x$xorg_testset_unused_command_line_argument" = "xyes" ; then
+ if test "x$xorg_testset_cc_unused_command_line_argument" = "xyes" ; then
CFLAGS="$CFLAGS -Werror=unused-command-line-argument"
fi
CFLAGS="$CFLAGS -Wnested-externs"
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports-Wnested-externs" >&5
-$as_echo_n "checking if $CC supports-Wnested-externs... " >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wnested-externs" >&5
+$as_echo_n "checking if $CC supports -Wnested-externs... " >&6; }
cacheid=xorg_cv_cc_flag__Wnested_externs
if eval \${$cacheid+:} false; then :
$as_echo_n "(cached) " >&6
@@ -5473,18 +5522,18 @@ fi
found="no"
if test $found = "no" ; then
- if test "x$xorg_testset_unknown_warning_option" = "xyes" ; then
+ if test "x$xorg_testset_cc_unknown_warning_option" = "xyes" ; then
CFLAGS="$CFLAGS -Werror=unknown-warning-option"
fi
- if test "x$xorg_testset_unused_command_line_argument" = "xyes" ; then
+ if test "x$xorg_testset_cc_unused_command_line_argument" = "xyes" ; then
CFLAGS="$CFLAGS -Werror=unused-command-line-argument"
fi
CFLAGS="$CFLAGS -Wbad-function-cast"
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports-Wbad-function-cast" >&5
-$as_echo_n "checking if $CC supports-Wbad-function-cast... " >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wbad-function-cast" >&5
+$as_echo_n "checking if $CC supports -Wbad-function-cast... " >&6; }
cacheid=xorg_cv_cc_flag__Wbad_function_cast
if eval \${$cacheid+:} false; then :
$as_echo_n "(cached) " >&6
@@ -5591,18 +5640,18 @@ fi
found="no"
if test $found = "no" ; then
- if test "x$xorg_testset_unknown_warning_option" = "xyes" ; then
+ if test "x$xorg_testset_cc_unknown_warning_option" = "xyes" ; then
CFLAGS="$CFLAGS -Werror=unknown-warning-option"
fi
- if test "x$xorg_testset_unused_command_line_argument" = "xyes" ; then
+ if test "x$xorg_testset_cc_unused_command_line_argument" = "xyes" ; then
CFLAGS="$CFLAGS -Werror=unused-command-line-argument"
fi
CFLAGS="$CFLAGS -Wold-style-definition"
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports-Wold-style-definition" >&5
-$as_echo_n "checking if $CC supports-Wold-style-definition... " >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wold-style-definition" >&5
+$as_echo_n "checking if $CC supports -Wold-style-definition... " >&6; }
cacheid=xorg_cv_cc_flag__Wold_style_definition
if eval \${$cacheid+:} false; then :
$as_echo_n "(cached) " >&6
@@ -5639,6 +5688,55 @@ $as_echo "$supported" >&6; }
fi
fi
+ if test $found = "no" ; then
+ if test "x$xorg_testset_cc_unknown_warning_option" = "xyes" ; then
+ CFLAGS="$CFLAGS -Werror=unknown-warning-option"
+ fi
+
+ if test "x$xorg_testset_cc_unused_command_line_argument" = "xyes" ; then
+ CFLAGS="$CFLAGS -Werror=unused-command-line-argument"
+ fi
+
+ CFLAGS="$CFLAGS -fd"
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -fd" >&5
+$as_echo_n "checking if $CC supports -fd... " >&6; }
+ cacheid=xorg_cv_cc_flag__fd
+ if eval \${$cacheid+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+int i;
+int
+main ()
+{
+
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+ eval $cacheid=yes
+else
+ eval $cacheid=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+fi
+
+
+ CFLAGS="$xorg_testset_save_CFLAGS"
+
+ eval supported=\$$cacheid
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $supported" >&5
+$as_echo "$supported" >&6; }
+ if test "$supported" = "yes" ; then
+ BASE_CFLAGS="$BASE_CFLAGS -fd"
+ found="yes"
+ fi
+ fi
+
@@ -5709,18 +5807,18 @@ fi
found="no"
if test $found = "no" ; then
- if test "x$xorg_testset_unknown_warning_option" = "xyes" ; then
+ if test "x$xorg_testset_cc_unknown_warning_option" = "xyes" ; then
CFLAGS="$CFLAGS -Werror=unknown-warning-option"
fi
- if test "x$xorg_testset_unused_command_line_argument" = "xyes" ; then
+ if test "x$xorg_testset_cc_unused_command_line_argument" = "xyes" ; then
CFLAGS="$CFLAGS -Werror=unused-command-line-argument"
fi
CFLAGS="$CFLAGS -Wdeclaration-after-statement"
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports-Wdeclaration-after-statement" >&5
-$as_echo_n "checking if $CC supports-Wdeclaration-after-statement... " >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wdeclaration-after-statement" >&5
+$as_echo_n "checking if $CC supports -Wdeclaration-after-statement... " >&6; }
cacheid=xorg_cv_cc_flag__Wdeclaration_after_statement
if eval \${$cacheid+:} false; then :
$as_echo_n "(cached) " >&6
@@ -5831,18 +5929,18 @@ fi
found="no"
if test $found = "no" ; then
- if test "x$xorg_testset_unknown_warning_option" = "xyes" ; then
+ if test "x$xorg_testset_cc_unknown_warning_option" = "xyes" ; then
CFLAGS="$CFLAGS -Werror=unknown-warning-option"
fi
- if test "x$xorg_testset_unused_command_line_argument" = "xyes" ; then
+ if test "x$xorg_testset_cc_unused_command_line_argument" = "xyes" ; then
CFLAGS="$CFLAGS -Werror=unused-command-line-argument"
fi
CFLAGS="$CFLAGS -Wunused"
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports-Wunused" >&5
-$as_echo_n "checking if $CC supports-Wunused... " >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wunused" >&5
+$as_echo_n "checking if $CC supports -Wunused... " >&6; }
cacheid=xorg_cv_cc_flag__Wunused
if eval \${$cacheid+:} false; then :
$as_echo_n "(cached) " >&6
@@ -5949,18 +6047,18 @@ fi
found="no"
if test $found = "no" ; then
- if test "x$xorg_testset_unknown_warning_option" = "xyes" ; then
+ if test "x$xorg_testset_cc_unknown_warning_option" = "xyes" ; then
CFLAGS="$CFLAGS -Werror=unknown-warning-option"
fi
- if test "x$xorg_testset_unused_command_line_argument" = "xyes" ; then
+ if test "x$xorg_testset_cc_unused_command_line_argument" = "xyes" ; then
CFLAGS="$CFLAGS -Werror=unused-command-line-argument"
fi
CFLAGS="$CFLAGS -Wuninitialized"
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports-Wuninitialized" >&5
-$as_echo_n "checking if $CC supports-Wuninitialized... " >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wuninitialized" >&5
+$as_echo_n "checking if $CC supports -Wuninitialized... " >&6; }
cacheid=xorg_cv_cc_flag__Wuninitialized
if eval \${$cacheid+:} false; then :
$as_echo_n "(cached) " >&6
@@ -6067,18 +6165,18 @@ fi
found="no"
if test $found = "no" ; then
- if test "x$xorg_testset_unknown_warning_option" = "xyes" ; then
+ if test "x$xorg_testset_cc_unknown_warning_option" = "xyes" ; then
CFLAGS="$CFLAGS -Werror=unknown-warning-option"
fi
- if test "x$xorg_testset_unused_command_line_argument" = "xyes" ; then
+ if test "x$xorg_testset_cc_unused_command_line_argument" = "xyes" ; then
CFLAGS="$CFLAGS -Werror=unused-command-line-argument"
fi
CFLAGS="$CFLAGS -Wshadow"
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports-Wshadow" >&5
-$as_echo_n "checking if $CC supports-Wshadow... " >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wshadow" >&5
+$as_echo_n "checking if $CC supports -Wshadow... " >&6; }
cacheid=xorg_cv_cc_flag__Wshadow
if eval \${$cacheid+:} false; then :
$as_echo_n "(cached) " >&6
@@ -6185,19 +6283,19 @@ fi
found="no"
if test $found = "no" ; then
- if test "x$xorg_testset_unknown_warning_option" = "xyes" ; then
+ if test "x$xorg_testset_cc_unknown_warning_option" = "xyes" ; then
CFLAGS="$CFLAGS -Werror=unknown-warning-option"
fi
- if test "x$xorg_testset_unused_command_line_argument" = "xyes" ; then
+ if test "x$xorg_testset_cc_unused_command_line_argument" = "xyes" ; then
CFLAGS="$CFLAGS -Werror=unused-command-line-argument"
fi
- CFLAGS="$CFLAGS -Wcast-qual"
+ CFLAGS="$CFLAGS -Wmissing-noreturn"
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports-Wcast-qual" >&5
-$as_echo_n "checking if $CC supports-Wcast-qual... " >&6; }
- cacheid=xorg_cv_cc_flag__Wcast_qual
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wmissing-noreturn" >&5
+$as_echo_n "checking if $CC supports -Wmissing-noreturn... " >&6; }
+ cacheid=xorg_cv_cc_flag__Wmissing_noreturn
if eval \${$cacheid+:} false; then :
$as_echo_n "(cached) " >&6
else
@@ -6228,7 +6326,7 @@ fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $supported" >&5
$as_echo "$supported" >&6; }
if test "$supported" = "yes" ; then
- BASE_CFLAGS="$BASE_CFLAGS -Wcast-qual"
+ BASE_CFLAGS="$BASE_CFLAGS -Wmissing-noreturn"
found="yes"
fi
fi
@@ -6303,19 +6401,19 @@ fi
found="no"
if test $found = "no" ; then
- if test "x$xorg_testset_unknown_warning_option" = "xyes" ; then
+ if test "x$xorg_testset_cc_unknown_warning_option" = "xyes" ; then
CFLAGS="$CFLAGS -Werror=unknown-warning-option"
fi
- if test "x$xorg_testset_unused_command_line_argument" = "xyes" ; then
+ if test "x$xorg_testset_cc_unused_command_line_argument" = "xyes" ; then
CFLAGS="$CFLAGS -Werror=unused-command-line-argument"
fi
- CFLAGS="$CFLAGS -Wmissing-noreturn"
+ CFLAGS="$CFLAGS -Wmissing-format-attribute"
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports-Wmissing-noreturn" >&5
-$as_echo_n "checking if $CC supports-Wmissing-noreturn... " >&6; }
- cacheid=xorg_cv_cc_flag__Wmissing_noreturn
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wmissing-format-attribute" >&5
+$as_echo_n "checking if $CC supports -Wmissing-format-attribute... " >&6; }
+ cacheid=xorg_cv_cc_flag__Wmissing_format_attribute
if eval \${$cacheid+:} false; then :
$as_echo_n "(cached) " >&6
else
@@ -6346,12 +6444,13 @@ fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $supported" >&5
$as_echo "$supported" >&6; }
if test "$supported" = "yes" ; then
- BASE_CFLAGS="$BASE_CFLAGS -Wmissing-noreturn"
+ BASE_CFLAGS="$BASE_CFLAGS -Wmissing-format-attribute"
found="yes"
fi
fi
+# XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Wredundant-decls])
@@ -6421,19 +6520,19 @@ fi
found="no"
if test $found = "no" ; then
- if test "x$xorg_testset_unknown_warning_option" = "xyes" ; then
+ if test "x$xorg_testset_cc_unknown_warning_option" = "xyes" ; then
CFLAGS="$CFLAGS -Werror=unknown-warning-option"
fi
- if test "x$xorg_testset_unused_command_line_argument" = "xyes" ; then
+ if test "x$xorg_testset_cc_unused_command_line_argument" = "xyes" ; then
CFLAGS="$CFLAGS -Werror=unused-command-line-argument"
fi
- CFLAGS="$CFLAGS -Wmissing-format-attribute"
+ CFLAGS="$CFLAGS -Wlogical-op"
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports-Wmissing-format-attribute" >&5
-$as_echo_n "checking if $CC supports-Wmissing-format-attribute... " >&6; }
- cacheid=xorg_cv_cc_flag__Wmissing_format_attribute
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wlogical-op" >&5
+$as_echo_n "checking if $CC supports -Wlogical-op... " >&6; }
+ cacheid=xorg_cv_cc_flag__Wlogical_op
if eval \${$cacheid+:} false; then :
$as_echo_n "(cached) " >&6
else
@@ -6464,7 +6563,7 @@ fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $supported" >&5
$as_echo "$supported" >&6; }
if test "$supported" = "yes" ; then
- BASE_CFLAGS="$BASE_CFLAGS -Wmissing-format-attribute"
+ BASE_CFLAGS="$BASE_CFLAGS -Wlogical-op"
found="yes"
fi
fi
@@ -6474,9 +6573,9 @@ $as_echo "$supported" >&6; }
# These are currently disabled because they are noisy. They will be enabled
# in the future once the codebase is sufficiently modernized to silence
# them. For now, I don't want them to drown out the other warnings.
-# XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Wlogical-op])
# XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Wparentheses])
# XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Wcast-align])
+# XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Wcast-qual])
# Turn some warnings into errors, so we don't accidently get successful builds
# when there are problems that should be fixed.
@@ -6551,18 +6650,18 @@ fi
found="no"
if test $found = "no" ; then
- if test "x$xorg_testset_unknown_warning_option" = "xyes" ; then
+ if test "x$xorg_testset_cc_unknown_warning_option" = "xyes" ; then
CFLAGS="$CFLAGS -Werror=unknown-warning-option"
fi
- if test "x$xorg_testset_unused_command_line_argument" = "xyes" ; then
+ if test "x$xorg_testset_cc_unused_command_line_argument" = "xyes" ; then
CFLAGS="$CFLAGS -Werror=unused-command-line-argument"
fi
CFLAGS="$CFLAGS -Werror=implicit"
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports-Werror=implicit" >&5
-$as_echo_n "checking if $CC supports-Werror=implicit... " >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=implicit" >&5
+$as_echo_n "checking if $CC supports -Werror=implicit... " >&6; }
cacheid=xorg_cv_cc_flag__Werror_implicit
if eval \${$cacheid+:} false; then :
$as_echo_n "(cached) " >&6
@@ -6600,18 +6699,18 @@ $as_echo "$supported" >&6; }
fi
if test $found = "no" ; then
- if test "x$xorg_testset_unknown_warning_option" = "xyes" ; then
+ if test "x$xorg_testset_cc_unknown_warning_option" = "xyes" ; then
CFLAGS="$CFLAGS -Werror=unknown-warning-option"
fi
- if test "x$xorg_testset_unused_command_line_argument" = "xyes" ; then
+ if test "x$xorg_testset_cc_unused_command_line_argument" = "xyes" ; then
CFLAGS="$CFLAGS -Werror=unused-command-line-argument"
fi
CFLAGS="$CFLAGS -errwarn=E_NO_EXPLICIT_TYPE_GIVEN -errwarn=E_NO_IMPLICIT_DECL_ALLOWED"
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports-errwarn=E_NO_EXPLICIT_TYPE_GIVEN -errwarn=E_NO_IMPLICIT_DECL_ALLOWED" >&5
-$as_echo_n "checking if $CC supports-errwarn=E_NO_EXPLICIT_TYPE_GIVEN -errwarn=E_NO_IMPLICIT_DECL_ALLOWED... " >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -errwarn=E_NO_EXPLICIT_TYPE_GIVEN -errwarn=E_NO_IMPLICIT_DECL_ALLOWED" >&5
+$as_echo_n "checking if $CC supports -errwarn=E_NO_EXPLICIT_TYPE_GIVEN -errwarn=E_NO_IMPLICIT_DECL_ALLOWED... " >&6; }
cacheid=xorg_cv_cc_flag__errwarn_E_NO_EXPLICIT_TYPE_GIVEN__errwarn_E_NO_IMPLICIT_DECL_ALLOWED
if eval \${$cacheid+:} false; then :
$as_echo_n "(cached) " >&6
@@ -6718,18 +6817,18 @@ fi
found="no"
if test $found = "no" ; then
- if test "x$xorg_testset_unknown_warning_option" = "xyes" ; then
+ if test "x$xorg_testset_cc_unknown_warning_option" = "xyes" ; then
CFLAGS="$CFLAGS -Werror=unknown-warning-option"
fi
- if test "x$xorg_testset_unused_command_line_argument" = "xyes" ; then
+ if test "x$xorg_testset_cc_unused_command_line_argument" = "xyes" ; then
CFLAGS="$CFLAGS -Werror=unused-command-line-argument"
fi
CFLAGS="$CFLAGS -Werror=nonnull"
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports-Werror=nonnull" >&5
-$as_echo_n "checking if $CC supports-Werror=nonnull... " >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=nonnull" >&5
+$as_echo_n "checking if $CC supports -Werror=nonnull... " >&6; }
cacheid=xorg_cv_cc_flag__Werror_nonnull
if eval \${$cacheid+:} false; then :
$as_echo_n "(cached) " >&6
@@ -6836,18 +6935,18 @@ fi
found="no"
if test $found = "no" ; then
- if test "x$xorg_testset_unknown_warning_option" = "xyes" ; then
+ if test "x$xorg_testset_cc_unknown_warning_option" = "xyes" ; then
CFLAGS="$CFLAGS -Werror=unknown-warning-option"
fi
- if test "x$xorg_testset_unused_command_line_argument" = "xyes" ; then
+ if test "x$xorg_testset_cc_unused_command_line_argument" = "xyes" ; then
CFLAGS="$CFLAGS -Werror=unused-command-line-argument"
fi
CFLAGS="$CFLAGS -Werror=init-self"
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports-Werror=init-self" >&5
-$as_echo_n "checking if $CC supports-Werror=init-self... " >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=init-self" >&5
+$as_echo_n "checking if $CC supports -Werror=init-self... " >&6; }
cacheid=xorg_cv_cc_flag__Werror_init_self
if eval \${$cacheid+:} false; then :
$as_echo_n "(cached) " >&6
@@ -6954,18 +7053,18 @@ fi
found="no"
if test $found = "no" ; then
- if test "x$xorg_testset_unknown_warning_option" = "xyes" ; then
+ if test "x$xorg_testset_cc_unknown_warning_option" = "xyes" ; then
CFLAGS="$CFLAGS -Werror=unknown-warning-option"
fi
- if test "x$xorg_testset_unused_command_line_argument" = "xyes" ; then
+ if test "x$xorg_testset_cc_unused_command_line_argument" = "xyes" ; then
CFLAGS="$CFLAGS -Werror=unused-command-line-argument"
fi
CFLAGS="$CFLAGS -Werror=main"
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports-Werror=main" >&5
-$as_echo_n "checking if $CC supports-Werror=main... " >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=main" >&5
+$as_echo_n "checking if $CC supports -Werror=main... " >&6; }
cacheid=xorg_cv_cc_flag__Werror_main
if eval \${$cacheid+:} false; then :
$as_echo_n "(cached) " >&6
@@ -7072,18 +7171,18 @@ fi
found="no"
if test $found = "no" ; then
- if test "x$xorg_testset_unknown_warning_option" = "xyes" ; then
+ if test "x$xorg_testset_cc_unknown_warning_option" = "xyes" ; then
CFLAGS="$CFLAGS -Werror=unknown-warning-option"
fi
- if test "x$xorg_testset_unused_command_line_argument" = "xyes" ; then
+ if test "x$xorg_testset_cc_unused_command_line_argument" = "xyes" ; then
CFLAGS="$CFLAGS -Werror=unused-command-line-argument"
fi
CFLAGS="$CFLAGS -Werror=missing-braces"
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports-Werror=missing-braces" >&5
-$as_echo_n "checking if $CC supports-Werror=missing-braces... " >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=missing-braces" >&5
+$as_echo_n "checking if $CC supports -Werror=missing-braces... " >&6; }
cacheid=xorg_cv_cc_flag__Werror_missing_braces
if eval \${$cacheid+:} false; then :
$as_echo_n "(cached) " >&6
@@ -7190,18 +7289,18 @@ fi
found="no"
if test $found = "no" ; then
- if test "x$xorg_testset_unknown_warning_option" = "xyes" ; then
+ if test "x$xorg_testset_cc_unknown_warning_option" = "xyes" ; then
CFLAGS="$CFLAGS -Werror=unknown-warning-option"
fi
- if test "x$xorg_testset_unused_command_line_argument" = "xyes" ; then
+ if test "x$xorg_testset_cc_unused_command_line_argument" = "xyes" ; then
CFLAGS="$CFLAGS -Werror=unused-command-line-argument"
fi
CFLAGS="$CFLAGS -Werror=sequence-point"
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports-Werror=sequence-point" >&5
-$as_echo_n "checking if $CC supports-Werror=sequence-point... " >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=sequence-point" >&5
+$as_echo_n "checking if $CC supports -Werror=sequence-point... " >&6; }
cacheid=xorg_cv_cc_flag__Werror_sequence_point
if eval \${$cacheid+:} false; then :
$as_echo_n "(cached) " >&6
@@ -7308,18 +7407,18 @@ fi
found="no"
if test $found = "no" ; then
- if test "x$xorg_testset_unknown_warning_option" = "xyes" ; then
+ if test "x$xorg_testset_cc_unknown_warning_option" = "xyes" ; then
CFLAGS="$CFLAGS -Werror=unknown-warning-option"
fi
- if test "x$xorg_testset_unused_command_line_argument" = "xyes" ; then
+ if test "x$xorg_testset_cc_unused_command_line_argument" = "xyes" ; then
CFLAGS="$CFLAGS -Werror=unused-command-line-argument"
fi
CFLAGS="$CFLAGS -Werror=return-type"
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports-Werror=return-type" >&5
-$as_echo_n "checking if $CC supports-Werror=return-type... " >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=return-type" >&5
+$as_echo_n "checking if $CC supports -Werror=return-type... " >&6; }
cacheid=xorg_cv_cc_flag__Werror_return_type
if eval \${$cacheid+:} false; then :
$as_echo_n "(cached) " >&6
@@ -7357,18 +7456,18 @@ $as_echo "$supported" >&6; }
fi
if test $found = "no" ; then
- if test "x$xorg_testset_unknown_warning_option" = "xyes" ; then
+ if test "x$xorg_testset_cc_unknown_warning_option" = "xyes" ; then
CFLAGS="$CFLAGS -Werror=unknown-warning-option"
fi
- if test "x$xorg_testset_unused_command_line_argument" = "xyes" ; then
+ if test "x$xorg_testset_cc_unused_command_line_argument" = "xyes" ; then
CFLAGS="$CFLAGS -Werror=unused-command-line-argument"
fi
CFLAGS="$CFLAGS -errwarn=E_FUNC_HAS_NO_RETURN_STMT"
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports-errwarn=E_FUNC_HAS_NO_RETURN_STMT" >&5
-$as_echo_n "checking if $CC supports-errwarn=E_FUNC_HAS_NO_RETURN_STMT... " >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -errwarn=E_FUNC_HAS_NO_RETURN_STMT" >&5
+$as_echo_n "checking if $CC supports -errwarn=E_FUNC_HAS_NO_RETURN_STMT... " >&6; }
cacheid=xorg_cv_cc_flag__errwarn_E_FUNC_HAS_NO_RETURN_STMT
if eval \${$cacheid+:} false; then :
$as_echo_n "(cached) " >&6
@@ -7475,18 +7574,18 @@ fi
found="no"
if test $found = "no" ; then
- if test "x$xorg_testset_unknown_warning_option" = "xyes" ; then
+ if test "x$xorg_testset_cc_unknown_warning_option" = "xyes" ; then
CFLAGS="$CFLAGS -Werror=unknown-warning-option"
fi
- if test "x$xorg_testset_unused_command_line_argument" = "xyes" ; then
+ if test "x$xorg_testset_cc_unused_command_line_argument" = "xyes" ; then
CFLAGS="$CFLAGS -Werror=unused-command-line-argument"
fi
CFLAGS="$CFLAGS -Werror=trigraphs"
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports-Werror=trigraphs" >&5
-$as_echo_n "checking if $CC supports-Werror=trigraphs... " >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=trigraphs" >&5
+$as_echo_n "checking if $CC supports -Werror=trigraphs... " >&6; }
cacheid=xorg_cv_cc_flag__Werror_trigraphs
if eval \${$cacheid+:} false; then :
$as_echo_n "(cached) " >&6
@@ -7593,18 +7692,18 @@ fi
found="no"
if test $found = "no" ; then
- if test "x$xorg_testset_unknown_warning_option" = "xyes" ; then
+ if test "x$xorg_testset_cc_unknown_warning_option" = "xyes" ; then
CFLAGS="$CFLAGS -Werror=unknown-warning-option"
fi
- if test "x$xorg_testset_unused_command_line_argument" = "xyes" ; then
+ if test "x$xorg_testset_cc_unused_command_line_argument" = "xyes" ; then
CFLAGS="$CFLAGS -Werror=unused-command-line-argument"
fi
CFLAGS="$CFLAGS -Werror=array-bounds"
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports-Werror=array-bounds" >&5
-$as_echo_n "checking if $CC supports-Werror=array-bounds... " >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=array-bounds" >&5
+$as_echo_n "checking if $CC supports -Werror=array-bounds... " >&6; }
cacheid=xorg_cv_cc_flag__Werror_array_bounds
if eval \${$cacheid+:} false; then :
$as_echo_n "(cached) " >&6
@@ -7711,18 +7810,18 @@ fi
found="no"
if test $found = "no" ; then
- if test "x$xorg_testset_unknown_warning_option" = "xyes" ; then
+ if test "x$xorg_testset_cc_unknown_warning_option" = "xyes" ; then
CFLAGS="$CFLAGS -Werror=unknown-warning-option"
fi
- if test "x$xorg_testset_unused_command_line_argument" = "xyes" ; then
+ if test "x$xorg_testset_cc_unused_command_line_argument" = "xyes" ; then
CFLAGS="$CFLAGS -Werror=unused-command-line-argument"
fi
CFLAGS="$CFLAGS -Werror=write-strings"
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports-Werror=write-strings" >&5
-$as_echo_n "checking if $CC supports-Werror=write-strings... " >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=write-strings" >&5
+$as_echo_n "checking if $CC supports -Werror=write-strings... " >&6; }
cacheid=xorg_cv_cc_flag__Werror_write_strings
if eval \${$cacheid+:} false; then :
$as_echo_n "(cached) " >&6
@@ -7829,18 +7928,18 @@ fi
found="no"
if test $found = "no" ; then
- if test "x$xorg_testset_unknown_warning_option" = "xyes" ; then
+ if test "x$xorg_testset_cc_unknown_warning_option" = "xyes" ; then
CFLAGS="$CFLAGS -Werror=unknown-warning-option"
fi
- if test "x$xorg_testset_unused_command_line_argument" = "xyes" ; then
+ if test "x$xorg_testset_cc_unused_command_line_argument" = "xyes" ; then
CFLAGS="$CFLAGS -Werror=unused-command-line-argument"
fi
CFLAGS="$CFLAGS -Werror=address"
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports-Werror=address" >&5
-$as_echo_n "checking if $CC supports-Werror=address... " >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=address" >&5
+$as_echo_n "checking if $CC supports -Werror=address... " >&6; }
cacheid=xorg_cv_cc_flag__Werror_address
if eval \${$cacheid+:} false; then :
$as_echo_n "(cached) " >&6
@@ -7947,18 +8046,18 @@ fi
found="no"
if test $found = "no" ; then
- if test "x$xorg_testset_unknown_warning_option" = "xyes" ; then
+ if test "x$xorg_testset_cc_unknown_warning_option" = "xyes" ; then
CFLAGS="$CFLAGS -Werror=unknown-warning-option"
fi
- if test "x$xorg_testset_unused_command_line_argument" = "xyes" ; then
+ if test "x$xorg_testset_cc_unused_command_line_argument" = "xyes" ; then
CFLAGS="$CFLAGS -Werror=unused-command-line-argument"
fi
CFLAGS="$CFLAGS -Werror=int-to-pointer-cast"
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports-Werror=int-to-pointer-cast" >&5
-$as_echo_n "checking if $CC supports-Werror=int-to-pointer-cast... " >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=int-to-pointer-cast" >&5
+$as_echo_n "checking if $CC supports -Werror=int-to-pointer-cast... " >&6; }
cacheid=xorg_cv_cc_flag__Werror_int_to_pointer_cast
if eval \${$cacheid+:} false; then :
$as_echo_n "(cached) " >&6
@@ -7996,18 +8095,18 @@ $as_echo "$supported" >&6; }
fi
if test $found = "no" ; then
- if test "x$xorg_testset_unknown_warning_option" = "xyes" ; then
+ if test "x$xorg_testset_cc_unknown_warning_option" = "xyes" ; then
CFLAGS="$CFLAGS -Werror=unknown-warning-option"
fi
- if test "x$xorg_testset_unused_command_line_argument" = "xyes" ; then
+ if test "x$xorg_testset_cc_unused_command_line_argument" = "xyes" ; then
CFLAGS="$CFLAGS -Werror=unused-command-line-argument"
fi
CFLAGS="$CFLAGS -errwarn=E_BAD_PTR_INT_COMBINATION"
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports-errwarn=E_BAD_PTR_INT_COMBINATION" >&5
-$as_echo_n "checking if $CC supports-errwarn=E_BAD_PTR_INT_COMBINATION... " >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -errwarn=E_BAD_PTR_INT_COMBINATION" >&5
+$as_echo_n "checking if $CC supports -errwarn=E_BAD_PTR_INT_COMBINATION... " >&6; }
cacheid=xorg_cv_cc_flag__errwarn_E_BAD_PTR_INT_COMBINATION
if eval \${$cacheid+:} false; then :
$as_echo_n "(cached) " >&6
@@ -8114,18 +8213,18 @@ fi
found="no"
if test $found = "no" ; then
- if test "x$xorg_testset_unknown_warning_option" = "xyes" ; then
+ if test "x$xorg_testset_cc_unknown_warning_option" = "xyes" ; then
CFLAGS="$CFLAGS -Werror=unknown-warning-option"
fi
- if test "x$xorg_testset_unused_command_line_argument" = "xyes" ; then
+ if test "x$xorg_testset_cc_unused_command_line_argument" = "xyes" ; then
CFLAGS="$CFLAGS -Werror=unused-command-line-argument"
fi
CFLAGS="$CFLAGS -Werror=pointer-to-int-cast"
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports-Werror=pointer-to-int-cast" >&5
-$as_echo_n "checking if $CC supports-Werror=pointer-to-int-cast... " >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=pointer-to-int-cast" >&5
+$as_echo_n "checking if $CC supports -Werror=pointer-to-int-cast... " >&6; }
cacheid=xorg_cv_cc_flag__Werror_pointer_to_int_cast
if eval \${$cacheid+:} false; then :
$as_echo_n "(cached) " >&6
@@ -8235,18 +8334,18 @@ fi
found="no"
if test $found = "no" ; then
- if test "x$xorg_testset_unknown_warning_option" = "xyes" ; then
+ if test "x$xorg_testset_cc_unknown_warning_option" = "xyes" ; then
CFLAGS="$CFLAGS -Werror=unknown-warning-option"
fi
- if test "x$xorg_testset_unused_command_line_argument" = "xyes" ; then
+ if test "x$xorg_testset_cc_unused_command_line_argument" = "xyes" ; then
CFLAGS="$CFLAGS -Werror=unused-command-line-argument"
fi
CFLAGS="$CFLAGS -Wimplicit"
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports-Wimplicit" >&5
-$as_echo_n "checking if $CC supports-Wimplicit... " >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wimplicit" >&5
+$as_echo_n "checking if $CC supports -Wimplicit... " >&6; }
cacheid=xorg_cv_cc_flag__Wimplicit
if eval \${$cacheid+:} false; then :
$as_echo_n "(cached) " >&6
@@ -8353,18 +8452,18 @@ fi
found="no"
if test $found = "no" ; then
- if test "x$xorg_testset_unknown_warning_option" = "xyes" ; then
+ if test "x$xorg_testset_cc_unknown_warning_option" = "xyes" ; then
CFLAGS="$CFLAGS -Werror=unknown-warning-option"
fi
- if test "x$xorg_testset_unused_command_line_argument" = "xyes" ; then
+ if test "x$xorg_testset_cc_unused_command_line_argument" = "xyes" ; then
CFLAGS="$CFLAGS -Werror=unused-command-line-argument"
fi
CFLAGS="$CFLAGS -Wnonnull"
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports-Wnonnull" >&5
-$as_echo_n "checking if $CC supports-Wnonnull... " >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wnonnull" >&5
+$as_echo_n "checking if $CC supports -Wnonnull... " >&6; }
cacheid=xorg_cv_cc_flag__Wnonnull
if eval \${$cacheid+:} false; then :
$as_echo_n "(cached) " >&6
@@ -8471,18 +8570,18 @@ fi
found="no"
if test $found = "no" ; then
- if test "x$xorg_testset_unknown_warning_option" = "xyes" ; then
+ if test "x$xorg_testset_cc_unknown_warning_option" = "xyes" ; then
CFLAGS="$CFLAGS -Werror=unknown-warning-option"
fi
- if test "x$xorg_testset_unused_command_line_argument" = "xyes" ; then
+ if test "x$xorg_testset_cc_unused_command_line_argument" = "xyes" ; then
CFLAGS="$CFLAGS -Werror=unused-command-line-argument"
fi
CFLAGS="$CFLAGS -Winit-self"
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports-Winit-self" >&5
-$as_echo_n "checking if $CC supports-Winit-self... " >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Winit-self" >&5
+$as_echo_n "checking if $CC supports -Winit-self... " >&6; }
cacheid=xorg_cv_cc_flag__Winit_self
if eval \${$cacheid+:} false; then :
$as_echo_n "(cached) " >&6
@@ -8589,18 +8688,18 @@ fi
found="no"
if test $found = "no" ; then
- if test "x$xorg_testset_unknown_warning_option" = "xyes" ; then
+ if test "x$xorg_testset_cc_unknown_warning_option" = "xyes" ; then
CFLAGS="$CFLAGS -Werror=unknown-warning-option"
fi
- if test "x$xorg_testset_unused_command_line_argument" = "xyes" ; then
+ if test "x$xorg_testset_cc_unused_command_line_argument" = "xyes" ; then
CFLAGS="$CFLAGS -Werror=unused-command-line-argument"
fi
CFLAGS="$CFLAGS -Wmain"
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports-Wmain" >&5
-$as_echo_n "checking if $CC supports-Wmain... " >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wmain" >&5
+$as_echo_n "checking if $CC supports -Wmain... " >&6; }
cacheid=xorg_cv_cc_flag__Wmain
if eval \${$cacheid+:} false; then :
$as_echo_n "(cached) " >&6
@@ -8707,18 +8806,18 @@ fi
found="no"
if test $found = "no" ; then
- if test "x$xorg_testset_unknown_warning_option" = "xyes" ; then
+ if test "x$xorg_testset_cc_unknown_warning_option" = "xyes" ; then
CFLAGS="$CFLAGS -Werror=unknown-warning-option"
fi
- if test "x$xorg_testset_unused_command_line_argument" = "xyes" ; then
+ if test "x$xorg_testset_cc_unused_command_line_argument" = "xyes" ; then
CFLAGS="$CFLAGS -Werror=unused-command-line-argument"
fi
CFLAGS="$CFLAGS -Wmissing-braces"
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports-Wmissing-braces" >&5
-$as_echo_n "checking if $CC supports-Wmissing-braces... " >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wmissing-braces" >&5
+$as_echo_n "checking if $CC supports -Wmissing-braces... " >&6; }
cacheid=xorg_cv_cc_flag__Wmissing_braces
if eval \${$cacheid+:} false; then :
$as_echo_n "(cached) " >&6
@@ -8825,18 +8924,18 @@ fi
found="no"
if test $found = "no" ; then
- if test "x$xorg_testset_unknown_warning_option" = "xyes" ; then
+ if test "x$xorg_testset_cc_unknown_warning_option" = "xyes" ; then
CFLAGS="$CFLAGS -Werror=unknown-warning-option"
fi
- if test "x$xorg_testset_unused_command_line_argument" = "xyes" ; then
+ if test "x$xorg_testset_cc_unused_command_line_argument" = "xyes" ; then
CFLAGS="$CFLAGS -Werror=unused-command-line-argument"
fi
CFLAGS="$CFLAGS -Wsequence-point"
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports-Wsequence-point" >&5
-$as_echo_n "checking if $CC supports-Wsequence-point... " >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wsequence-point" >&5
+$as_echo_n "checking if $CC supports -Wsequence-point... " >&6; }
cacheid=xorg_cv_cc_flag__Wsequence_point
if eval \${$cacheid+:} false; then :
$as_echo_n "(cached) " >&6
@@ -8943,18 +9042,18 @@ fi
found="no"
if test $found = "no" ; then
- if test "x$xorg_testset_unknown_warning_option" = "xyes" ; then
+ if test "x$xorg_testset_cc_unknown_warning_option" = "xyes" ; then
CFLAGS="$CFLAGS -Werror=unknown-warning-option"
fi
- if test "x$xorg_testset_unused_command_line_argument" = "xyes" ; then
+ if test "x$xorg_testset_cc_unused_command_line_argument" = "xyes" ; then
CFLAGS="$CFLAGS -Werror=unused-command-line-argument"
fi
CFLAGS="$CFLAGS -Wreturn-type"
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports-Wreturn-type" >&5
-$as_echo_n "checking if $CC supports-Wreturn-type... " >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wreturn-type" >&5
+$as_echo_n "checking if $CC supports -Wreturn-type... " >&6; }
cacheid=xorg_cv_cc_flag__Wreturn_type
if eval \${$cacheid+:} false; then :
$as_echo_n "(cached) " >&6
@@ -9061,18 +9160,18 @@ fi
found="no"
if test $found = "no" ; then
- if test "x$xorg_testset_unknown_warning_option" = "xyes" ; then
+ if test "x$xorg_testset_cc_unknown_warning_option" = "xyes" ; then
CFLAGS="$CFLAGS -Werror=unknown-warning-option"
fi
- if test "x$xorg_testset_unused_command_line_argument" = "xyes" ; then
+ if test "x$xorg_testset_cc_unused_command_line_argument" = "xyes" ; then
CFLAGS="$CFLAGS -Werror=unused-command-line-argument"
fi
CFLAGS="$CFLAGS -Wtrigraphs"
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports-Wtrigraphs" >&5
-$as_echo_n "checking if $CC supports-Wtrigraphs... " >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wtrigraphs" >&5
+$as_echo_n "checking if $CC supports -Wtrigraphs... " >&6; }
cacheid=xorg_cv_cc_flag__Wtrigraphs
if eval \${$cacheid+:} false; then :
$as_echo_n "(cached) " >&6
@@ -9179,18 +9278,18 @@ fi
found="no"
if test $found = "no" ; then
- if test "x$xorg_testset_unknown_warning_option" = "xyes" ; then
+ if test "x$xorg_testset_cc_unknown_warning_option" = "xyes" ; then
CFLAGS="$CFLAGS -Werror=unknown-warning-option"
fi
- if test "x$xorg_testset_unused_command_line_argument" = "xyes" ; then
+ if test "x$xorg_testset_cc_unused_command_line_argument" = "xyes" ; then
CFLAGS="$CFLAGS -Werror=unused-command-line-argument"
fi
CFLAGS="$CFLAGS -Warray-bounds"
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports-Warray-bounds" >&5
-$as_echo_n "checking if $CC supports-Warray-bounds... " >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Warray-bounds" >&5
+$as_echo_n "checking if $CC supports -Warray-bounds... " >&6; }
cacheid=xorg_cv_cc_flag__Warray_bounds
if eval \${$cacheid+:} false; then :
$as_echo_n "(cached) " >&6
@@ -9297,18 +9396,18 @@ fi
found="no"
if test $found = "no" ; then
- if test "x$xorg_testset_unknown_warning_option" = "xyes" ; then
+ if test "x$xorg_testset_cc_unknown_warning_option" = "xyes" ; then
CFLAGS="$CFLAGS -Werror=unknown-warning-option"
fi
- if test "x$xorg_testset_unused_command_line_argument" = "xyes" ; then
+ if test "x$xorg_testset_cc_unused_command_line_argument" = "xyes" ; then
CFLAGS="$CFLAGS -Werror=unused-command-line-argument"
fi
CFLAGS="$CFLAGS -Wwrite-strings"
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports-Wwrite-strings" >&5
-$as_echo_n "checking if $CC supports-Wwrite-strings... " >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wwrite-strings" >&5
+$as_echo_n "checking if $CC supports -Wwrite-strings... " >&6; }
cacheid=xorg_cv_cc_flag__Wwrite_strings
if eval \${$cacheid+:} false; then :
$as_echo_n "(cached) " >&6
@@ -9415,18 +9514,18 @@ fi
found="no"
if test $found = "no" ; then
- if test "x$xorg_testset_unknown_warning_option" = "xyes" ; then
+ if test "x$xorg_testset_cc_unknown_warning_option" = "xyes" ; then
CFLAGS="$CFLAGS -Werror=unknown-warning-option"
fi
- if test "x$xorg_testset_unused_command_line_argument" = "xyes" ; then
+ if test "x$xorg_testset_cc_unused_command_line_argument" = "xyes" ; then
CFLAGS="$CFLAGS -Werror=unused-command-line-argument"
fi
CFLAGS="$CFLAGS -Waddress"
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports-Waddress" >&5
-$as_echo_n "checking if $CC supports-Waddress... " >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Waddress" >&5
+$as_echo_n "checking if $CC supports -Waddress... " >&6; }
cacheid=xorg_cv_cc_flag__Waddress
if eval \${$cacheid+:} false; then :
$as_echo_n "(cached) " >&6
@@ -9533,18 +9632,18 @@ fi
found="no"
if test $found = "no" ; then
- if test "x$xorg_testset_unknown_warning_option" = "xyes" ; then
+ if test "x$xorg_testset_cc_unknown_warning_option" = "xyes" ; then
CFLAGS="$CFLAGS -Werror=unknown-warning-option"
fi
- if test "x$xorg_testset_unused_command_line_argument" = "xyes" ; then
+ if test "x$xorg_testset_cc_unused_command_line_argument" = "xyes" ; then
CFLAGS="$CFLAGS -Werror=unused-command-line-argument"
fi
CFLAGS="$CFLAGS -Wint-to-pointer-cast"
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports-Wint-to-pointer-cast" >&5
-$as_echo_n "checking if $CC supports-Wint-to-pointer-cast... " >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wint-to-pointer-cast" >&5
+$as_echo_n "checking if $CC supports -Wint-to-pointer-cast... " >&6; }
cacheid=xorg_cv_cc_flag__Wint_to_pointer_cast
if eval \${$cacheid+:} false; then :
$as_echo_n "(cached) " >&6
@@ -9651,18 +9750,18 @@ fi
found="no"
if test $found = "no" ; then
- if test "x$xorg_testset_unknown_warning_option" = "xyes" ; then
+ if test "x$xorg_testset_cc_unknown_warning_option" = "xyes" ; then
CFLAGS="$CFLAGS -Werror=unknown-warning-option"
fi
- if test "x$xorg_testset_unused_command_line_argument" = "xyes" ; then
+ if test "x$xorg_testset_cc_unused_command_line_argument" = "xyes" ; then
CFLAGS="$CFLAGS -Werror=unused-command-line-argument"
fi
CFLAGS="$CFLAGS -Wpointer-to-int-cast"
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports-Wpointer-to-int-cast" >&5
-$as_echo_n "checking if $CC supports-Wpointer-to-int-cast... " >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wpointer-to-int-cast" >&5
+$as_echo_n "checking if $CC supports -Wpointer-to-int-cast... " >&6; }
cacheid=xorg_cv_cc_flag__Wpointer_to_int_cast
if eval \${$cacheid+:} false; then :
$as_echo_n "(cached) " >&6
@@ -9802,18 +9901,18 @@ fi
found="no"
if test $found = "no" ; then
- if test "x$xorg_testset_unknown_warning_option" = "xyes" ; then
+ if test "x$xorg_testset_cc_unknown_warning_option" = "xyes" ; then
CFLAGS="$CFLAGS -Werror=unknown-warning-option"
fi
- if test "x$xorg_testset_unused_command_line_argument" = "xyes" ; then
+ if test "x$xorg_testset_cc_unused_command_line_argument" = "xyes" ; then
CFLAGS="$CFLAGS -Werror=unused-command-line-argument"
fi
CFLAGS="$CFLAGS -pedantic"
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports-pedantic" >&5
-$as_echo_n "checking if $CC supports-pedantic... " >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -pedantic" >&5
+$as_echo_n "checking if $CC supports -pedantic... " >&6; }
cacheid=xorg_cv_cc_flag__pedantic
if eval \${$cacheid+:} false; then :
$as_echo_n "(cached) " >&6
@@ -9920,18 +10019,18 @@ fi
found="no"
if test $found = "no" ; then
- if test "x$xorg_testset_unknown_warning_option" = "xyes" ; then
+ if test "x$xorg_testset_cc_unknown_warning_option" = "xyes" ; then
CFLAGS="$CFLAGS -Werror=unknown-warning-option"
fi
- if test "x$xorg_testset_unused_command_line_argument" = "xyes" ; then
+ if test "x$xorg_testset_cc_unused_command_line_argument" = "xyes" ; then
CFLAGS="$CFLAGS -Werror=unused-command-line-argument"
fi
CFLAGS="$CFLAGS -Werror"
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports-Werror" >&5
-$as_echo_n "checking if $CC supports-Werror... " >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror" >&5
+$as_echo_n "checking if $CC supports -Werror... " >&6; }
cacheid=xorg_cv_cc_flag__Werror
if eval \${$cacheid+:} false; then :
$as_echo_n "(cached) " >&6
@@ -9969,18 +10068,18 @@ $as_echo "$supported" >&6; }
fi
if test $found = "no" ; then
- if test "x$xorg_testset_unknown_warning_option" = "xyes" ; then
+ if test "x$xorg_testset_cc_unknown_warning_option" = "xyes" ; then
CFLAGS="$CFLAGS -Werror=unknown-warning-option"
fi
- if test "x$xorg_testset_unused_command_line_argument" = "xyes" ; then
+ if test "x$xorg_testset_cc_unused_command_line_argument" = "xyes" ; then
CFLAGS="$CFLAGS -Werror=unused-command-line-argument"
fi
CFLAGS="$CFLAGS -errwarn"
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports-errwarn" >&5
-$as_echo_n "checking if $CC supports-errwarn... " >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -errwarn" >&5
+$as_echo_n "checking if $CC supports -errwarn... " >&6; }
cacheid=xorg_cv_cc_flag__errwarn
if eval \${$cacheid+:} false; then :
$as_echo_n "(cached) " >&6
@@ -10090,18 +10189,18 @@ fi
found="no"
if test $found = "no" ; then
- if test "x$xorg_testset_unknown_warning_option" = "xyes" ; then
+ if test "x$xorg_testset_cc_unknown_warning_option" = "xyes" ; then
CFLAGS="$CFLAGS -Werror=unknown-warning-option"
fi
- if test "x$xorg_testset_unused_command_line_argument" = "xyes" ; then
+ if test "x$xorg_testset_cc_unused_command_line_argument" = "xyes" ; then
CFLAGS="$CFLAGS -Werror=unused-command-line-argument"
fi
CFLAGS="$CFLAGS -Werror=attributes"
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports-Werror=attributes" >&5
-$as_echo_n "checking if $CC supports-Werror=attributes... " >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=attributes" >&5
+$as_echo_n "checking if $CC supports -Werror=attributes... " >&6; }
cacheid=xorg_cv_cc_flag__Werror_attributes
if eval \${$cacheid+:} false; then :
$as_echo_n "(cached) " >&6
@@ -10320,52 +10419,64 @@ AM_BACKSLASH='\'
+for ac_func in strlcpy
+do :
+ ac_fn_c_check_func "$LINENO" "strlcpy" "ac_cv_func_strlcpy"
+if test "x$ac_cv_func_strlcpy" = xyes; then :
+ cat >>confdefs.h <<_ACEOF
+#define HAVE_STRLCPY 1
+_ACEOF
+
+fi
+done
+
+
# Checks for pkg-config packages
pkg_failed=no
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for XCALC" >&5
$as_echo_n "checking for XCALC... " >&6; }
-if test -n "$PKG_CONFIG"; then
- if test -n "$XCALC_CFLAGS"; then
- pkg_cv_XCALC_CFLAGS="$XCALC_CFLAGS"
- else
- if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xaw7 xt x11\""; } >&5
- ($PKG_CONFIG --exists --print-errors "xaw7 xt x11") 2>&5
+if test -n "$XCALC_CFLAGS"; then
+ pkg_cv_XCALC_CFLAGS="$XCALC_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xaw7 xt x11 xproto >= 7.0.17\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "xaw7 xt x11 xproto >= 7.0.17") 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
- pkg_cv_XCALC_CFLAGS=`$PKG_CONFIG --cflags "xaw7 xt x11" 2>/dev/null`
+ pkg_cv_XCALC_CFLAGS=`$PKG_CONFIG --cflags "xaw7 xt x11 xproto >= 7.0.17" 2>/dev/null`
+ test "x$?" != "x0" && pkg_failed=yes
else
pkg_failed=yes
fi
- fi
-else
- pkg_failed=untried
+ else
+ pkg_failed=untried
fi
-if test -n "$PKG_CONFIG"; then
- if test -n "$XCALC_LIBS"; then
- pkg_cv_XCALC_LIBS="$XCALC_LIBS"
- else
- if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xaw7 xt x11\""; } >&5
- ($PKG_CONFIG --exists --print-errors "xaw7 xt x11") 2>&5
+if test -n "$XCALC_LIBS"; then
+ pkg_cv_XCALC_LIBS="$XCALC_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xaw7 xt x11 xproto >= 7.0.17\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "xaw7 xt x11 xproto >= 7.0.17") 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
- pkg_cv_XCALC_LIBS=`$PKG_CONFIG --libs "xaw7 xt x11" 2>/dev/null`
+ pkg_cv_XCALC_LIBS=`$PKG_CONFIG --libs "xaw7 xt x11 xproto >= 7.0.17" 2>/dev/null`
+ test "x$?" != "x0" && pkg_failed=yes
else
pkg_failed=yes
fi
- fi
-else
- pkg_failed=untried
+ else
+ pkg_failed=untried
fi
if test $pkg_failed = yes; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
_pkg_short_errors_supported=yes
@@ -10373,14 +10484,14 @@ else
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
- XCALC_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "xaw7 xt x11"`
+ XCALC_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "xaw7 xt x11 xproto >= 7.0.17" 2>&1`
else
- XCALC_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "xaw7 xt x11"`
+ XCALC_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "xaw7 xt x11 xproto >= 7.0.17" 2>&1`
fi
# Put the nasty error message in config.log where it belongs
echo "$XCALC_PKG_ERRORS" >&5
- as_fn_error $? "Package requirements (xaw7 xt x11) were not met:
+ as_fn_error $? "Package requirements (xaw7 xt x11 xproto >= 7.0.17) were not met:
$XCALC_PKG_ERRORS
@@ -10389,9 +10500,10 @@ installed software in a non-standard prefix.
Alternatively, you may set the environment variables XCALC_CFLAGS
and XCALC_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details.
-" "$LINENO" 5
+See the pkg-config man page for more details." "$LINENO" 5
elif test $pkg_failed = untried; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it
@@ -10402,14 +10514,14 @@ Alternatively, you may set the environment variables XCALC_CFLAGS
and XCALC_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
-To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.
+To get pkg-config, see <http://pkg-config.freedesktop.org/>.
See \`config.log' for more details" "$LINENO" 5; }
else
XCALC_CFLAGS=$pkg_cv_XCALC_CFLAGS
XCALC_LIBS=$pkg_cv_XCALC_LIBS
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
- :
+
fi
@@ -10417,46 +10529,46 @@ pkg_failed=no
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for APPDEFS" >&5
$as_echo_n "checking for APPDEFS... " >&6; }
-if test -n "$PKG_CONFIG"; then
- if test -n "$APPDEFS_CFLAGS"; then
- pkg_cv_APPDEFS_CFLAGS="$APPDEFS_CFLAGS"
- else
- if test -n "$PKG_CONFIG" && \
+if test -n "$APPDEFS_CFLAGS"; then
+ pkg_cv_APPDEFS_CFLAGS="$APPDEFS_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xt\""; } >&5
($PKG_CONFIG --exists --print-errors "xt") 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
pkg_cv_APPDEFS_CFLAGS=`$PKG_CONFIG --cflags "xt" 2>/dev/null`
+ test "x$?" != "x0" && pkg_failed=yes
else
pkg_failed=yes
fi
- fi
-else
- pkg_failed=untried
+ else
+ pkg_failed=untried
fi
-if test -n "$PKG_CONFIG"; then
- if test -n "$APPDEFS_LIBS"; then
- pkg_cv_APPDEFS_LIBS="$APPDEFS_LIBS"
- else
- if test -n "$PKG_CONFIG" && \
+if test -n "$APPDEFS_LIBS"; then
+ pkg_cv_APPDEFS_LIBS="$APPDEFS_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xt\""; } >&5
($PKG_CONFIG --exists --print-errors "xt") 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
pkg_cv_APPDEFS_LIBS=`$PKG_CONFIG --libs "xt" 2>/dev/null`
+ test "x$?" != "x0" && pkg_failed=yes
else
pkg_failed=yes
fi
- fi
-else
- pkg_failed=untried
+ else
+ pkg_failed=untried
fi
if test $pkg_failed = yes; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
_pkg_short_errors_supported=yes
@@ -10464,9 +10576,9 @@ else
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
- APPDEFS_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "xt"`
+ APPDEFS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "xt" 2>&1`
else
- APPDEFS_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "xt"`
+ APPDEFS_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "xt" 2>&1`
fi
# Put the nasty error message in config.log where it belongs
echo "$APPDEFS_PKG_ERRORS" >&5
@@ -10480,9 +10592,10 @@ installed software in a non-standard prefix.
Alternatively, you may set the environment variables APPDEFS_CFLAGS
and APPDEFS_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details.
-" "$LINENO" 5
+See the pkg-config man page for more details." "$LINENO" 5
elif test $pkg_failed = untried; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it
@@ -10493,14 +10606,14 @@ Alternatively, you may set the environment variables APPDEFS_CFLAGS
and APPDEFS_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
-To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.
+To get pkg-config, see <http://pkg-config.freedesktop.org/>.
See \`config.log' for more details" "$LINENO" 5; }
else
APPDEFS_CFLAGS=$pkg_cv_APPDEFS_CFLAGS
APPDEFS_LIBS=$pkg_cv_APPDEFS_LIBS
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
- :
+
fi
xt_appdefaultdir=`$PKG_CONFIG --variable=appdefaultdir xt`
@@ -10641,10 +10754,6 @@ else
am__EXEEXT_FALSE=
fi
-if test -z "${MAINTAINER_MODE_TRUE}" && test -z "${MAINTAINER_MODE_FALSE}"; then
- as_fn_error $? "conditional \"MAINTAINER_MODE\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then
as_fn_error $? "conditional \"AMDEP\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
@@ -11050,7 +11159,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by xcalc $as_me 1.0.5, which was
+This file was extended by xcalc $as_me 1.0.6, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -11116,7 +11225,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-xcalc config.status 1.0.5
+xcalc config.status 1.0.6
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
diff --git a/app/xcalc/configure.ac b/app/xcalc/configure.ac
index 3a0fb2a87..efeb403f1 100644
--- a/app/xcalc/configure.ac
+++ b/app/xcalc/configure.ac
@@ -23,14 +23,13 @@ dnl Process this file with autoconf to create configure.
# Initialize Autoconf
AC_PREREQ([2.60])
-AC_INIT([xcalc], [1.0.5],
+AC_INIT([xcalc], [1.0.6],
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], [xcalc])
AC_CONFIG_SRCDIR([Makefile.am])
AC_CONFIG_HEADERS([config.h])
# Initialize Automake
AM_INIT_AUTOMAKE([foreign dist-bzip2])
-AM_MAINTAINER_MODE
# Require X.Org macros 1.8 or later for MAN_SUBSTS set by XORG_MANPAGE_SECTIONS
m4_ifndef([XORG_MACROS_VERSION],
@@ -38,8 +37,10 @@ m4_ifndef([XORG_MACROS_VERSION],
XORG_MACROS_VERSION(1.8)
XORG_DEFAULT_OPTIONS
+AC_CHECK_FUNCS([strlcpy])
+
# Checks for pkg-config packages
-PKG_CHECK_MODULES(XCALC, xaw7 xt x11)
+PKG_CHECK_MODULES(XCALC, [xaw7 xt x11 xproto >= 7.0.17])
PKG_CHECK_MODULES(APPDEFS, xt)
xt_appdefaultdir=`$PKG_CONFIG --variable=appdefaultdir xt`
diff --git a/app/xcalc/man/Makefile.in b/app/xcalc/man/Makefile.in
index 8b7b28016..4b5fda9b7 100644
--- a/app/xcalc/man/Makefile.in
+++ b/app/xcalc/man/Makefile.in
@@ -155,7 +155,6 @@ LIBS = @LIBS@
LIB_MAN_DIR = @LIB_MAN_DIR@
LIB_MAN_SUFFIX = @LIB_MAN_SUFFIX@
LTLIBOBJS = @LTLIBOBJS@
-MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
MAN_SUBSTS = @MAN_SUBSTS@
MISC_MAN_DIR = @MISC_MAN_DIR@
@@ -171,6 +170,8 @@ PACKAGE_URL = @PACKAGE_URL@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
@@ -241,7 +242,7 @@ all: all-am
.SUFFIXES:
.SUFFIXES: .$(APP_MAN_SUFFIX) .man
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
+$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
@for dep in $?; do \
case '$(am__configure_deps)' in \
*$$dep*) \
@@ -266,9 +267,9 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+$(top_srcdir)/configure: $(am__configure_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
$(am__aclocal_m4_deps):
install-appmanDATA: $(appman_DATA)
diff --git a/app/xcalc/math.c b/app/xcalc/math.c
index b290bebd9..c8ac1a846 100644
--- a/app/xcalc/math.c
+++ b/app/xcalc/math.c
@@ -18,43 +18,19 @@
#include "xcalc.h"
-#ifdef _CRAY /* kludge around Cray STDC compiler */
-double (*log_p)() = log;
-#define log ((*log_p))
-double (*exp_p)() = exp;
-#define exp ((*exp_p))
-double (*sqrt_p)() = sqrt;
-#define sqrt ((*sqrt_p))
-double (*log10_p)() = log10;
-#define log10 ((*log10_p))
-double (*atan2_p)() = atan2;
-#define atan2 ((*atan2_p))
-double (*asin_p)() = asin;
-#define asin ((*asin_p))
-double (*acos_p)() = acos;
-#define acos ((*acos_p))
-double (*atan_p)() = atan;
-#define atan ((*atan_p))
-double (*sin_p)() = sin;
-#define sin ((*sin_p))
-double (*cos_p)() = cos;
-#define cos ((*cos_p))
-double (*tan_p)() = tan;
-#define tan ((*tan_p))
-double (*pow_p)() = pow;
-#define pow ((*pow_p))
-#endif /* _CRAY */
-
-#ifndef PI /* sometimes defined in math.h */
-#define PI 3.14159265358979
+#ifndef M_PI /* sometimes defined in math.h */
+#define M_PI 3.14159265358979323846
#endif
-#define E 2.71828182845904
+
+#ifndef M_E /* sometimes defined in math.h */
+#define M_E 2.7182818284590452354
+#endif
+
#define MAXDISP 11
#define DEG 0 /* DRG mode. used for trig calculations */
#define RAD 1
#define GRAD 2
-#define min(a,b) ((a) < (b) ? (a) : (b))
-#define max(a,b) ((a) > (b) ? (a) : (b))
+
#define True 1
#define False 0
@@ -69,8 +45,8 @@ jmp_buf env;
static int flagINV, flagPAREN, flagM, drgmode; /* display flags */
-static double drg2rad=PI/180.0; /* Conversion factors for trig funcs */
-static double rad2drg=180.0/PI;
+static double drg2rad=M_PI/180.0; /* Conversion factors for trig funcs */
+static double rad2drg=180.0/M_PI;
static int entered=1; /* true if display contains a valid number.
if==2, then use 'dnum', rather than the string
stored in the display. (for accuracy)
@@ -102,6 +78,17 @@ static void RollNum(int dir);
static void ClearStacks(void);
static int priority(int op);
+#ifndef HAVE_STRLCPY
+/* Close enough for the short strings copied in xcalc */
+static inline size_t
+strlcpy(char *dst, const char *src, size_t size)
+{
+ strncpy(dst, src, size);
+ dst[size - 1] = '\0';
+ return strlen(src);
+}
+#endif
+
/*
* The following is to deal with the unfortunate assumption that if errno
* is non-zero then an error has occurred. On some systems (e.g. Ultrix),
@@ -147,9 +134,9 @@ static volatile int SignalKind;
void fail_op(void)
{
if (SignalKind == SIGFPE)
- strcpy(dispstr, "math error");
+ strlcpy(dispstr, "math error", sizeof(dispstr));
else if (SignalKind == SIGILL)
- strcpy(dispstr, "illegal operand");
+ strlcpy(dispstr, "illegal operand", sizeof(dispstr));
entered=3;
DrawDisplay();
@@ -157,7 +144,7 @@ void fail_op(void)
}
/*ARGSUSED*/
-signal_t fperr(int sig)
+void fperr(int sig)
{
#if defined(SYSV) || defined(SVR4) || defined(linux)
signal(SIGFPE, fperr);
@@ -168,7 +155,7 @@ signal_t fperr(int sig)
/* for VAX BSD4.3 */
/*ARGSUSED*/
-signal_t illerr(int sig)
+void illerr(int sig)
{
/* not reset when caught? */
signal(SIGILL, illerr);
@@ -187,7 +174,7 @@ void post_op(void)
#endif
#ifndef IEEE
if (errno) {
- strcpy(dispstr,"error");
+ strlcpy(dispstr, "error", sizeof(dispstr));
DrawDisplay();
entered=3;
errno=0;
@@ -198,19 +185,18 @@ void post_op(void)
static void
DrawDisplay(void)
{
- if ((int) strlen(dispstr) > 12) { /* strip out some decimal digits */
- char tmp[32];
- char *estr = index(dispstr,'e'); /* search for exponent part */
+ if (strlen(dispstr) > 12) { /* strip out some decimal digits */
+ char *estr = strchr(dispstr,'e'); /* search for exponent part */
if (!estr) dispstr[12]='\0'; /* no exp, just trunc. */
else {
- if ((int) strlen(estr) <= 4)
- sprintf(tmp,"%.8s",dispstr); /* leftmost 8 chars */
- else
- sprintf(tmp,"%.7s",dispstr); /* leftmost 7 chars */
- strcat (tmp,estr); /* plus exponent */
- strcpy (dispstr,tmp);
- }
+ char tmp[32];
+ if (strlen(estr) <= 4) /* leftmost 8 chars plus exponent */
+ snprintf(tmp, sizeof(tmp), "%.8s%s", dispstr, estr);
+ else /* leftmost 7 chars plus exponent */
+ snprintf(tmp, sizeof(tmp), "%.7s%s", dispstr, estr);
+ strlcpy(dispstr, tmp, sizeof(dispstr));
}
+ }
draw(dispstr);
setflag(XCalc_MEMORY, (flagM));
setflag(XCalc_INVERSE, (flagINV));
@@ -252,7 +238,7 @@ numeric(int keynum)
case kRCL:
PushNum(dnum);
dnum = mem[cell];
- sprintf(dispstr, "%.8g", dnum);
+ snprintf(dispstr, sizeof(dispstr), "%.8g", dnum);
lift_enabled = 1;
entered = 1;
clrdisp++;
@@ -338,7 +324,7 @@ bkspf(void)
}
else
{
- strcpy(dispstr, "0");
+ strlcpy(dispstr, "0", sizeof(dispstr));
dnum = 0.0;
clrdisp++;
flagINV = 0;
@@ -353,7 +339,7 @@ decf(void)
if (clrdisp) {
if (rpn && lift_enabled)
PushNum(dnum);
- strcpy(dispstr,"0");
+ strlcpy(dispstr, "0", sizeof(dispstr));
}
if (!Dpoint) {
#ifndef X_LOCALE
@@ -375,7 +361,7 @@ eef(void)
if (clrdisp) {
if (rpn && lift_enabled)
PushNum(dnum);
- strcpy(dispstr, rpn ? "1" : "0");
+ strlcpy(dispstr, rpn ? "1" : "0", sizeof(dispstr));
}
if (!exponent) {
strcat(dispstr,"E+");
@@ -398,7 +384,7 @@ clearf(void)
exponent=Dpoint=0;
clrdisp=1;
entered=1;
- strcpy(dispstr,"0");
+ strlcpy(dispstr, "0", sizeof(dispstr));
DrawDisplay();
}
@@ -421,8 +407,8 @@ negf(void)
strcpy(dispstr,dispstr+1); /* move str left once */
else { /* not neg-ed. add a '-' */
char tmp[32];
- sprintf(tmp,"-%s",dispstr);
- strcpy(dispstr,tmp);
+ snprintf(tmp, sizeof(tmp), "-%s", dispstr);
+ strlcpy(dispstr, tmp, sizeof(dispstr));
}
if (entered==2)
dnum = -1.0 * dnum;
@@ -482,7 +468,7 @@ twoop(int keynum)
}
PushNum(acc);
PushOp(keynum);
- sprintf(dispstr,"%.8g",acc);
+ snprintf(dispstr, sizeof(dispstr), "%.8g", acc);
DrawDisplay();
dnum=acc;
}
@@ -514,7 +500,7 @@ twof(int keynum)
case kPOW: acc = pow(acc,dnum); break;
case kXXY: PushNum(dnum);
}
- sprintf(dispstr, "%.8g", acc);
+ snprintf(dispstr, sizeof(dispstr), "%.8g", acc);
DrawDisplay();
clrdisp++;
Dpoint = exponent = 0;
@@ -580,7 +566,7 @@ equf(void)
PushNum(dnum);
}
- sprintf(dispstr,"%.8g",dnum);
+ snprintf(dispstr, sizeof(dispstr), "%.8g", dnum);
DrawDisplay();
}
@@ -605,7 +591,7 @@ rollf(void)
RollNum(flagINV);
flagINV=0;
clrdisp++;
- sprintf(dispstr, "%.8g", dnum);
+ snprintf(dispstr, sizeof(dispstr), "%.8g", dnum);
DrawDisplay();
}
@@ -649,7 +635,7 @@ rparf(void)
(void) PopNum();
flagPAREN--;
entered=2;
- sprintf(dispstr,"%.8g",dnum);
+ snprintf(dispstr, sizeof(dispstr), "%.8g", dnum);
DrawDisplay();
}
@@ -660,27 +646,27 @@ drgf(void)
if (entered==1)
parse_double(dispstr,"%lf",&dnum);
switch (drgmode) {
- case DEG: dnum=dnum*PI/180.0; break;
- case RAD: dnum=dnum*200.0/PI; break;
+ case DEG: dnum=dnum*M_PI/180.0; break;
+ case RAD: dnum=dnum*200.0/M_PI; break;
case GRAD: dnum=dnum*90.0/100.0; break;
}
entered=2;
clrdisp=1;
flagINV=0;
- sprintf(dispstr,"%.8g",dnum);
+ snprintf(dispstr, sizeof(dispstr), "%.8g", dnum);
}
flagINV=0;
drgmode = (drgmode + 1) % 3;
switch (drgmode) {
- case DEG: drg2rad=PI / 180.0;
- rad2drg=180.0 / PI;
+ case DEG: drg2rad=M_PI / 180.0;
+ rad2drg=180.0 / M_PI;
break;
case RAD: drg2rad=1.0;
rad2drg=1.0;
break;
- case GRAD: drg2rad=PI / 200.0;
- rad2drg=200.0 / PI;
+ case GRAD: drg2rad=M_PI / 200.0;
+ rad2drg=200.0 / M_PI;
break;
}
DrawDisplay();
@@ -715,8 +701,8 @@ oneop(int keynum)
entered = 2;
switch (keynum) { /* do the actual math fn. */
- case kE: if (rpn && memop != kENTR) PushNum(dnum); dnum=E; break;
- case kPI: if (rpn && memop != kENTR) PushNum(dnum); dnum=PI; break;
+ case kE: if (rpn && memop != kENTR) PushNum(dnum); dnum=M_E; break;
+ case kPI: if (rpn && memop != kENTR) PushNum(dnum); dnum=M_PI; break;
case kRECIP: dnum=1.0/dnum; break;
case kSQR: flagINV = !flagINV; /* fall through to */
case kSQRT: if (flagINV) dnum=dnum*dnum;
@@ -746,7 +732,7 @@ oneop(int keynum)
case kEXC: dtmp=dnum; dnum=mem[0]; mem[0]=dtmp;
flagM=!(mem[0]==0.0); break;
case kFACT: if (floor(dnum)!=dnum || dnum<0.0 || dnum>500.0) {
- strcpy(dispstr,"error");
+ strlcpy(dispstr, "error", sizeof(dispstr));
entered=3;
break;
}
@@ -766,7 +752,7 @@ oneop(int keynum)
clrdisp=1;
flagINV=0;
lift_enabled = 1;
- sprintf(dispstr,"%.8g",dnum);
+ snprintf(dispstr, sizeof(dispstr), "%.8g", dnum);
DrawDisplay();
}
@@ -799,8 +785,11 @@ static void
PushOp(int op)
/*******/
{
- if (opsp==STACKMAX) {strcpy(dispstr,"stack error"); entered=3;}
- else opstack[opsp++]=op;
+ if (opsp==STACKMAX) {
+ strlcpy(dispstr, "stack error", sizeof(dispstr));
+ entered=3;
+ } else
+ opstack[opsp++]=op;
}
/*******/
@@ -809,7 +798,7 @@ PopOp(void)
/*******/
{
if (opsp==0) {
- strcpy(dispstr,"stack error");
+ strlcpy(dispstr, "stack error", sizeof(dispstr));
entered=3;
return(kNOP);
} else
@@ -845,7 +834,7 @@ PushNum(double num)
return;
}
if (numsp==STACKMAX) {
- strcpy(dispstr,"stack error");
+ strlcpy(dispstr, "stack error", sizeof(dispstr));
entered=3;
} else
numstack[numsp++]=num;
@@ -863,7 +852,7 @@ PopNum(void)
return(tmp);
}
if (numsp==0) {
- strcpy(dispstr,"stack error");
+ strlcpy(dispstr, "stack error", sizeof(dispstr));
entered=3;
return 0.0;
} else
@@ -932,9 +921,9 @@ ResetCalc(void)
setflag(XCalc_RADIAN, False);
setflag(XCalc_GRADAM, False);
setflag(XCalc_DEGREE, True);
- strcpy(dispstr,"0");
+ strlcpy(dispstr, "0", sizeof(dispstr));
draw(dispstr);
ClearStacks();
- drg2rad=PI/180.0;
- rad2drg=180.0/PI;
+ drg2rad=M_PI/180.0;
+ rad2drg=180.0/M_PI;
}
diff --git a/app/xcalc/xcalc.h b/app/xcalc/xcalc.h
index 855dc4a46..1492a01d8 100644
--- a/app/xcalc/xcalc.h
+++ b/app/xcalc/xcalc.h
@@ -37,6 +37,10 @@ from the X Consortium.
#ifndef _XCALC_H_
#define _XCALC_H_
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
#include <X11/Intrinsic.h>
#include <X11/StringDefs.h>
@@ -51,13 +55,6 @@ from the X Consortium.
#include <errno.h>
#include <X11/Xlocale.h>
-
-#ifdef SIGNALRETURNSINT
-#define signal_t int
-#else
-#define signal_t void
-#endif
-
#define kRECIP 0 /* reciprocal */
#define kSQR 1 /* square */
#define kSQRT 2 /* square root */
@@ -118,8 +115,8 @@ extern XtActionsRec Actions[];
extern int ActionsCount;
/* math.c */
-extern signal_t fperr(int sig);
-extern signal_t illerr(int sig);
+extern void fperr(int sig) _X_NORETURN;
+extern void illerr(int sig) _X_NORETURN;
extern void fail_op(void);
extern int pre_op(int keynum);
extern void post_op(void);
@@ -151,7 +148,7 @@ extern jmp_buf env;
/* xcalc.c */
extern void do_select(Time time);
extern void draw(char *string);
-extern void Quit(void);
+extern void Quit(void) _X_NORETURN;
extern void ringbell(void);
extern void setflag(int indicator, Boolean on);