[tcl-fitstcl] 02/03: Imported Upstream version 2.4
Ole Streicher
olebole at moszumanska.debian.org
Wed Jun 10 14:42:47 UTC 2015
This is an automated email from the git hooks/post-receive script.
olebole pushed a commit to branch debian
in repository tcl-fitstcl.
commit 9f1572feeffa0a8f96d05d9d116b04d756fcf997
Author: Ole Streicher <debian at liska.ath.cx>
Date: Wed Jun 10 16:43:44 2015 +0200
Imported Upstream version 2.4
---
Makefile | 50 -
Makefile.in | 23 +-
README | 165 +-
ReleaseNotes | 16 +
config.guess | 472 ++--
config.sub | 248 +-
configure | 7176 ++++++++++++++++++++++++---------------------------
configure.in | 131 +-
fitsCmds.c | 122 +-
fitsIO.c | 379 +--
fitsInit.c | 136 +
fitsTcl.c | 5 +-
fitsTcl.h | 11 +-
fitsTcl.html | 41 +-
fitsTcl.sit.hqx | 268 --
fitsTclHeader.pch | 7 -
fitsTclInt.h | 1 +
fitsUtils.c | 3 -
fitstcl.def | 922 -------
fitstcl.dsp | 417 ---
fitstcl.dsw | 29 -
fvTcl.c | 3 +-
makefile.bc5 | 496 ----
makefile.vc | 806 ------
makefile_plugin.bc5 | 496 ----
tclShared.c | 15 +
26 files changed, 4402 insertions(+), 8036 deletions(-)
diff --git a/Makefile b/Makefile
deleted file mode 100644
index a0a88c5..0000000
--- a/Makefile
+++ /dev/null
@@ -1,50 +0,0 @@
-HD_COMPONENT_NAME = ftools
-
-HD_COMPONENT_VERS =
-
-HD_LIBRARY_ROOT = fitstcl
-
-HD_LIBRARY_SRC_c = fitsCmds.c fitsInit.c fitsIO.c fitsTcl.c \
- fitsUtils.c fvTcl.c tclShared.c
-
-HD_CFLAGS = -I${CFITSIO_DIR} ${HD_STD_CFLAGS}
-
-HD_INSTALL_LIBRARIES = ${HD_LIBRARY_ROOT}
-
-HD_INSTALL_HEADERS = fitsTcl.h fitsTclInt.h
-
-HD_INSTALL_HELP = fitsTcl.html
-
-default: build-libfitstcl
-
-all: default publish
-
-include ${HD_STD_MAKEFILE}
-
-# Get cfitsio source files and prepend ${CFITSIO_DIR} prefix to each filename.
-CFITSIO_OBJ_TMP = ${shell ${MAKE} -f ${CFITSIO_DIR}/Makefile cfitsioLibObjs | grep buffers}
-
-CFITSIO_OBJ = ${shell echo ${CFITSIO_OBJ_TMP} | sed "s: : ../../../heacore/cfitsio/:g" | sed "s:^:../../../heacore/cfitsio/:"}
-
-${CFITSIO_OBJ}:
- @for file in ${CFITSIO_OBJ}; do \
- if [ ! -f $$file ]; then \
- echo "Cannot find CFITSIO object $$file"; exit 1; \
- fi; \
- done
-
-WCSLIB_OBJ = ../../../heacore/wcslib/C/wcstrig.o
-
-${WCSLIB_OBJ}:
- @for file in ${WCSLIB_OBJ}; do \
- if [ ! -f $$file ]; then \
- echo "Cannot find WCS object $$file"; exit 1; \
- fi; \
- done
-
-build-libfitstcl:
- @if [ "x${CFITSIO_OBJ}" = x ]; then \
- echo "CFITSIO_OBJ macro is empty"; exit 1; \
- fi
- ${HD_MAKE} fitstcl HD_LIBRARY_ROOT=fitstcl \
- HD_LIBRARY_OBJ="${HD_LIBRARY_SRC_c:.c=.${OSUF}} ${CFITSIO_OBJ} ${WCSLIB_OBJ}"
diff --git a/Makefile.in b/Makefile.in
index f710196..3bb8453 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,5 +1,5 @@
# FITS TCL makefile.in
-# $Id: Makefile.in,v 1.17 2006/09/25 15:27:02 irby Exp $
+# $Id: Makefile.in,v 1.19 2015/02/26 16:54:22 irby Exp $
#----------------------------------------------------------------------------
# Definitions:
@@ -7,17 +7,20 @@
LIBRARY = fitstcl
CFILES = fitsInit.c fitsUtils.c fitsTcl.c fitsCmds.c fitsIO.c fvTcl.c
-
SHARED_CFILE = tclShared.c
OBJECTS = ${CFILES:.c=.o}
LOCAL_OBJ = ${OBJECTS} ${SHARED_CFILE:.c=.o}
-SHARED_OBJ = ${LOCAL_OBJ} ${CFITSIO_DIR}/*.o
+
+CFITSIO_OBJ_TMP = ${shell if [ -f ${CFITSIO_DIR}/Makefile ]; then ${MAKE} -f ${CFITSIO_DIR}/Makefile cfitsioLibObjs; fi | grep buffers}
+CFITSIO_OBJ = ${shell if [ "x${CFITSIO_OBJ_TMP}" != "x" ]; then echo ${CFITSIO_OBJ_TMP}; fi | sed "s: : ${CFITSIO_DIR}/:g" | sed "s:^:${CFITSIO_DIR}/:"}
+
+SHARED_OBJ = ${LOCAL_OBJ} ${CFITSIO_OBJ}
STATIC_LIB = lib${LIBRARY}.a
SHARED_LIB = lib${LIBRARY}${SHLIB_SUFFIX}
-IFLAGS = -I${CFITSIO_DIR} -I${TCL_INC_PATH}
+IFLAGS = -I${CFITSIO_DIR} -I${TCL_INC_PATH} -I./
#----------------------------------------------------------------------------
# Configurable macros:
@@ -66,7 +69,7 @@ ${SHARED_LIB}: build-cfitsio ${LOCAL_OBJ}
build-cfitsio:
@if [ "x${CFITSIO_DIR}" != x ]; then \
if [ -d "${CFITSIO_DIR}" ]; then \
- if [ ! -f ${CFITSIO_DIR}/f77_wrap4.o ]; then \
+ if [ ! -f ${CFITSIO_DIR}/buffers.o ]; then \
echo "Configuring and building in ${CFITSIO_DIR}"; \
cd ${CFITSIO_DIR}; ./configure; \
${MAKE} stand_alone "CC=${CC}" "CFLAGS=${CFLAGS}" \
@@ -91,7 +94,7 @@ install: all
fi
clean:
- -rm -rf *.o *~ ${STATIC_LIB} ${SHARED_LIB}
+ -rm -rf ${LOCAL_OBJ} ${STATIC_LIB} ${SHARED_LIB}
distclean: clean
-rm -f config.cache config.status config.log Makefile so_locations
@@ -106,10 +109,16 @@ fitstclLibObjs:
.c.o:
- ${CC} -c ${CFLAGS} ${DEFS} ${IFLAGS} $<
+ ${CC} -c -o ${<D}/${@F} ${CFLAGS} ${DEFS} ${IFLAGS} $<
#
# $Log: Makefile.in,v $
+# Revision 1.19 2015/02/26 16:54:22 irby
+# Remove wcslib dependency.
+#
+# Revision 1.18 2013/01/15 16:47:25 irby
+# Rework inclusion of cfitsio objects and add wcslib object (wcstrig.o).
+#
# Revision 1.17 2006/09/25 15:27:02 irby
# Do not remove wcssub.o prior to creating libfitstcl. As of cfitsio
# v3.004 the wcssub routine is needed by fitsTcl.
diff --git a/README b/README
index a215fc7..c18dd0b 100644
--- a/README
+++ b/README
@@ -1,156 +1,83 @@
- fitsTcl 2.1.1 Installation Guide
+ fitsTcl Installation Guide
fitsTcl is a TCL interface to the CFITSIO astronomical library
which provides access to FITS data files. It can be used either by
- itself within the standard tcl/tk applications tclsh and wish, or
+ itself within the standard Tcl/Tk applications tclsh and wish, or
within the fv software package also distributed by the HEASARC at
NASA Goddard.
The fitsTcl User's Guide is located in the fitsTcl.html file
- distributed with fitsTcl2.1.1 and located on the web at:
+ distributed with fitsTcl and located on the web at:
- http://heasarc.gsfc.nasa.gov/ftools/fv/fitsTcl.html
+ http://heasarc.gsfc.nasa.gov/ftools/fv/fitsTcl.html
- Send any bug reports to ftoolshelp at athena.gsfc.nasa.gov.
+ fitsTcl can be built under PC Linux or Mac OS X, and requires the
+ CFITSIO and Tcl packages. Instructions for building the software
+ are below.
- fitsTcl can be built under Unix/Linux (PowerPC or Intel), MacOS,
- and Windows. You will need a version of Tcl8.x, available either
- from Scriptics (www.scriptics.com) or HEASARC as part of the fv
- distribution (heasarc.gsfc.nasa.gov/ftools/fv). Read the following
- for instructions for building on each platform.
+ Please send any questions or problem reports to the FTOOLS help desk:
+
+ ftoolshelp at bigbang.gsfc.nasa.gov.
+ Before building fitsTcl, make sure you have Tcl installed on your
+ machine and can locate the tcl.h header file. To build the fitsTcl
+ library:
+ 1. Download the latest version of the cfitsio source code from:
-********************************************************************************
- UNIX (including Mac OS X)
-********************************************************************************
+ http://heasarc.gsfc.nasa.gov/docs/software/fitsio/fitsio.html
+ and unpack the tar file.
- To build the fitsTcl shared library do the following:
+ 2. Unpack the compressed fitsTcl tar file and enter the fitsTcl-2.4
+ directory.
- 1. Unpack the compressed fitsTcl tar file and enter the fitsTcl2.1.1
- directory.
+ 3. Configure fitsTcl for your system with the command
- 2. Download the latest version of the cfitsio source code (for UNIX)
- from:
+ ./configure [optional arguments]
- http://heasarc.gsfc.nasa.gov/docs/software/lheasoft/fitsio/fitsio.html
+ where the optional arguments are:
- and unpack the source tar file.
+ --prefix=DIR1 --with-cfitsio=DIR2 --with-tcl-includes=DIR3
- 3. Configure fitsTcl for your system with the command
+ DIR1 is the installation path (default is /usr/local)
- ./configure [optional arguments]
+ DIR2 is the path to the cfitsio source directory
+ (default is ./cfitsio)
- where the optional arguments are:
+ DIR3 is the path to the location of the tcl.h header file
+ (default is $prefix/include or /usr/include).
- --prefix=DIR1 --with-cfitsio=DIR2 --with-tcl-includes=DIR3
+ These may be considered optional only if the defaults are valid
+ for your system/setup.
- DIR1 is the installation path (default is /usr/local)
+ Under the Cygwin environment, an additional argument is required:
- DIR2 is the path to the cfitsio source directory
- (default is ./cfitsio)
+ --with-tcl=DIR4
- DIR3 is the path to the location of the tcl.h header file
- (default is $prefix/include or /usr/include).
+ DIR4 is the path to the location of the Tcl library (libtcl8.x.dll).
- These may be considered optional only if the defaults are valid
- for your system/setup.
+ The final library will be installed in the directory DIR1/lib
+ which must exist. Note that the library itself does not depend
+ on the value of DIR1, only the installation step in the Makefile.
- The final library will be installed in the directory DIR1/lib
- which must exist. Note that the library itself does not depend
- on the value of DIR1, only the installation step in the Makefile.
+ 4. Build fitsTcl with the command
- 4. Build fitsTcl with the command
+ make
- make
+ 5. Install fitsTcl either with the command
- 5. Install fitsTcl either with the command
+ make install
- make install
+ which will place it in the DIR1/lib directory, or move the
+ library (libfitstcl.so, or libfitstcl.dylib under Mac OS X)
+ manually to where you want it.
- which will place it in the DIR1/lib directory, or move the
- library (libfitstcl.so, or libfitstcl.dylib under Mac OS X)
- manually to where you want it.
+ To use fitsTcl, startup tclsh or wish and type the command
- To use fitsTcl, startup tclsh or wish and type the command
+ load libfitstcl.so (libfitstcl.dylib on Mac OS X)
- load libfitstcl.so (libfitstcl.dylib on Mac OS X)
-
- You may need to specify an explicit path to the library or set
- the LD_LIBRARY_PATH (DYLD_LIBRARY_PATH on Mac OS X) to its location.
-
-
-********************************************************************************
- MacOS
-********************************************************************************
-
-
- To build fitsTcl extension do the following:
-
- 1. Download and build the Mac TCL software available from
- Scriptics (www.scriptics.com).
-
- 2. Download and expand the fitsTcl distribution, which will
- create a fitsTcl2.1.1 subdirectory.
-
- 3. Download the latest version of the cfitsio source code from:
-
- http://heasarc.gsfc.nasa.gov/docs/software/lheasoft/fitsio/fitsio.html
-
- and untar it under the fitsTcl2.1.1 directory (i.e. such that
- you have a fitsTcl2.1.1/cfitsio directory).
-
- 4. Debinhex and expand the file fitsTcl.sit.hqx, creating
- a fitsTcl folder containing a Codewarrior 5 project file,
- fitsTcl.p.
-
- 5. Open the new project file and update the Access Paths to
- point to your TCL source tree.
-
- 6. Build the 'fitsTcl DLL' target. This will create a file
- fitsTcl.dll in the fitsTcl directory. Move it to where ever
- is convenient and use 'load fitsTcl.dll' to load it into
- tclsh or wish.
-
- (Note: We do not distribute a binary version of the plugin since it
- is dependent on the major TCL version -- 8.0, 8.1, etc -- used in
- building it. We may distribute one, though, if there is sufficient
- demand for use with a particular TCL release.)
-
-
-
-********************************************************************************
- MS Windows
-********************************************************************************
-
-
- Building fitsTcl requires Microsoft Visual C++. A Borland C v5
- makefile is also included, although it has not been updated since
- the last release.
-
- To build fitsTcl DLL do the following:
-
- 1. Download and build the Windows TCL software available from
- Scriptics (www.scriptics.com).
-
- 2. Download and expand the fitsTcl distribution, which will
- create a fitsTcl2.1.1 subdirectory.
-
- 3. Download the latest version of the cfitsio source code from:
-
- http://heasarc.gsfc.nasa.gov/docs/software/lheasoft/fitsio/fitsio.html
-
- and untar it under the fitsTcl2.1.1 directory (i.e. such that
- you have a fitsTcl2.1.1/cfitsio directory).
-
- 4. Edit the file makefile.vc (or makefile.bc5) and update the
- paths for your specific setup. We have our source tree at
- D:\FV_SRC. Replace this and the TCL8.2.2 references as
- appropriate.
-
- 5. Type the command 'nmake -f makefile.vc'. This will build
- a fitstcl.dll file. Move it to where ever is convenient and
- use 'load fitstcl.dll' to load it into tclsh or wish.
+ You may need to specify an explicit path to the library or set the
+ LD_LIBRARY_PATH (DYLD_LIBRARY_PATH on Mac OS X) to its location.
diff --git a/ReleaseNotes b/ReleaseNotes
index 6452a2e..45f9892 100644
--- a/ReleaseNotes
+++ b/ReleaseNotes
@@ -1,3 +1,19 @@
+June, 2015: Release of fitsTcl v2.4
+
+ * Fix compatibility issues with Tcl 8.5.
+
+ * Remove dependency on wcslib and repair issues with 'get wcs'.
+
+ * Fix memory faults when trying to open a FITS file that has
+ a binary table with non-zero variable length array columns
+ but has no rows.
+
+ * Fix WCS projection for vector image column.
+
+ * Fix several issues with ASCII output and increase precision
+ in output ASCII file values.
+
+=====================================================================
July, 2009: Release of fitsTcl v2.3 (part of fv5.3)
* Fix large FITS file crashing and displaying summary/header issue.
diff --git a/config.guess b/config.guess
index 7b24a87..d622a44 100755
--- a/config.guess
+++ b/config.guess
@@ -1,10 +1,10 @@
#! /bin/sh
# Attempt to guess a canonical system name.
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
-# Free Software Foundation, Inc.
+# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
+# 2011, 2012 Free Software Foundation, Inc.
-timestamp='2008-11-15'
+timestamp='2012-02-10'
# This file is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
@@ -17,9 +17,7 @@ timestamp='2008-11-15'
# General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
-# 02110-1301, USA.
+# 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
@@ -27,16 +25,16 @@ timestamp='2008-11-15'
# the same distribution terms that you use for the rest of that program.
-# Originally written by Per Bothner <per at bothner.com>.
-# Please send patches to <config-patches at gnu.org>. Submit a context
-# diff and a properly formatted ChangeLog entry.
+# Originally written by Per Bothner. Please send patches (context
+# diff format) to <config-patches at gnu.org> and include a ChangeLog
+# entry.
#
# This script attempts to guess a canonical system name similar to
# config.sub. If it succeeds, it prints the system name on stdout, and
# exits with 0. Otherwise, it exits with 1.
#
-# The plan is that this can be called by configure scripts if you
-# don't specify an explicit build system type.
+# You can get the latest version of this script from:
+# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
me=`echo "$0" | sed -e 's,.*/,,'`
@@ -56,8 +54,9 @@ version="\
GNU config.guess ($timestamp)
Originally written by Per Bothner.
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
-2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
+2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012
+Free Software Foundation, Inc.
This is free software; see the source for copying conditions. There is NO
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -144,7 +143,7 @@ UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
*:NetBSD:*:*)
# NetBSD (nbsd) targets should (where applicable) match one or
- # more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*,
+ # more of the tuples: *-*-netbsdelf*, *-*-netbsdaout*,
# *-*-netbsdecoff* and *-*-netbsd*. For targets that recently
# switched to ELF, *-*-netbsd* would select the old
# object file format. This provides both forward
@@ -170,7 +169,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
arm*|i386|m68k|ns32k|sh3*|sparc|vax)
eval $set_cc_for_build
if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
- | grep __ELF__ >/dev/null
+ | grep -q __ELF__
then
# Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout).
# Return netbsd for either. FIX?
@@ -180,7 +179,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
fi
;;
*)
- os=netbsd
+ os=netbsd
;;
esac
# The OS release
@@ -223,7 +222,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
;;
*5.*)
- UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'`
+ UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'`
;;
esac
# According to Compaq, /usr/sbin/psrinfo has been available on
@@ -269,7 +268,10 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
# A Xn.n version is an unreleased experimental baselevel.
# 1.2 uses "1.2" for uname -r.
echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
- exit ;;
+ # Reset EXIT trap before exiting to avoid spurious non-zero exit code.
+ exitcode=$?
+ trap '' 0
+ exit $exitcode ;;
Alpha\ *:Windows_NT*:*)
# How do we know it's Interix rather than the generic POSIX subsystem?
# Should we change UNAME_MACHINE based on the output of uname instead
@@ -295,7 +297,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
echo s390-ibm-zvmoe
exit ;;
*:OS400:*:*)
- echo powerpc-ibm-os400
+ echo powerpc-ibm-os400
exit ;;
arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
echo arm-acorn-riscix${UNAME_RELEASE}
@@ -324,12 +326,18 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
case `/usr/bin/uname -p` in
sparc) echo sparc-icl-nx7; exit ;;
esac ;;
+ s390x:SunOS:*:*)
+ echo ${UNAME_MACHINE}-ibm-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+ exit ;;
sun4H:SunOS:5.*:*)
echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
exit ;;
sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
exit ;;
+ i86pc:AuroraUX:5.*:* | i86xen:AuroraUX:5.*:*)
+ echo i386-pc-auroraux${UNAME_RELEASE}
+ exit ;;
i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
eval $set_cc_for_build
SUN_ARCH="i386"
@@ -337,7 +345,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
# Note that the Sun cc does not turn __LP64__ into 1 like gcc does.
# This test works for both compilers.
if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
- if echo '\n#ifdef __amd64\nIS_64BIT_ARCH\n#endif' | \
+ if (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \
(CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
grep IS_64BIT_ARCH >/dev/null
then
@@ -388,23 +396,23 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
# MiNT. But MiNT is downward compatible to TOS, so this should
# be no problem.
atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*)
- echo m68k-atari-mint${UNAME_RELEASE}
+ echo m68k-atari-mint${UNAME_RELEASE}
exit ;;
atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*)
echo m68k-atari-mint${UNAME_RELEASE}
- exit ;;
+ exit ;;
*falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*)
- echo m68k-atari-mint${UNAME_RELEASE}
+ echo m68k-atari-mint${UNAME_RELEASE}
exit ;;
milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*)
- echo m68k-milan-mint${UNAME_RELEASE}
- exit ;;
+ echo m68k-milan-mint${UNAME_RELEASE}
+ exit ;;
hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*)
- echo m68k-hades-mint${UNAME_RELEASE}
- exit ;;
+ echo m68k-hades-mint${UNAME_RELEASE}
+ exit ;;
*:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
- echo m68k-unknown-mint${UNAME_RELEASE}
- exit ;;
+ echo m68k-unknown-mint${UNAME_RELEASE}
+ exit ;;
m68k:machten:*:*)
echo m68k-apple-machten${UNAME_RELEASE}
exit ;;
@@ -474,8 +482,8 @@ EOF
echo m88k-motorola-sysv3
exit ;;
AViiON:dgux:*:*)
- # DG/UX returns AViiON for all architectures
- UNAME_PROCESSOR=`/usr/bin/uname -p`
+ # DG/UX returns AViiON for all architectures
+ UNAME_PROCESSOR=`/usr/bin/uname -p`
if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ]
then
if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \
@@ -488,7 +496,7 @@ EOF
else
echo i586-dg-dgux${UNAME_RELEASE}
fi
- exit ;;
+ exit ;;
M88*:DolphinOS:*:*) # DolphinOS (SVR3)
echo m88k-dolphin-sysv3
exit ;;
@@ -545,7 +553,7 @@ EOF
echo rs6000-ibm-aix3.2
fi
exit ;;
- *:AIX:*:[456])
+ *:AIX:*:[4567])
IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
IBM_ARCH=rs6000
@@ -588,52 +596,52 @@ EOF
9000/[678][0-9][0-9])
if [ -x /usr/bin/getconf ]; then
sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null`
- sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
- case "${sc_cpu_version}" in
- 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0
- 528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1
- 532) # CPU_PA_RISC2_0
- case "${sc_kernel_bits}" in
- 32) HP_ARCH="hppa2.0n" ;;
- 64) HP_ARCH="hppa2.0w" ;;
+ sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
+ case "${sc_cpu_version}" in
+ 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0
+ 528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1
+ 532) # CPU_PA_RISC2_0
+ case "${sc_kernel_bits}" in
+ 32) HP_ARCH="hppa2.0n" ;;
+ 64) HP_ARCH="hppa2.0w" ;;
'') HP_ARCH="hppa2.0" ;; # HP-UX 10.20
- esac ;;
- esac
+ esac ;;
+ esac
fi
if [ "${HP_ARCH}" = "" ]; then
eval $set_cc_for_build
- sed 's/^ //' << EOF >$dummy.c
+ sed 's/^ //' << EOF >$dummy.c
- #define _HPUX_SOURCE
- #include <stdlib.h>
- #include <unistd.h>
+ #define _HPUX_SOURCE
+ #include <stdlib.h>
+ #include <unistd.h>
- int main ()
- {
- #if defined(_SC_KERNEL_BITS)
- long bits = sysconf(_SC_KERNEL_BITS);
- #endif
- long cpu = sysconf (_SC_CPU_VERSION);
+ int main ()
+ {
+ #if defined(_SC_KERNEL_BITS)
+ long bits = sysconf(_SC_KERNEL_BITS);
+ #endif
+ long cpu = sysconf (_SC_CPU_VERSION);
- switch (cpu)
- {
- case CPU_PA_RISC1_0: puts ("hppa1.0"); break;
- case CPU_PA_RISC1_1: puts ("hppa1.1"); break;
- case CPU_PA_RISC2_0:
- #if defined(_SC_KERNEL_BITS)
- switch (bits)
- {
- case 64: puts ("hppa2.0w"); break;
- case 32: puts ("hppa2.0n"); break;
- default: puts ("hppa2.0"); break;
- } break;
- #else /* !defined(_SC_KERNEL_BITS) */
- puts ("hppa2.0"); break;
- #endif
- default: puts ("hppa1.0"); break;
- }
- exit (0);
- }
+ switch (cpu)
+ {
+ case CPU_PA_RISC1_0: puts ("hppa1.0"); break;
+ case CPU_PA_RISC1_1: puts ("hppa1.1"); break;
+ case CPU_PA_RISC2_0:
+ #if defined(_SC_KERNEL_BITS)
+ switch (bits)
+ {
+ case 64: puts ("hppa2.0w"); break;
+ case 32: puts ("hppa2.0n"); break;
+ default: puts ("hppa2.0"); break;
+ } break;
+ #else /* !defined(_SC_KERNEL_BITS) */
+ puts ("hppa2.0"); break;
+ #endif
+ default: puts ("hppa1.0"); break;
+ }
+ exit (0);
+ }
EOF
(CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy`
test -z "$HP_ARCH" && HP_ARCH=hppa
@@ -653,7 +661,7 @@ EOF
# => hppa64-hp-hpux11.23
if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) |
- grep __LP64__ >/dev/null
+ grep -q __LP64__
then
HP_ARCH="hppa2.0w"
else
@@ -724,22 +732,22 @@ EOF
exit ;;
C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*)
echo c1-convex-bsd
- exit ;;
+ exit ;;
C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*)
if getsysinfo -f scalar_acc
then echo c32-convex-bsd
else echo c2-convex-bsd
fi
- exit ;;
+ exit ;;
C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*)
echo c34-convex-bsd
- exit ;;
+ exit ;;
C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*)
echo c38-convex-bsd
- exit ;;
+ exit ;;
C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*)
echo c4-convex-bsd
- exit ;;
+ exit ;;
CRAY*Y-MP:*:*:*)
echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
exit ;;
@@ -763,14 +771,14 @@ EOF
exit ;;
F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
- FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
- FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
- echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
- exit ;;
+ FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
+ FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
+ echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
+ exit ;;
5000:UNIX_System_V:4.*:*)
- FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
- FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'`
- echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
+ FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
+ FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'`
+ echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
exit ;;
i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
@@ -782,13 +790,12 @@ EOF
echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
exit ;;
*:FreeBSD:*:*)
- case ${UNAME_MACHINE} in
- pc98)
- echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
+ UNAME_PROCESSOR=`/usr/bin/uname -p`
+ case ${UNAME_PROCESSOR} in
amd64)
echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
*)
- echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
+ echo ${UNAME_PROCESSOR}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
esac
exit ;;
i*:CYGWIN*:*)
@@ -797,19 +804,22 @@ EOF
*:MINGW*:*)
echo ${UNAME_MACHINE}-pc-mingw32
exit ;;
+ i*:MSYS*:*)
+ echo ${UNAME_MACHINE}-pc-msys
+ exit ;;
i*:windows32*:*)
- # uname -m includes "-pc" on this system.
- echo ${UNAME_MACHINE}-mingw32
+ # uname -m includes "-pc" on this system.
+ echo ${UNAME_MACHINE}-mingw32
exit ;;
i*:PW*:*)
echo ${UNAME_MACHINE}-pc-pw32
exit ;;
- *:Interix*:[3456]*)
- case ${UNAME_MACHINE} in
+ *:Interix*:*)
+ case ${UNAME_MACHINE} in
x86)
echo i586-pc-interix${UNAME_RELEASE}
exit ;;
- EM64T | authenticamd | genuineintel)
+ authenticamd | genuineintel | EM64T)
echo x86_64-unknown-interix${UNAME_RELEASE}
exit ;;
IA64)
@@ -819,6 +829,9 @@ EOF
[345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
echo i${UNAME_MACHINE}-pc-mks
exit ;;
+ 8664:Windows_NT:*)
+ echo x86_64-pc-mks
+ exit ;;
i*:Windows_NT*:* | Pentium*:Windows_NT*:*)
# How do we know it's Interix rather than the generic POSIX subsystem?
# It also conflicts with pre-2.0 versions of AT&T UWIN. Should we
@@ -848,6 +861,27 @@ EOF
i*86:Minix:*:*)
echo ${UNAME_MACHINE}-pc-minix
exit ;;
+ aarch64:Linux:*:*)
+ echo ${UNAME_MACHINE}-unknown-linux-gnu
+ exit ;;
+ aarch64_be:Linux:*:*)
+ UNAME_MACHINE=aarch64_be
+ echo ${UNAME_MACHINE}-unknown-linux-gnu
+ exit ;;
+ alpha:Linux:*:*)
+ case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
+ EV5) UNAME_MACHINE=alphaev5 ;;
+ EV56) UNAME_MACHINE=alphaev56 ;;
+ PCA56) UNAME_MACHINE=alphapca56 ;;
+ PCA57) UNAME_MACHINE=alphapca56 ;;
+ EV6) UNAME_MACHINE=alphaev6 ;;
+ EV67) UNAME_MACHINE=alphaev67 ;;
+ EV68*) UNAME_MACHINE=alphaev68 ;;
+ esac
+ objdump --private-headers /bin/sh | grep -q ld.so.1
+ if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
+ echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
+ exit ;;
arm*:Linux:*:*)
eval $set_cc_for_build
if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
@@ -855,20 +889,40 @@ EOF
then
echo ${UNAME_MACHINE}-unknown-linux-gnu
else
- echo ${UNAME_MACHINE}-unknown-linux-gnueabi
+ if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \
+ | grep -q __ARM_PCS_VFP
+ then
+ echo ${UNAME_MACHINE}-unknown-linux-gnueabi
+ else
+ echo ${UNAME_MACHINE}-unknown-linux-gnueabihf
+ fi
fi
exit ;;
avr32*:Linux:*:*)
echo ${UNAME_MACHINE}-unknown-linux-gnu
exit ;;
cris:Linux:*:*)
- echo cris-axis-linux-gnu
+ echo ${UNAME_MACHINE}-axis-linux-gnu
exit ;;
crisv32:Linux:*:*)
- echo crisv32-axis-linux-gnu
+ echo ${UNAME_MACHINE}-axis-linux-gnu
exit ;;
frv:Linux:*:*)
- echo frv-unknown-linux-gnu
+ echo ${UNAME_MACHINE}-unknown-linux-gnu
+ exit ;;
+ hexagon:Linux:*:*)
+ echo ${UNAME_MACHINE}-unknown-linux-gnu
+ exit ;;
+ i*86:Linux:*:*)
+ LIBC=gnu
+ eval $set_cc_for_build
+ sed 's/^ //' << EOF >$dummy.c
+ #ifdef __dietlibc__
+ LIBC=dietlibc
+ #endif
+EOF
+ eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'`
+ echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
exit ;;
ia64:Linux:*:*)
echo ${UNAME_MACHINE}-unknown-linux-gnu
@@ -879,78 +933,34 @@ EOF
m68*:Linux:*:*)
echo ${UNAME_MACHINE}-unknown-linux-gnu
exit ;;
- mips:Linux:*:*)
- eval $set_cc_for_build
- sed 's/^ //' << EOF >$dummy.c
- #undef CPU
- #undef mips
- #undef mipsel
- #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
- CPU=mipsel
- #else
- #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
- CPU=mips
- #else
- CPU=
- #endif
- #endif
-EOF
- eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
- /^CPU/{
- s: ::g
- p
- }'`"
- test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
- ;;
- mips64:Linux:*:*)
+ mips:Linux:*:* | mips64:Linux:*:*)
eval $set_cc_for_build
sed 's/^ //' << EOF >$dummy.c
#undef CPU
- #undef mips64
- #undef mips64el
+ #undef ${UNAME_MACHINE}
+ #undef ${UNAME_MACHINE}el
#if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
- CPU=mips64el
+ CPU=${UNAME_MACHINE}el
#else
#if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
- CPU=mips64
+ CPU=${UNAME_MACHINE}
#else
CPU=
#endif
#endif
EOF
- eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
- /^CPU/{
- s: ::g
- p
- }'`"
+ eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'`
test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
;;
or32:Linux:*:*)
- echo or32-unknown-linux-gnu
- exit ;;
- ppc:Linux:*:*)
- echo powerpc-unknown-linux-gnu
- exit ;;
- ppc64:Linux:*:*)
- echo powerpc64-unknown-linux-gnu
- exit ;;
- alpha:Linux:*:*)
- case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
- EV5) UNAME_MACHINE=alphaev5 ;;
- EV56) UNAME_MACHINE=alphaev56 ;;
- PCA56) UNAME_MACHINE=alphapca56 ;;
- PCA57) UNAME_MACHINE=alphapca56 ;;
- EV6) UNAME_MACHINE=alphaev6 ;;
- EV67) UNAME_MACHINE=alphaev67 ;;
- EV68*) UNAME_MACHINE=alphaev68 ;;
- esac
- objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null
- if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
- echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
+ echo ${UNAME_MACHINE}-unknown-linux-gnu
exit ;;
padre:Linux:*:*)
echo sparc-unknown-linux-gnu
exit ;;
+ parisc64:Linux:*:* | hppa64:Linux:*:*)
+ echo hppa64-unknown-linux-gnu
+ exit ;;
parisc:Linux:*:* | hppa:Linux:*:*)
# Look for CPU level
case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
@@ -959,14 +969,17 @@ EOF
*) echo hppa-unknown-linux-gnu ;;
esac
exit ;;
- parisc64:Linux:*:* | hppa64:Linux:*:*)
- echo hppa64-unknown-linux-gnu
+ ppc64:Linux:*:*)
+ echo powerpc64-unknown-linux-gnu
+ exit ;;
+ ppc:Linux:*:*)
+ echo powerpc-unknown-linux-gnu
exit ;;
s390:Linux:*:* | s390x:Linux:*:*)
echo ${UNAME_MACHINE}-ibm-linux
exit ;;
sh64*:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-gnu
+ echo ${UNAME_MACHINE}-unknown-linux-gnu
exit ;;
sh*:Linux:*:*)
echo ${UNAME_MACHINE}-unknown-linux-gnu
@@ -974,75 +987,18 @@ EOF
sparc:Linux:*:* | sparc64:Linux:*:*)
echo ${UNAME_MACHINE}-unknown-linux-gnu
exit ;;
+ tile*:Linux:*:*)
+ echo ${UNAME_MACHINE}-unknown-linux-gnu
+ exit ;;
vax:Linux:*:*)
echo ${UNAME_MACHINE}-dec-linux-gnu
exit ;;
x86_64:Linux:*:*)
- echo x86_64-unknown-linux-gnu
+ echo ${UNAME_MACHINE}-unknown-linux-gnu
exit ;;
xtensa*:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-gnu
+ echo ${UNAME_MACHINE}-unknown-linux-gnu
exit ;;
- i*86:Linux:*:*)
- # The BFD linker knows what the default object file format is, so
- # first see if it will tell us. cd to the root directory to prevent
- # problems with other programs or directories called `ld' in the path.
- # Set LC_ALL=C to ensure ld outputs messages in English.
- ld_supported_targets=`cd /; LC_ALL=C ld --help 2>&1 \
- | sed -ne '/supported targets:/!d
- s/[ ][ ]*/ /g
- s/.*supported targets: *//
- s/ .*//
- p'`
- case "$ld_supported_targets" in
- elf32-i386)
- TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu"
- ;;
- a.out-i386-linux)
- echo "${UNAME_MACHINE}-pc-linux-gnuaout"
- exit ;;
- "")
- # Either a pre-BFD a.out linker (linux-gnuoldld) or
- # one that does not give us useful --help.
- echo "${UNAME_MACHINE}-pc-linux-gnuoldld"
- exit ;;
- esac
- # Determine whether the default compiler is a.out or elf
- eval $set_cc_for_build
- sed 's/^ //' << EOF >$dummy.c
- #include <features.h>
- #ifdef __ELF__
- # ifdef __GLIBC__
- # if __GLIBC__ >= 2
- LIBC=gnu
- # else
- LIBC=gnulibc1
- # endif
- # else
- LIBC=gnulibc1
- # endif
- #else
- #if defined(__INTEL_COMPILER) || defined(__PGI) || defined(__SUNPRO_C) || defined(__SUNPRO_CC)
- LIBC=gnu
- #else
- LIBC=gnuaout
- #endif
- #endif
- #ifdef __dietlibc__
- LIBC=dietlibc
- #endif
-EOF
- eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
- /^LIBC/{
- s: ::g
- p
- }'`"
- test x"${LIBC}" != x && {
- echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
- exit
- }
- test x"${TENTATIVE}" != x && { echo "${TENTATIVE}"; exit; }
- ;;
i*86:DYNIX/ptx:4*:*)
# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
# earlier versions are messed up and put the nodename in both
@@ -1050,11 +1006,11 @@ EOF
echo i386-sequent-sysv4
exit ;;
i*86:UNIX_SV:4.2MP:2.*)
- # Unixware is an offshoot of SVR4, but it has its own version
- # number series starting with 2...
- # I am not positive that other SVR4 systems won't match this,
+ # Unixware is an offshoot of SVR4, but it has its own version
+ # number series starting with 2...
+ # I am not positive that other SVR4 systems won't match this,
# I just have to hope. -- rms.
- # Use sysv4.2uw... so that sysv4* matches it.
+ # Use sysv4.2uw... so that sysv4* matches it.
echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION}
exit ;;
i*86:OS/2:*:*)
@@ -1071,7 +1027,7 @@ EOF
i*86:syllable:*:*)
echo ${UNAME_MACHINE}-pc-syllable
exit ;;
- i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*)
+ i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.[02]*:*)
echo i386-unknown-lynxos${UNAME_RELEASE}
exit ;;
i*86:*DOS:*:*)
@@ -1086,7 +1042,7 @@ EOF
fi
exit ;;
i*86:*:5:[678]*)
- # UnixWare 7.x, OpenUNIX and OpenServer 6.
+ # UnixWare 7.x, OpenUNIX and OpenServer 6.
case `/bin/uname -X | grep "^Machine"` in
*486*) UNAME_MACHINE=i486 ;;
*Pentium) UNAME_MACHINE=i586 ;;
@@ -1114,10 +1070,13 @@ EOF
exit ;;
pc:*:*:*)
# Left here for compatibility:
- # uname -m prints for DJGPP always 'pc', but it prints nothing about
- # the processor, so we play safe by assuming i386.
- echo i386-pc-msdosdjgpp
- exit ;;
+ # uname -m prints for DJGPP always 'pc', but it prints nothing about
+ # the processor, so we play safe by assuming i586.
+ # Note: whatever this is, it MUST be the same as what config.sub
+ # prints for the "djgpp" host, or else GDB configury will decide that
+ # this is a cross-build.
+ echo i586-pc-msdosdjgpp
+ exit ;;
Intel:Mach:3*:*)
echo i386-pc-mach3
exit ;;
@@ -1152,8 +1111,18 @@ EOF
/bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
&& { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
- /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
- && { echo i486-ncr-sysv4; exit; } ;;
+ /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
+ && { echo i486-ncr-sysv4; exit; } ;;
+ NCR*:*:4.2:* | MPRAS*:*:4.2:*)
+ OS_REL='.3'
+ test -r /etc/.relid \
+ && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
+ /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
+ && { echo i486-ncr-sysv4.3${OS_REL}; exit; }
+ /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
+ && { echo i586-ncr-sysv4.3${OS_REL}; exit; }
+ /bin/uname -p 2>/dev/null | /bin/grep pteron >/dev/null \
+ && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*)
echo m68k-unknown-lynxos${UNAME_RELEASE}
exit ;;
@@ -1166,7 +1135,7 @@ EOF
rs6000:LynxOS:2.*:*)
echo rs6000-unknown-lynxos${UNAME_RELEASE}
exit ;;
- PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.0*:*)
+ PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.[02]*:*)
echo powerpc-unknown-lynxos${UNAME_RELEASE}
exit ;;
SM[BE]S:UNIX_SV:*:*)
@@ -1186,10 +1155,10 @@ EOF
echo ns32k-sni-sysv
fi
exit ;;
- PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort
- # says <Richard.M.Bartel at ccMail.Census.GOV>
- echo i586-unisys-sysv4
- exit ;;
+ PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort
+ # says <Richard.M.Bartel at ccMail.Census.GOV>
+ echo i586-unisys-sysv4
+ exit ;;
*:UNIX_System_V:4*:FTX*)
# From Gerald Hewes <hewes at openmarket.com>.
# How about differentiating between stratus architectures? -djm
@@ -1215,11 +1184,11 @@ EOF
exit ;;
R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*)
if [ -d /usr/nec ]; then
- echo mips-nec-sysv${UNAME_RELEASE}
+ echo mips-nec-sysv${UNAME_RELEASE}
else
- echo mips-unknown-sysv${UNAME_RELEASE}
+ echo mips-unknown-sysv${UNAME_RELEASE}
fi
- exit ;;
+ exit ;;
BeBox:BeOS:*:*) # BeOS running on hardware made by Be, PPC only.
echo powerpc-be-beos
exit ;;
@@ -1259,6 +1228,16 @@ EOF
*:Darwin:*:*)
UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
case $UNAME_PROCESSOR in
+ i386)
+ eval $set_cc_for_build
+ if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
+ if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \
+ (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
+ grep IS_64BIT_ARCH >/dev/null
+ then
+ UNAME_PROCESSOR="x86_64"
+ fi
+ fi ;;
unknown) UNAME_PROCESSOR=powerpc ;;
esac
echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
@@ -1274,6 +1253,9 @@ EOF
*:QNX:*:4*)
echo i386-pc-qnx
exit ;;
+ NEO-?:NONSTOP_KERNEL:*:*)
+ echo neo-tandem-nsk${UNAME_RELEASE}
+ exit ;;
NSE-?:NONSTOP_KERNEL:*:*)
echo nse-tandem-nsk${UNAME_RELEASE}
exit ;;
@@ -1319,13 +1301,13 @@ EOF
echo pdp10-unknown-its
exit ;;
SEI:*:*:SEIUX)
- echo mips-sei-seiux${UNAME_RELEASE}
+ echo mips-sei-seiux${UNAME_RELEASE}
exit ;;
*:DragonFly:*:*)
echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
exit ;;
*:*VMS:*:*)
- UNAME_MACHINE=`(uname -p) 2>/dev/null`
+ UNAME_MACHINE=`(uname -p) 2>/dev/null`
case "${UNAME_MACHINE}" in
A*) echo alpha-dec-vms ; exit ;;
I*) echo ia64-dec-vms ; exit ;;
@@ -1340,6 +1322,12 @@ EOF
i*86:rdos:*:*)
echo ${UNAME_MACHINE}-pc-rdos
exit ;;
+ i*86:AROS:*:*)
+ echo ${UNAME_MACHINE}-pc-aros
+ exit ;;
+ x86_64:VMkernel:*:*)
+ echo ${UNAME_MACHINE}-unknown-esx
+ exit ;;
esac
#echo '(No uname command or uname output not recognized.)' 1>&2
@@ -1362,11 +1350,11 @@ main ()
#include <sys/param.h>
printf ("m68k-sony-newsos%s\n",
#ifdef NEWSOS4
- "4"
+ "4"
#else
- ""
+ ""
#endif
- ); exit (0);
+ ); exit (0);
#endif
#endif
diff --git a/config.sub b/config.sub
index 053e738..59bb593 100755
--- a/config.sub
+++ b/config.sub
@@ -1,10 +1,10 @@
#! /bin/sh
# Configuration validation subroutine script.
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
-# Free Software Foundation, Inc.
+# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
+# 2011, 2012 Free Software Foundation, Inc.
-timestamp='2008-09-08'
+timestamp='2012-04-18'
# This file is (in principle) common to ALL GNU software.
# The presence of a machine in this file suggests that SOME GNU software
@@ -21,9 +21,7 @@ timestamp='2008-09-08'
# 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, write to the Free Software
-# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
-# 02110-1301, USA.
+# 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
@@ -32,13 +30,16 @@ timestamp='2008-09-08'
# Please send patches to <config-patches at gnu.org>. Submit a context
-# diff and a properly formatted ChangeLog entry.
+# diff and a properly formatted GNU ChangeLog entry.
#
# Configuration subroutine to validate and canonicalize a configuration type.
# Supply the specified configuration type as an argument.
# If it is invalid, we print an error message on stderr and exit with code 1.
# Otherwise, we print the canonical config type on stdout and succeed.
+# You can get the latest version of this script from:
+# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD
+
# This file is supposed to be the same for all GNU packages
# and recognize all the CPU types, system types and aliases
# that are meaningful with *any* GNU software.
@@ -72,8 +73,9 @@ Report bugs and patches to <config-patches at gnu.org>."
version="\
GNU config.sub ($timestamp)
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
-2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
+2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012
+Free Software Foundation, Inc.
This is free software; see the source for copying conditions. There is NO
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -120,12 +122,18 @@ esac
# Here we must recognize all the valid KERNEL-OS combinations.
maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
case $maybe_os in
- nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \
- uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \
+ nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \
+ linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \
+ knetbsd*-gnu* | netbsd*-gnu* | \
+ kopensolaris*-gnu* | \
storm-chaos* | os2-emx* | rtmk-nova*)
os=-$maybe_os
basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
;;
+ android-linux)
+ os=-linux-android
+ basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`-unknown
+ ;;
*)
basic_machine=`echo $1 | sed 's/-[^-]*$//'`
if [ $basic_machine != $1 ]
@@ -148,10 +156,13 @@ case $os in
-convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
-c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
-harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
- -apple | -axis | -knuth | -cray)
+ -apple | -axis | -knuth | -cray | -microblaze)
os=
basic_machine=$1
;;
+ -bluegene*)
+ os=-cnk
+ ;;
-sim | -cisco | -oki | -wec | -winbond)
os=
basic_machine=$1
@@ -166,10 +177,10 @@ case $os in
os=-chorusos
basic_machine=$1
;;
- -chorusrdb)
- os=-chorusrdb
+ -chorusrdb)
+ os=-chorusrdb
basic_machine=$1
- ;;
+ ;;
-hiux*)
os=-hiuxwe2
;;
@@ -214,6 +225,12 @@ case $os in
-isc*)
basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
;;
+ -lynx*178)
+ os=-lynxos178
+ ;;
+ -lynx*5)
+ os=-lynxos5
+ ;;
-lynx*)
os=-lynxos
;;
@@ -238,17 +255,23 @@ case $basic_machine in
# Some are omitted here because they have special meanings below.
1750a | 580 \
| a29k \
+ | aarch64 | aarch64_be \
| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
| am33_2.0 \
| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \
+ | be32 | be64 \
| bfin \
| c4x | clipper \
| d10v | d30v | dlx | dsp16xx \
+ | epiphany \
| fido | fr30 | frv \
| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
+ | hexagon \
| i370 | i860 | i960 | ia64 \
| ip2k | iq2000 \
+ | le32 | le64 \
+ | lm32 \
| m32c | m32r | m32rle | m68000 | m68k | m88k \
| maxq | mb | microblaze | mcore | mep | metag \
| mips | mipsbe | mipseb | mipsel | mipsle \
@@ -270,29 +293,42 @@ case $basic_machine in
| mipsisa64sr71k | mipsisa64sr71kel \
| mipstx39 | mipstx39el \
| mn10200 | mn10300 \
+ | moxie \
| mt \
| msp430 \
+ | nds32 | nds32le | nds32be \
| nios | nios2 \
| ns16k | ns32k \
+ | open8 \
| or32 \
| pdp10 | pdp11 | pj | pjl \
- | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
+ | powerpc | powerpc64 | powerpc64le | powerpcle \
| pyramid \
+ | rl78 | rx \
| score \
- | sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
+ | sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
| sh64 | sh64le \
| sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
| sparcv8 | sparcv9 | sparcv9b | sparcv9v \
- | spu | strongarm \
- | tahoe | thumb | tic4x | tic80 | tron \
- | v850 | v850e \
+ | spu \
+ | tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \
+ | ubicom32 \
+ | v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \
| we32k \
- | x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \
+ | x86 | xc16x | xstormy16 | xtensa \
| z8k | z80)
basic_machine=$basic_machine-unknown
;;
- m6811 | m68hc11 | m6812 | m68hc12)
- # Motorola 68HC11/12.
+ c54x)
+ basic_machine=tic54x-unknown
+ ;;
+ c55x)
+ basic_machine=tic55x-unknown
+ ;;
+ c6x)
+ basic_machine=tic6x-unknown
+ ;;
+ m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | picochip)
basic_machine=$basic_machine-unknown
os=-none
;;
@@ -302,6 +338,21 @@ case $basic_machine in
basic_machine=mt-unknown
;;
+ strongarm | thumb | xscale)
+ basic_machine=arm-unknown
+ ;;
+ xgate)
+ basic_machine=$basic_machine-unknown
+ os=-none
+ ;;
+ xscaleeb)
+ basic_machine=armeb-unknown
+ ;;
+
+ xscaleel)
+ basic_machine=armel-unknown
+ ;;
+
# We use `pc' rather than `unknown'
# because (1) that's what they normally are, and
# (2) the word "unknown" tends to confuse beginning users.
@@ -316,24 +367,29 @@ case $basic_machine in
# Recognize the basic CPU types with company name.
580-* \
| a29k-* \
+ | aarch64-* | aarch64_be-* \
| alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
| alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
| alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
| arm-* | armbe-* | armle-* | armeb-* | armv*-* \
| avr-* | avr32-* \
+ | be32-* | be64-* \
| bfin-* | bs2000-* \
- | c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \
+ | c[123]* | c30-* | [cjt]90-* | c4x-* \
| clipper-* | craynv-* | cydra-* \
| d10v-* | d30v-* | dlx-* \
| elxsi-* \
| f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \
| h8300-* | h8500-* \
| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
+ | hexagon-* \
| i*86-* | i860-* | i960-* | ia64-* \
| ip2k-* | iq2000-* \
+ | le32-* | le64-* \
+ | lm32-* \
| m32c-* | m32r-* | m32rle-* \
| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
- | m88110-* | m88k-* | maxq-* | mcore-* | metag-* \
+ | m88110-* | m88k-* | maxq-* | mcore-* | metag-* | microblaze-* \
| mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
| mips16-* \
| mips64-* | mips64el-* \
@@ -355,24 +411,29 @@ case $basic_machine in
| mmix-* \
| mt-* \
| msp430-* \
+ | nds32-* | nds32le-* | nds32be-* \
| nios-* | nios2-* \
| none-* | np1-* | ns16k-* | ns32k-* \
+ | open8-* \
| orion-* \
| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
- | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
+ | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \
| pyramid-* \
- | romp-* | rs6000-* \
- | sh-* | sh[1234]-* | sh[24]a-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
+ | rl78-* | romp-* | rs6000-* | rx-* \
+ | sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
| sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
| sparclite-* \
- | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \
- | tahoe-* | thumb-* \
- | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* | tile-* \
+ | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx?-* \
+ | tahoe-* \
+ | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
+ | tile*-* \
| tron-* \
- | v850-* | v850e-* | vax-* \
+ | ubicom32-* \
+ | v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \
+ | vax-* \
| we32k-* \
- | x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \
+ | x86-* | x86_64-* | xc16x-* | xps100-* \
| xstormy16-* | xtensa*-* \
| ymp-* \
| z8k-* | z80-*)
@@ -397,7 +458,7 @@ case $basic_machine in
basic_machine=a29k-amd
os=-udi
;;
- abacus)
+ abacus)
basic_machine=abacus-unknown
;;
adobe68k)
@@ -443,6 +504,10 @@ case $basic_machine in
basic_machine=m68k-apollo
os=-bsd
;;
+ aros)
+ basic_machine=i386-pc
+ os=-aros
+ ;;
aux)
basic_machine=m68k-apple
os=-aux
@@ -459,11 +524,24 @@ case $basic_machine in
basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'`
os=-linux
;;
+ bluegene*)
+ basic_machine=powerpc-ibm
+ os=-cnk
+ ;;
+ c54x-*)
+ basic_machine=tic54x-`echo $basic_machine | sed 's/^[^-]*-//'`
+ ;;
+ c55x-*)
+ basic_machine=tic55x-`echo $basic_machine | sed 's/^[^-]*-//'`
+ ;;
+ c6x-*)
+ basic_machine=tic6x-`echo $basic_machine | sed 's/^[^-]*-//'`
+ ;;
c90)
basic_machine=c90-cray
os=-unicos
;;
- cegcc)
+ cegcc)
basic_machine=arm-unknown
os=-cegcc
;;
@@ -495,7 +573,7 @@ case $basic_machine in
basic_machine=craynv-cray
os=-unicosmp
;;
- cr16)
+ cr16 | cr16-*)
basic_machine=cr16-unknown
os=-elf
;;
@@ -653,7 +731,6 @@ case $basic_machine in
i370-ibm* | ibm*)
basic_machine=i370-ibm
;;
-# I'm not sure what "Sysv32" means. Should this be sysv3.2?
i*86v32)
basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
os=-sysv32
@@ -711,6 +788,9 @@ case $basic_machine in
basic_machine=ns32k-utek
os=-sysv
;;
+ microblaze)
+ basic_machine=microblaze-xilinx
+ ;;
mingw32)
basic_machine=i386-pc
os=-mingw32
@@ -747,10 +827,18 @@ case $basic_machine in
ms1-*)
basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'`
;;
+ msys)
+ basic_machine=i386-pc
+ os=-msys
+ ;;
mvs)
basic_machine=i370-ibm
os=-mvs
;;
+ nacl)
+ basic_machine=le32-unknown
+ os=-nacl
+ ;;
ncr3000)
basic_machine=i486-ncr
os=-sysv4
@@ -815,6 +903,12 @@ case $basic_machine in
np1)
basic_machine=np1-gould
;;
+ neo-tandem)
+ basic_machine=neo-tandem
+ ;;
+ nse-tandem)
+ basic_machine=nse-tandem
+ ;;
nsr-tandem)
basic_machine=nsr-tandem
;;
@@ -897,9 +991,10 @@ case $basic_machine in
;;
power) basic_machine=power-ibm
;;
- ppc) basic_machine=powerpc-unknown
+ ppc | ppcbe) basic_machine=powerpc-unknown
;;
- ppc-*) basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
+ ppc-* | ppcbe-*)
+ basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
;;
ppcle | powerpclittle | ppc-le | powerpc-little)
basic_machine=powerpcle-unknown
@@ -993,6 +1088,9 @@ case $basic_machine in
basic_machine=i860-stratus
os=-sysv4
;;
+ strongarm-* | thumb-*)
+ basic_machine=arm-`echo $basic_machine | sed 's/^[^-]*-//'`
+ ;;
sun2)
basic_machine=m68000-sun
;;
@@ -1049,20 +1147,8 @@ case $basic_machine in
basic_machine=t90-cray
os=-unicos
;;
- tic54x | c54x*)
- basic_machine=tic54x-unknown
- os=-coff
- ;;
- tic55x | c55x*)
- basic_machine=tic55x-unknown
- os=-coff
- ;;
- tic6x | c6x*)
- basic_machine=tic6x-unknown
- os=-coff
- ;;
tile*)
- basic_machine=tile-unknown
+ basic_machine=$basic_machine-unknown
os=-linux-gnu
;;
tx39)
@@ -1132,6 +1218,9 @@ case $basic_machine in
xps | xps100)
basic_machine=xps100-honeywell
;;
+ xscale-* | xscalee[bl]-*)
+ basic_machine=`echo $basic_machine | sed 's/^xscale/arm/'`
+ ;;
ymp)
basic_machine=ymp-cray
os=-unicos
@@ -1182,7 +1271,7 @@ case $basic_machine in
we32k)
basic_machine=we32k-att
;;
- sh[1234] | sh[24]a | sh[34]eb | sh[1234]le | sh[23]ele)
+ sh[1234] | sh[24]a | sh[24]aeb | sh[34]eb | sh[1234]le | sh[23]ele)
basic_machine=sh-unknown
;;
sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v)
@@ -1229,9 +1318,12 @@ esac
if [ x"$os" != x"" ]
then
case $os in
- # First match some system type aliases
- # that might get confused with valid system types.
+ # First match some system type aliases
+ # that might get confused with valid system types.
# -solaris* is a basic system type, with this one exception.
+ -auroraux)
+ os=-auroraux
+ ;;
-solaris1 | -solaris1.*)
os=`echo $os | sed -e 's|solaris1|sunos4|'`
;;
@@ -1252,10 +1344,11 @@ case $os in
# Each alternative MUST END IN A *, to match a version number.
# -sysv* is not here because it comes later, after sysvr4.
-gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
- | -*vms* | -sco* | -esix* | -isc* | -aix* | -sunos | -sunos[34]*\
- | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \
+ | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\
+ | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \
+ | -sym* | -kopensolaris* \
| -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
- | -aos* \
+ | -aos* | -aros* \
| -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
| -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
| -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
@@ -1265,8 +1358,9 @@ case $os in
| -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
| -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
| -chorusos* | -chorusrdb* | -cegcc* \
- | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
- | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \
+ | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
+ | -mingw32* | -linux-gnu* | -linux-android* \
+ | -linux-newlib* | -linux-uclibc* \
| -uxpv* | -beos* | -mpeix* | -udk* \
| -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
| -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
@@ -1274,7 +1368,7 @@ case $os in
| -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
| -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
| -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
- | -skyos* | -haiku* | -rdos* | -toppers* | -drops*)
+ | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es*)
# Remember, each alternative MUST END IN *, to match a version number.
;;
-qnx*)
@@ -1313,7 +1407,7 @@ case $os in
-opened*)
os=-openedition
;;
- -os400*)
+ -os400*)
os=-os400
;;
-wince*)
@@ -1362,7 +1456,7 @@ case $os in
-sinix*)
os=-sysv4
;;
- -tpf*)
+ -tpf*)
os=-tpf
;;
-triton*)
@@ -1407,6 +1501,8 @@ case $os in
-dicos*)
os=-dicos
;;
+ -nacl*)
+ ;;
-none)
;;
*)
@@ -1429,10 +1525,10 @@ else
# system, and we'll never get to this point.
case $basic_machine in
- score-*)
+ score-*)
os=-elf
;;
- spu-*)
+ spu-*)
os=-elf
;;
*-acorn)
@@ -1444,8 +1540,17 @@ case $basic_machine in
arm*-semi)
os=-aout
;;
- c4x-* | tic4x-*)
- os=-coff
+ c4x-* | tic4x-*)
+ os=-coff
+ ;;
+ tic54x-*)
+ os=-coff
+ ;;
+ tic55x-*)
+ os=-coff
+ ;;
+ tic6x-*)
+ os=-coff
;;
# This must come before the *-dec entry.
pdp10-*)
@@ -1465,14 +1570,11 @@ case $basic_machine in
;;
m68000-sun)
os=-sunos3
- # This also exists in the configure program, but was not the
- # default.
- # os=-sunos4
;;
m68*-cisco)
os=-aout
;;
- mep-*)
+ mep-*)
os=-elf
;;
mips*-cisco)
@@ -1499,7 +1601,7 @@ case $basic_machine in
*-ibm)
os=-aix
;;
- *-knuth)
+ *-knuth)
os=-mmixware
;;
*-wec)
@@ -1604,7 +1706,7 @@ case $basic_machine in
-sunos*)
vendor=sun
;;
- -aix*)
+ -cnk*|-aix*)
vendor=ibm
;;
-beos*)
diff --git a/configure b/configure
index 2564a52..21bd78a 100755
--- a/configure
+++ b/configure
@@ -1,82 +1,460 @@
#! /bin/sh
-# From configure.in Revision: 1.16 .
+# From configure.in Revision: 1.19 .
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.59.
+# Generated by GNU Autoconf 2.69.
+#
+#
+# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
+#
#
-# Copyright (C) 2003 Free Software Foundation, Inc.
# This configure script is free software; the Free Software Foundation
# gives unlimited permission to copy, distribute and modify it.
-## --------------------- ##
-## M4sh Initialization. ##
-## --------------------- ##
+## -------------------- ##
+## M4sh Initialization. ##
+## -------------------- ##
-# Be Bourne compatible
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
+# Be more Bourne compatible
+DUALCASE=1; export DUALCASE # for MKS sh
+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then :
emulate sh
NULLCMD=:
- # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
+ # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
# is contrary to our usage. Disable this feature.
alias -g '${1+"$@"}'='"$@"'
-elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then
- set -o posix
+ setopt NO_GLOB_SUBST
+else
+ case `(set -o) 2>/dev/null` in #(
+ *posix*) :
+ set -o posix ;; #(
+ *) :
+ ;;
+esac
fi
-DUALCASE=1; export DUALCASE # for MKS sh
-# Support unset when possible.
-if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
- as_unset=unset
-else
- as_unset=false
+
+as_nl='
+'
+export as_nl
+# Printing a long string crashes Solaris 7 /usr/bin/printf.
+as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
+# Prefer a ksh shell builtin over an external printf program on Solaris,
+# but without wasting forks for bash or zsh.
+if test -z "$BASH_VERSION$ZSH_VERSION" \
+ && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then
+ as_echo='print -r --'
+ as_echo_n='print -rn --'
+elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
+ as_echo='printf %s\n'
+ as_echo_n='printf %s'
+else
+ if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then
+ as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"'
+ as_echo_n='/usr/ucb/echo -n'
+ else
+ as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
+ as_echo_n_body='eval
+ arg=$1;
+ case $arg in #(
+ *"$as_nl"*)
+ expr "X$arg" : "X\\(.*\\)$as_nl";
+ arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
+ esac;
+ expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl"
+ '
+ export as_echo_n_body
+ as_echo_n='sh -c $as_echo_n_body as_echo'
+ fi
+ export as_echo_body
+ as_echo='sh -c $as_echo_body as_echo'
+fi
+
+# The user is always right.
+if test "${PATH_SEPARATOR+set}" != set; then
+ PATH_SEPARATOR=:
+ (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && {
+ (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 ||
+ PATH_SEPARATOR=';'
+ }
fi
-# Work around bugs in pre-3.0 UWIN ksh.
-$as_unset ENV MAIL MAILPATH
+# IFS
+# We need space, tab and new line, in precisely that order. Quoting is
+# there to prevent editors from complaining about space-tab.
+# (If _AS_PATH_WALK were called with IFS unset, it would disable word
+# splitting by setting IFS to empty value.)
+IFS=" "" $as_nl"
+
+# Find who we are. Look in the path if we contain no directory separator.
+as_myself=
+case $0 in #((
+ *[\\/]* ) as_myself=$0 ;;
+ *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
+ done
+IFS=$as_save_IFS
+
+ ;;
+esac
+# We did not find ourselves, most probably we were run as `sh COMMAND'
+# in which case we are not to be found in the path.
+if test "x$as_myself" = x; then
+ as_myself=$0
+fi
+if test ! -f "$as_myself"; then
+ $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
+ exit 1
+fi
+
+# Unset variables that we do not need and which cause bugs (e.g. in
+# pre-3.0 UWIN ksh). But do not cause bugs in bash 2.01; the "|| exit 1"
+# suppresses any "Segmentation fault" message there. '((' could
+# trigger a bug in pdksh 5.2.14.
+for as_var in BASH_ENV ENV MAIL MAILPATH
+do eval test x\${$as_var+set} = xset \
+ && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || :
+done
PS1='$ '
PS2='> '
PS4='+ '
# NLS nuisances.
-for as_var in \
- LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \
- LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
- LC_TELEPHONE LC_TIME
+LC_ALL=C
+export LC_ALL
+LANGUAGE=C
+export LANGUAGE
+
+# CDPATH.
+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
+
+# Use a proper internal environment variable to ensure we don't fall
+ # into an infinite loop, continuously re-executing ourselves.
+ if test x"${_as_can_reexec}" != xno && test "x$CONFIG_SHELL" != x; then
+ _as_can_reexec=no; export _as_can_reexec;
+ # We cannot yet assume a decent shell, so we have to provide a
+# neutralization value for shells without unset; and this also
+# works around shells that cannot unset nonexistent variables.
+# Preserve -v and -x to the replacement shell.
+BASH_ENV=/dev/null
+ENV=/dev/null
+(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
+case $- in # ((((
+ *v*x* | *x*v* ) as_opts=-vx ;;
+ *v* ) as_opts=-v ;;
+ *x* ) as_opts=-x ;;
+ * ) as_opts= ;;
+esac
+exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"}
+# Admittedly, this is quite paranoid, since all the known shells bail
+# out after a failed `exec'.
+$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2
+as_fn_exit 255
+ fi
+ # We don't want this to propagate to other subprocesses.
+ { _as_can_reexec=; unset _as_can_reexec;}
+if test "x$CONFIG_SHELL" = x; then
+ as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then :
+ emulate sh
+ NULLCMD=:
+ # Pre-4.2 versions of Zsh do word splitting on \${1+\"\$@\"}, which
+ # is contrary to our usage. Disable this feature.
+ alias -g '\${1+\"\$@\"}'='\"\$@\"'
+ setopt NO_GLOB_SUBST
+else
+ case \`(set -o) 2>/dev/null\` in #(
+ *posix*) :
+ set -o posix ;; #(
+ *) :
+ ;;
+esac
+fi
+"
+ as_required="as_fn_return () { (exit \$1); }
+as_fn_success () { as_fn_return 0; }
+as_fn_failure () { as_fn_return 1; }
+as_fn_ret_success () { return 0; }
+as_fn_ret_failure () { return 1; }
+
+exitcode=0
+as_fn_success || { exitcode=1; echo as_fn_success failed.; }
+as_fn_failure && { exitcode=1; echo as_fn_failure succeeded.; }
+as_fn_ret_success || { exitcode=1; echo as_fn_ret_success failed.; }
+as_fn_ret_failure && { exitcode=1; echo as_fn_ret_failure succeeded.; }
+if ( set x; as_fn_ret_success y && test x = \"\$1\" ); then :
+
+else
+ exitcode=1; echo positional parameters were not saved.
+fi
+test x\$exitcode = x0 || exit 1
+test -x / || exit 1"
+ as_suggested=" as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO
+ as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO
+ eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" &&
+ test \"x\`expr \$as_lineno_1'\$as_run' + 1\`\" = \"x\$as_lineno_2'\$as_run'\"' || exit 1
+test \$(( 1 + 1 )) = 2 || exit 1"
+ if (eval "$as_required") 2>/dev/null; then :
+ as_have_required=yes
+else
+ as_have_required=no
+fi
+ if test x$as_have_required = xyes && (eval "$as_suggested") 2>/dev/null; then :
+
+else
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+as_found=false
+for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
do
- if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
- eval $as_var=C; export $as_var
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ as_found=:
+ case $as_dir in #(
+ /*)
+ for as_base in sh bash ksh sh5; do
+ # Try only shells that exist, to save several forks.
+ as_shell=$as_dir/$as_base
+ if { test -f "$as_shell" || test -f "$as_shell.exe"; } &&
+ { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$as_shell"; } 2>/dev/null; then :
+ CONFIG_SHELL=$as_shell as_have_required=yes
+ if { $as_echo "$as_bourne_compatible""$as_suggested" | as_run=a "$as_shell"; } 2>/dev/null; then :
+ break 2
+fi
+fi
+ done;;
+ esac
+ as_found=false
+done
+$as_found || { if { test -f "$SHELL" || test -f "$SHELL.exe"; } &&
+ { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$SHELL"; } 2>/dev/null; then :
+ CONFIG_SHELL=$SHELL as_have_required=yes
+fi; }
+IFS=$as_save_IFS
+
+
+ if test "x$CONFIG_SHELL" != x; then :
+ export CONFIG_SHELL
+ # We cannot yet assume a decent shell, so we have to provide a
+# neutralization value for shells without unset; and this also
+# works around shells that cannot unset nonexistent variables.
+# Preserve -v and -x to the replacement shell.
+BASH_ENV=/dev/null
+ENV=/dev/null
+(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
+case $- in # ((((
+ *v*x* | *x*v* ) as_opts=-vx ;;
+ *v* ) as_opts=-v ;;
+ *x* ) as_opts=-x ;;
+ * ) as_opts= ;;
+esac
+exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"}
+# Admittedly, this is quite paranoid, since all the known shells bail
+# out after a failed `exec'.
+$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2
+exit 255
+fi
+
+ if test x$as_have_required = xno; then :
+ $as_echo "$0: This script requires a shell more modern than all"
+ $as_echo "$0: the shells that I found on your system."
+ if test x${ZSH_VERSION+set} = xset ; then
+ $as_echo "$0: In particular, zsh $ZSH_VERSION has bugs and should"
+ $as_echo "$0: be upgraded to zsh 4.3.4 or later."
else
- $as_unset $as_var
+ $as_echo "$0: Please tell bug-autoconf at gnu.org about your system,
+$0: including any error possibly output before this
+$0: message. Then install a modern shell, or manually run
+$0: the script under such a shell if you do have one."
fi
-done
+ exit 1
+fi
+fi
+fi
+SHELL=${CONFIG_SHELL-/bin/sh}
+export SHELL
+# Unset more variables known to interfere with behavior of common tools.
+CLICOLOR_FORCE= GREP_OPTIONS=
+unset CLICOLOR_FORCE GREP_OPTIONS
+
+## --------------------- ##
+## M4sh Shell Functions. ##
+## --------------------- ##
+# as_fn_unset VAR
+# ---------------
+# Portably unset VAR.
+as_fn_unset ()
+{
+ { eval $1=; unset $1;}
+}
+as_unset=as_fn_unset
+
+# as_fn_set_status STATUS
+# -----------------------
+# Set $? to STATUS, without forking.
+as_fn_set_status ()
+{
+ return $1
+} # as_fn_set_status
-# Required to use basename.
-if expr a : '\(a\)' >/dev/null 2>&1; then
+# as_fn_exit STATUS
+# -----------------
+# Exit the shell with STATUS, even in a "trap 0" or "set -e" context.
+as_fn_exit ()
+{
+ set +e
+ as_fn_set_status $1
+ exit $1
+} # as_fn_exit
+
+# as_fn_mkdir_p
+# -------------
+# Create "$as_dir" as a directory, including parents if necessary.
+as_fn_mkdir_p ()
+{
+
+ case $as_dir in #(
+ -*) as_dir=./$as_dir;;
+ esac
+ test -d "$as_dir" || eval $as_mkdir_p || {
+ as_dirs=
+ while :; do
+ case $as_dir in #(
+ *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
+ *) as_qdir=$as_dir;;
+ esac
+ as_dirs="'$as_qdir' $as_dirs"
+ as_dir=`$as_dirname -- "$as_dir" ||
+$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+ X"$as_dir" : 'X\(//\)[^/]' \| \
+ X"$as_dir" : 'X\(//\)$' \| \
+ X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X"$as_dir" |
+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+ s//\1/
+ q
+ }
+ /^X\(\/\/\)[^/].*/{
+ s//\1/
+ q
+ }
+ /^X\(\/\/\)$/{
+ s//\1/
+ q
+ }
+ /^X\(\/\).*/{
+ s//\1/
+ q
+ }
+ s/.*/./; q'`
+ test -d "$as_dir" && break
+ done
+ test -z "$as_dirs" || eval "mkdir $as_dirs"
+ } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir"
+
+
+} # as_fn_mkdir_p
+
+# as_fn_executable_p FILE
+# -----------------------
+# Test if FILE is an executable regular file.
+as_fn_executable_p ()
+{
+ test -f "$1" && test -x "$1"
+} # as_fn_executable_p
+# as_fn_append VAR VALUE
+# ----------------------
+# Append the text in VALUE to the end of the definition contained in VAR. Take
+# advantage of any shell optimizations that allow amortized linear growth over
+# repeated appends, instead of the typical quadratic growth present in naive
+# implementations.
+if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then :
+ eval 'as_fn_append ()
+ {
+ eval $1+=\$2
+ }'
+else
+ as_fn_append ()
+ {
+ eval $1=\$$1\$2
+ }
+fi # as_fn_append
+
+# as_fn_arith ARG...
+# ------------------
+# Perform arithmetic evaluation on the ARGs, and store the result in the
+# global $as_val. Take advantage of shells that can avoid forks. The arguments
+# must be portable across $(()) and expr.
+if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then :
+ eval 'as_fn_arith ()
+ {
+ as_val=$(( $* ))
+ }'
+else
+ as_fn_arith ()
+ {
+ as_val=`expr "$@" || test $? -eq 1`
+ }
+fi # as_fn_arith
+
+
+# as_fn_error STATUS ERROR [LINENO LOG_FD]
+# ----------------------------------------
+# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
+# provided, also output the error to LOG_FD, referencing LINENO. Then exit the
+# script with STATUS, using 1 if that was 0.
+as_fn_error ()
+{
+ as_status=$1; test $as_status -eq 0 && as_status=1
+ if test "$4"; then
+ as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+ $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
+ fi
+ $as_echo "$as_me: error: $2" >&2
+ as_fn_exit $as_status
+} # as_fn_error
+
+if expr a : '\(a\)' >/dev/null 2>&1 &&
+ test "X`expr 00001 : '.*\(...\)'`" = X001; then
as_expr=expr
else
as_expr=false
fi
-if (basename /) >/dev/null 2>&1 && test "X`basename / 2>&1`" = "X/"; then
+if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
as_basename=basename
else
as_basename=false
fi
+if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
+ as_dirname=dirname
+else
+ as_dirname=false
+fi
-# Name of the executable.
-as_me=`$as_basename "$0" ||
+as_me=`$as_basename -- "$0" ||
$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
X"$0" : 'X\(//\)$' \| \
- X"$0" : 'X\(/\)$' \| \
- . : '\(.\)' 2>/dev/null ||
-echo X/"$0" |
- sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/; q; }
- /^X\/\(\/\/\)$/{ s//\1/; q; }
- /^X\/\(\/\).*/{ s//\1/; q; }
- s/.*/./; q'`
-
+ X"$0" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X/"$0" |
+ sed '/^.*\/\([^/][^/]*\)\/*$/{
+ s//\1/
+ q
+ }
+ /^X\/\(\/\/\)$/{
+ s//\1/
+ q
+ }
+ /^X\/\(\/\).*/{
+ s//\1/
+ q
+ }
+ s/.*/./; q'`
-# PATH needs CR, and LINENO needs CR and PATH.
# Avoid depending upon Character Ranges.
as_cr_letters='abcdefghijklmnopqrstuvwxyz'
as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
@@ -84,146 +462,91 @@ as_cr_Letters=$as_cr_letters$as_cr_LETTERS
as_cr_digits='0123456789'
as_cr_alnum=$as_cr_Letters$as_cr_digits
-# The user is always right.
-if test "${PATH_SEPARATOR+set}" != set; then
- echo "#! /bin/sh" >conf$$.sh
- echo "exit 0" >>conf$$.sh
- chmod +x conf$$.sh
- if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
- PATH_SEPARATOR=';'
- else
- PATH_SEPARATOR=:
- fi
- rm -f conf$$.sh
-fi
-
-
- as_lineno_1=$LINENO
- as_lineno_2=$LINENO
- as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
- test "x$as_lineno_1" != "x$as_lineno_2" &&
- test "x$as_lineno_3" = "x$as_lineno_2" || {
- # Find who we are. Look in the path if we contain no path at all
- # relative or not.
- case $0 in
- *[\\/]* ) as_myself=$0 ;;
- *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
-done
-
- ;;
- esac
- # We did not find ourselves, most probably we were run as `sh COMMAND'
- # in which case we are not to be found in the path.
- if test "x$as_myself" = x; then
- as_myself=$0
- fi
- if test ! -f "$as_myself"; then
- { echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2
- { (exit 1); exit 1; }; }
- fi
- case $CONFIG_SHELL in
- '')
- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for as_base in sh bash ksh sh5; do
- case $as_dir in
- /*)
- if ("$as_dir/$as_base" -c '
- as_lineno_1=$LINENO
- as_lineno_2=$LINENO
- as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
- test "x$as_lineno_1" != "x$as_lineno_2" &&
- test "x$as_lineno_3" = "x$as_lineno_2" ') 2>/dev/null; then
- $as_unset BASH_ENV || test "${BASH_ENV+set}" != set || { BASH_ENV=; export BASH_ENV; }
- $as_unset ENV || test "${ENV+set}" != set || { ENV=; export ENV; }
- CONFIG_SHELL=$as_dir/$as_base
- export CONFIG_SHELL
- exec "$CONFIG_SHELL" "$0" ${1+"$@"}
- fi;;
- esac
- done
-done
-;;
- esac
- # Create $as_me.lineno as a copy of $as_myself, but with $LINENO
- # uniformly replaced by the line number. The first 'sed' inserts a
- # line-number line before each line; the second 'sed' does the real
- # work. The second script uses 'N' to pair each line-number line
- # with the numbered line, and appends trailing '-' during
- # substitution so that $LINENO is not a special case at line end.
- # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the
- # second 'sed' script. Blame Lee E. McMahon for sed's syntax. :-)
- sed '=' <$as_myself |
+ as_lineno_1=$LINENO as_lineno_1a=$LINENO
+ as_lineno_2=$LINENO as_lineno_2a=$LINENO
+ eval 'test "x$as_lineno_1'$as_run'" != "x$as_lineno_2'$as_run'" &&
+ test "x`expr $as_lineno_1'$as_run' + 1`" = "x$as_lineno_2'$as_run'"' || {
+ # Blame Lee E. McMahon (1931-1989) for sed's syntax. :-)
+ sed -n '
+ p
+ /[$]LINENO/=
+ ' <$as_myself |
sed '
+ s/[$]LINENO.*/&-/
+ t lineno
+ b
+ :lineno
N
- s,$,-,
- : loop
- s,^\(['$as_cr_digits']*\)\(.*\)[$]LINENO\([^'$as_cr_alnum'_]\),\1\2\1\3,
+ :loop
+ s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/
t loop
- s,-$,,
- s,^['$as_cr_digits']*\n,,
+ s/-\n.*//
' >$as_me.lineno &&
- chmod +x $as_me.lineno ||
- { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
- { (exit 1); exit 1; }; }
+ chmod +x "$as_me.lineno" ||
+ { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; }
+ # If we had to re-execute with $CONFIG_SHELL, we're ensured to have
+ # already done that, so ensure we don't try to do so again and fall
+ # in an infinite loop. This has already happened in practice.
+ _as_can_reexec=no; export _as_can_reexec
# Don't try to exec as it changes $[0], causing all sort of problems
# (the dirname of $[0] is not the place where we might find the
- # original and so on. Autoconf is especially sensible to this).
- . ./$as_me.lineno
+ # original and so on. Autoconf is especially sensitive to this).
+ . "./$as_me.lineno"
# Exit status is that of the last command.
exit
}
-
-case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in
- *c*,-n*) ECHO_N= ECHO_C='
-' ECHO_T=' ' ;;
- *c*,* ) ECHO_N=-n ECHO_C= ECHO_T= ;;
- *) ECHO_N= ECHO_C='\c' ECHO_T= ;;
+ECHO_C= ECHO_N= ECHO_T=
+case `echo -n x` in #(((((
+-n*)
+ case `echo 'xy\c'` in
+ *c*) ECHO_T=' ';; # ECHO_T is single tab character.
+ xy) ECHO_C='\c';;
+ *) echo `echo ksh88 bug on AIX 6.1` > /dev/null
+ ECHO_T=' ';;
+ esac;;
+*)
+ ECHO_N='-n';;
esac
-if expr a : '\(a\)' >/dev/null 2>&1; then
- as_expr=expr
+rm -f conf$$ conf$$.exe conf$$.file
+if test -d conf$$.dir; then
+ rm -f conf$$.dir/conf$$.file
else
- as_expr=false
+ rm -f conf$$.dir
+ mkdir conf$$.dir 2>/dev/null
fi
-
-rm -f conf$$ conf$$.exe conf$$.file
-echo >conf$$.file
-if ln -s conf$$.file conf$$ 2>/dev/null; then
- # We could just check for DJGPP; but this test a) works b) is more generic
- # and c) will remain valid once DJGPP supports symlinks (DJGPP 2.04).
- if test -f conf$$.exe; then
- # Don't use ln at all; we don't have any links
- as_ln_s='cp -p'
- else
+if (echo >conf$$.file) 2>/dev/null; then
+ if ln -s conf$$.file conf$$ 2>/dev/null; then
as_ln_s='ln -s'
+ # ... but there are two gotchas:
+ # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
+ # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
+ # In both cases, we have to default to `cp -pR'.
+ ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
+ as_ln_s='cp -pR'
+ elif ln conf$$.file conf$$ 2>/dev/null; then
+ as_ln_s=ln
+ else
+ as_ln_s='cp -pR'
fi
-elif ln conf$$.file conf$$ 2>/dev/null; then
- as_ln_s=ln
else
- as_ln_s='cp -p'
+ as_ln_s='cp -pR'
fi
-rm -f conf$$ conf$$.exe conf$$.file
+rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
+rmdir conf$$.dir 2>/dev/null
if mkdir -p . 2>/dev/null; then
- as_mkdir_p=:
+ as_mkdir_p='mkdir -p "$as_dir"'
else
test -d ./-p && rmdir ./-p
as_mkdir_p=false
fi
-as_executable_p="test -f"
+as_test_x='test -x'
+as_executable_p=as_fn_executable_p
# Sed expression to map a string onto a valid CPP name.
as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
@@ -232,38 +555,25 @@ as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
-# IFS
-# We need space, tab and new line, in precisely that order.
-as_nl='
-'
-IFS=" $as_nl"
-
-# CDPATH.
-$as_unset CDPATH
-
+test -n "$DJDIR" || exec 7<&0 </dev/null
+exec 6>&1
# Name of the host.
-# hostname on some systems (SVR3.2, Linux) returns a bogus exit status,
+# hostname on some systems (SVR3.2, old GNU/Linux) returns a bogus exit status,
# so uname gets run too.
ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q`
-exec 6>&1
-
#
# Initializations.
#
ac_default_prefix=/usr/local
+ac_clean_files=
ac_config_libobj_dir=.
+LIBOBJS=
cross_compiling=no
subdirs=
MFLAGS=
MAKEFLAGS=
-SHELL=${CONFIG_SHELL-/bin/sh}
-
-# Maximum number of lines to put in a shell here document.
-# This variable seems obsolete. It should probably be removed, and
-# only ac_max_sed_lines should be used.
-: ${ac_max_here_lines=38}
# Identity of this package.
PACKAGE_NAME=
@@ -271,51 +581,142 @@ PACKAGE_TARNAME=
PACKAGE_VERSION=
PACKAGE_STRING=
PACKAGE_BUGREPORT=
+PACKAGE_URL=
ac_unique_file="Makefile.in"
# Factoring default headers for most tests.
ac_includes_default="\
#include <stdio.h>
-#if HAVE_SYS_TYPES_H
+#ifdef HAVE_SYS_TYPES_H
# include <sys/types.h>
#endif
-#if HAVE_SYS_STAT_H
+#ifdef HAVE_SYS_STAT_H
# include <sys/stat.h>
#endif
-#if STDC_HEADERS
+#ifdef STDC_HEADERS
# include <stdlib.h>
# include <stddef.h>
#else
-# if HAVE_STDLIB_H
+# ifdef HAVE_STDLIB_H
# include <stdlib.h>
# endif
#endif
-#if HAVE_STRING_H
-# if !STDC_HEADERS && HAVE_MEMORY_H
+#ifdef HAVE_STRING_H
+# if !defined STDC_HEADERS && defined HAVE_MEMORY_H
# include <memory.h>
# endif
# include <string.h>
#endif
-#if HAVE_STRINGS_H
+#ifdef HAVE_STRINGS_H
# include <strings.h>
#endif
-#if HAVE_INTTYPES_H
+#ifdef HAVE_INTTYPES_H
# include <inttypes.h>
-#else
-# if HAVE_STDINT_H
-# include <stdint.h>
-# endif
#endif
-#if HAVE_UNISTD_H
+#ifdef HAVE_STDINT_H
+# include <stdint.h>
+#endif
+#ifdef HAVE_UNISTD_H
# include <unistd.h>
#endif"
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS TCL_LIB TK_LIB CFITSIODIR C_LIB_OPTION UNAME BINDIR BIN_EXT EXT CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT RANLIB ac_ct_RANLIB CPP USE_X XINC [...]
+ac_subst_vars='LTLIBOBJS
+TCL_LIB
+LIBOBJS
+SHLIB_SUFFIX
+SHLIB_LD_LIBS
+SHLIB_LD
+LD_FLAGS
+ALLOCA
+EGREP
+GREP
+XLIBS
+XLIBPTH
+XINCLUDES
+USE_X
+CPP
+XMKMF
+RANLIB
+OBJEXT
+EXEEXT
+ac_ct_CC
+CPPFLAGS
+LDFLAGS
+CFLAGS
+CC
+EXT
+BIN_EXT
+BINDIR
+UNAME
+C_LIB_OPTION
+CFITSIODIR
+TCL_INC_PATH
+TCL_PATH
+target_alias
+host_alias
+build_alias
+LIBS
+ECHO_T
+ECHO_N
+ECHO_C
+DEFS
+mandir
+localedir
+libdir
+psdir
+pdfdir
+dvidir
+htmldir
+infodir
+docdir
+oldincludedir
+includedir
+localstatedir
+sharedstatedir
+sysconfdir
+datadir
+datarootdir
+libexecdir
+sbindir
+bindir
+program_transform_name
+prefix
+exec_prefix
+PACKAGE_URL
+PACKAGE_BUGREPORT
+PACKAGE_STRING
+PACKAGE_VERSION
+PACKAGE_TARNAME
+PACKAGE_NAME
+PATH_SEPARATOR
+SHELL'
ac_subst_files=''
+ac_user_opts='
+enable_option_checking
+with_tcl
+with_tcl_includes
+with_cfitsio
+enable_shared
+enable_static
+with_x
+'
+ ac_precious_vars='build_alias
+host_alias
+target_alias
+CC
+CFLAGS
+LDFLAGS
+LIBS
+CPPFLAGS
+XMKMF
+CPP'
+
# Initialize some variables set by options.
ac_init_help=
ac_init_version=false
+ac_unrecognized_opts=
+ac_unrecognized_sep=
# The variables have the same names as the options, with
# dashes changed to underlines.
cache_file=/dev/null
@@ -338,34 +739,49 @@ x_libraries=NONE
# and all the variables that are supposed to be based on exec_prefix
# by default will actually change.
# Use braces instead of parens because sh, perl, etc. also accept them.
+# (The list follows the same order as the GNU Coding Standards.)
bindir='${exec_prefix}/bin'
sbindir='${exec_prefix}/sbin'
libexecdir='${exec_prefix}/libexec'
-datadir='${prefix}/share'
+datarootdir='${prefix}/share'
+datadir='${datarootdir}'
sysconfdir='${prefix}/etc'
sharedstatedir='${prefix}/com'
localstatedir='${prefix}/var'
-libdir='${exec_prefix}/lib'
includedir='${prefix}/include'
oldincludedir='/usr/include'
-infodir='${prefix}/info'
-mandir='${prefix}/man'
+docdir='${datarootdir}/doc/${PACKAGE}'
+infodir='${datarootdir}/info'
+htmldir='${docdir}'
+dvidir='${docdir}'
+pdfdir='${docdir}'
+psdir='${docdir}'
+libdir='${exec_prefix}/lib'
+localedir='${datarootdir}/locale'
+mandir='${datarootdir}/man'
ac_prev=
+ac_dashdash=
for ac_option
do
# If the previous option needs an argument, assign it.
if test -n "$ac_prev"; then
- eval "$ac_prev=\$ac_option"
+ eval $ac_prev=\$ac_option
ac_prev=
continue
fi
- ac_optarg=`expr "x$ac_option" : 'x[^=]*=\(.*\)'`
+ case $ac_option in
+ *=?*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;;
+ *=) ac_optarg= ;;
+ *) ac_optarg=yes ;;
+ esac
# Accept the important Cygnus configure options, so we can diagnose typos.
- case $ac_option in
+ case $ac_dashdash$ac_option in
+ --)
+ ac_dashdash=yes ;;
-bindir | --bindir | --bindi | --bind | --bin | --bi)
ac_prev=bindir ;;
@@ -387,33 +803,59 @@ do
--config-cache | -C)
cache_file=config.cache ;;
- -datadir | --datadir | --datadi | --datad | --data | --dat | --da)
+ -datadir | --datadir | --datadi | --datad)
ac_prev=datadir ;;
- -datadir=* | --datadir=* | --datadi=* | --datad=* | --data=* | --dat=* \
- | --da=*)
+ -datadir=* | --datadir=* | --datadi=* | --datad=*)
datadir=$ac_optarg ;;
+ -datarootdir | --datarootdir | --datarootdi | --datarootd | --dataroot \
+ | --dataroo | --dataro | --datar)
+ ac_prev=datarootdir ;;
+ -datarootdir=* | --datarootdir=* | --datarootdi=* | --datarootd=* \
+ | --dataroot=* | --dataroo=* | --dataro=* | --datar=*)
+ datarootdir=$ac_optarg ;;
+
-disable-* | --disable-*)
- ac_feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
+ ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
# Reject names that are not valid shell variable names.
- expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null &&
- { echo "$as_me: error: invalid feature name: $ac_feature" >&2
- { (exit 1); exit 1; }; }
- ac_feature=`echo $ac_feature | sed 's/-/_/g'`
- eval "enable_$ac_feature=no" ;;
+ expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
+ as_fn_error $? "invalid feature name: $ac_useropt"
+ ac_useropt_orig=$ac_useropt
+ ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
+ case $ac_user_opts in
+ *"
+"enable_$ac_useropt"
+"*) ;;
+ *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--disable-$ac_useropt_orig"
+ ac_unrecognized_sep=', ';;
+ esac
+ eval enable_$ac_useropt=no ;;
+
+ -docdir | --docdir | --docdi | --doc | --do)
+ ac_prev=docdir ;;
+ -docdir=* | --docdir=* | --docdi=* | --doc=* | --do=*)
+ docdir=$ac_optarg ;;
+
+ -dvidir | --dvidir | --dvidi | --dvid | --dvi | --dv)
+ ac_prev=dvidir ;;
+ -dvidir=* | --dvidir=* | --dvidi=* | --dvid=* | --dvi=* | --dv=*)
+ dvidir=$ac_optarg ;;
-enable-* | --enable-*)
- ac_feature=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
+ ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
# Reject names that are not valid shell variable names.
- expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null &&
- { echo "$as_me: error: invalid feature name: $ac_feature" >&2
- { (exit 1); exit 1; }; }
- ac_feature=`echo $ac_feature | sed 's/-/_/g'`
- case $ac_option in
- *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;;
- *) ac_optarg=yes ;;
+ expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
+ as_fn_error $? "invalid feature name: $ac_useropt"
+ ac_useropt_orig=$ac_useropt
+ ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
+ case $ac_user_opts in
+ *"
+"enable_$ac_useropt"
+"*) ;;
+ *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--enable-$ac_useropt_orig"
+ ac_unrecognized_sep=', ';;
esac
- eval "enable_$ac_feature='$ac_optarg'" ;;
+ eval enable_$ac_useropt=\$ac_optarg ;;
-exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \
| --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \
@@ -440,6 +882,12 @@ do
-host=* | --host=* | --hos=* | --ho=*)
host_alias=$ac_optarg ;;
+ -htmldir | --htmldir | --htmldi | --htmld | --html | --htm | --ht)
+ ac_prev=htmldir ;;
+ -htmldir=* | --htmldir=* | --htmldi=* | --htmld=* | --html=* | --htm=* \
+ | --ht=*)
+ htmldir=$ac_optarg ;;
+
-includedir | --includedir | --includedi | --included | --include \
| --includ | --inclu | --incl | --inc)
ac_prev=includedir ;;
@@ -464,13 +912,16 @@ do
| --libexe=* | --libex=* | --libe=*)
libexecdir=$ac_optarg ;;
+ -localedir | --localedir | --localedi | --localed | --locale)
+ ac_prev=localedir ;;
+ -localedir=* | --localedir=* | --localedi=* | --localed=* | --locale=*)
+ localedir=$ac_optarg ;;
+
-localstatedir | --localstatedir | --localstatedi | --localstated \
- | --localstate | --localstat | --localsta | --localst \
- | --locals | --local | --loca | --loc | --lo)
+ | --localstate | --localstat | --localsta | --localst | --locals)
ac_prev=localstatedir ;;
-localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \
- | --localstate=* | --localstat=* | --localsta=* | --localst=* \
- | --locals=* | --local=* | --loca=* | --loc=* | --lo=*)
+ | --localstate=* | --localstat=* | --localsta=* | --localst=* | --locals=*)
localstatedir=$ac_optarg ;;
-mandir | --mandir | --mandi | --mand | --man | --ma | --m)
@@ -535,6 +986,16 @@ do
| --progr-tra=* | --program-tr=* | --program-t=*)
program_transform_name=$ac_optarg ;;
+ -pdfdir | --pdfdir | --pdfdi | --pdfd | --pdf | --pd)
+ ac_prev=pdfdir ;;
+ -pdfdir=* | --pdfdir=* | --pdfdi=* | --pdfd=* | --pdf=* | --pd=*)
+ pdfdir=$ac_optarg ;;
+
+ -psdir | --psdir | --psdi | --psd | --ps)
+ ac_prev=psdir ;;
+ -psdir=* | --psdir=* | --psdi=* | --psd=* | --ps=*)
+ psdir=$ac_optarg ;;
+
-q | -quiet | --quiet | --quie | --qui | --qu | --q \
| -silent | --silent | --silen | --sile | --sil)
silent=yes ;;
@@ -585,26 +1046,36 @@ do
ac_init_version=: ;;
-with-* | --with-*)
- ac_package=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
+ ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
# Reject names that are not valid shell variable names.
- expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null &&
- { echo "$as_me: error: invalid package name: $ac_package" >&2
- { (exit 1); exit 1; }; }
- ac_package=`echo $ac_package| sed 's/-/_/g'`
- case $ac_option in
- *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;;
- *) ac_optarg=yes ;;
+ expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
+ as_fn_error $? "invalid package name: $ac_useropt"
+ ac_useropt_orig=$ac_useropt
+ ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
+ case $ac_user_opts in
+ *"
+"with_$ac_useropt"
+"*) ;;
+ *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--with-$ac_useropt_orig"
+ ac_unrecognized_sep=', ';;
esac
- eval "with_$ac_package='$ac_optarg'" ;;
+ eval with_$ac_useropt=\$ac_optarg ;;
-without-* | --without-*)
- ac_package=`expr "x$ac_option" : 'x-*without-\(.*\)'`
+ ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'`
# Reject names that are not valid shell variable names.
- expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null &&
- { echo "$as_me: error: invalid package name: $ac_package" >&2
- { (exit 1); exit 1; }; }
- ac_package=`echo $ac_package | sed 's/-/_/g'`
- eval "with_$ac_package=no" ;;
+ expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
+ as_fn_error $? "invalid package name: $ac_useropt"
+ ac_useropt_orig=$ac_useropt
+ ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
+ case $ac_user_opts in
+ *"
+"with_$ac_useropt"
+"*) ;;
+ *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--without-$ac_useropt_orig"
+ ac_unrecognized_sep=', ';;
+ esac
+ eval with_$ac_useropt=no ;;
--x)
# Obsolete; use --with-x.
@@ -624,27 +1095,26 @@ do
| --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
x_libraries=$ac_optarg ;;
- -*) { echo "$as_me: error: unrecognized option: $ac_option
-Try \`$0 --help' for more information." >&2
- { (exit 1); exit 1; }; }
+ -*) as_fn_error $? "unrecognized option: \`$ac_option'
+Try \`$0 --help' for more information"
;;
*=*)
ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='`
# Reject names that are not valid shell variable names.
- expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null &&
- { echo "$as_me: error: invalid variable name: $ac_envvar" >&2
- { (exit 1); exit 1; }; }
- ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`
- eval "$ac_envvar='$ac_optarg'"
+ case $ac_envvar in #(
+ '' | [0-9]* | *[!_$as_cr_alnum]* )
+ as_fn_error $? "invalid variable name: \`$ac_envvar'" ;;
+ esac
+ eval $ac_envvar=\$ac_optarg
export $ac_envvar ;;
*)
# FIXME: should be removed in autoconf 3.0.
- echo "$as_me: WARNING: you should use --build, --host, --target" >&2
+ $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2
expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null &&
- echo "$as_me: WARNING: invalid host type: $ac_option" >&2
- : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}
+ $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2
+ : "${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}"
;;
esac
@@ -652,31 +1122,36 @@ done
if test -n "$ac_prev"; then
ac_option=--`echo $ac_prev | sed 's/_/-/g'`
- { echo "$as_me: error: missing argument to $ac_option" >&2
- { (exit 1); exit 1; }; }
+ as_fn_error $? "missing argument to $ac_option"
fi
-# Be sure to have absolute paths.
-for ac_var in exec_prefix prefix
-do
- eval ac_val=$`echo $ac_var`
- case $ac_val in
- [\\/$]* | ?:[\\/]* | NONE | '' ) ;;
- *) { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
- { (exit 1); exit 1; }; };;
+if test -n "$ac_unrecognized_opts"; then
+ case $enable_option_checking in
+ no) ;;
+ fatal) as_fn_error $? "unrecognized options: $ac_unrecognized_opts" ;;
+ *) $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;;
esac
-done
+fi
-# Be sure to have absolute paths.
-for ac_var in bindir sbindir libexecdir datadir sysconfdir sharedstatedir \
- localstatedir libdir includedir oldincludedir infodir mandir
+# Check all directory arguments for consistency.
+for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \
+ datadir sysconfdir sharedstatedir localstatedir includedir \
+ oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
+ libdir localedir mandir
do
- eval ac_val=$`echo $ac_var`
+ eval ac_val=\$$ac_var
+ # Remove trailing slashes.
+ case $ac_val in
+ */ )
+ ac_val=`expr "X$ac_val" : 'X\(.*[^/]\)' \| "X$ac_val" : 'X\(.*\)'`
+ eval $ac_var=\$ac_val;;
+ esac
+ # Be sure to have absolute directory names.
case $ac_val in
- [\\/$]* | ?:[\\/]* ) ;;
- *) { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
- { (exit 1); exit 1; }; };;
+ [\\/$]* | ?:[\\/]* ) continue;;
+ NONE | '' ) case $ac_var in *prefix ) continue;; esac;;
esac
+ as_fn_error $? "expected an absolute directory name for --$ac_var: $ac_val"
done
# There might be people who depend on the old broken behavior: `$host'
@@ -690,8 +1165,6 @@ target=$target_alias
if test "x$host_alias" != x; then
if test "x$build_alias" = x; then
cross_compiling=maybe
- echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host.
- If a cross compiler is detected then cross compile mode will be used." >&2
elif test "x$build_alias" != "x$host_alias"; then
cross_compiling=yes
fi
@@ -703,74 +1176,72 @@ test -n "$host_alias" && ac_tool_prefix=$host_alias-
test "$silent" = yes && exec 6>/dev/null
+ac_pwd=`pwd` && test -n "$ac_pwd" &&
+ac_ls_di=`ls -di .` &&
+ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` ||
+ as_fn_error $? "working directory cannot be determined"
+test "X$ac_ls_di" = "X$ac_pwd_ls_di" ||
+ as_fn_error $? "pwd does not report name of working directory"
+
+
# Find the source files, if location was not specified.
if test -z "$srcdir"; then
ac_srcdir_defaulted=yes
- # Try the directory containing this script, then its parent.
- ac_confdir=`(dirname "$0") 2>/dev/null ||
-$as_expr X"$0" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
- X"$0" : 'X\(//\)[^/]' \| \
- X"$0" : 'X\(//\)$' \| \
- X"$0" : 'X\(/\)' \| \
- . : '\(.\)' 2>/dev/null ||
-echo X"$0" |
- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
- /^X\(\/\/\)[^/].*/{ s//\1/; q; }
- /^X\(\/\/\)$/{ s//\1/; q; }
- /^X\(\/\).*/{ s//\1/; q; }
- s/.*/./; q'`
+ # Try the directory containing this script, then the parent directory.
+ ac_confdir=`$as_dirname -- "$as_myself" ||
+$as_expr X"$as_myself" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+ X"$as_myself" : 'X\(//\)[^/]' \| \
+ X"$as_myself" : 'X\(//\)$' \| \
+ X"$as_myself" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X"$as_myself" |
+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+ s//\1/
+ q
+ }
+ /^X\(\/\/\)[^/].*/{
+ s//\1/
+ q
+ }
+ /^X\(\/\/\)$/{
+ s//\1/
+ q
+ }
+ /^X\(\/\).*/{
+ s//\1/
+ q
+ }
+ s/.*/./; q'`
srcdir=$ac_confdir
- if test ! -r $srcdir/$ac_unique_file; then
+ if test ! -r "$srcdir/$ac_unique_file"; then
srcdir=..
fi
else
ac_srcdir_defaulted=no
fi
-if test ! -r $srcdir/$ac_unique_file; then
- if test "$ac_srcdir_defaulted" = yes; then
- { echo "$as_me: error: cannot find sources ($ac_unique_file) in $ac_confdir or .." >&2
- { (exit 1); exit 1; }; }
- else
- { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2
- { (exit 1); exit 1; }; }
- fi
-fi
-(cd $srcdir && test -r ./$ac_unique_file) 2>/dev/null ||
- { echo "$as_me: error: sources are in $srcdir, but \`cd $srcdir' does not work" >&2
- { (exit 1); exit 1; }; }
-srcdir=`echo "$srcdir" | sed 's%\([^\\/]\)[\\/]*$%\1%'`
-ac_env_build_alias_set=${build_alias+set}
-ac_env_build_alias_value=$build_alias
-ac_cv_env_build_alias_set=${build_alias+set}
-ac_cv_env_build_alias_value=$build_alias
-ac_env_host_alias_set=${host_alias+set}
-ac_env_host_alias_value=$host_alias
-ac_cv_env_host_alias_set=${host_alias+set}
-ac_cv_env_host_alias_value=$host_alias
-ac_env_target_alias_set=${target_alias+set}
-ac_env_target_alias_value=$target_alias
-ac_cv_env_target_alias_set=${target_alias+set}
-ac_cv_env_target_alias_value=$target_alias
-ac_env_CC_set=${CC+set}
-ac_env_CC_value=$CC
-ac_cv_env_CC_set=${CC+set}
-ac_cv_env_CC_value=$CC
-ac_env_CFLAGS_set=${CFLAGS+set}
-ac_env_CFLAGS_value=$CFLAGS
-ac_cv_env_CFLAGS_set=${CFLAGS+set}
-ac_cv_env_CFLAGS_value=$CFLAGS
-ac_env_LDFLAGS_set=${LDFLAGS+set}
-ac_env_LDFLAGS_value=$LDFLAGS
-ac_cv_env_LDFLAGS_set=${LDFLAGS+set}
-ac_cv_env_LDFLAGS_value=$LDFLAGS
-ac_env_CPPFLAGS_set=${CPPFLAGS+set}
-ac_env_CPPFLAGS_value=$CPPFLAGS
-ac_cv_env_CPPFLAGS_set=${CPPFLAGS+set}
-ac_cv_env_CPPFLAGS_value=$CPPFLAGS
-ac_env_CPP_set=${CPP+set}
-ac_env_CPP_value=$CPP
-ac_cv_env_CPP_set=${CPP+set}
-ac_cv_env_CPP_value=$CPP
+if test ! -r "$srcdir/$ac_unique_file"; then
+ test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
+ as_fn_error $? "cannot find sources ($ac_unique_file) in $srcdir"
+fi
+ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work"
+ac_abs_confdir=`(
+ cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error $? "$ac_msg"
+ pwd)`
+# When building in place, set srcdir=.
+if test "$ac_abs_confdir" = "$ac_pwd"; then
+ srcdir=.
+fi
+# Remove unnecessary trailing slashes from srcdir.
+# Double slashes in file names in object file debugging info
+# mess up M-x gdb in Emacs.
+case $srcdir in
+*/) srcdir=`expr "X$srcdir" : 'X\(.*[^/]\)' \| "X$srcdir" : 'X\(.*\)'`;;
+esac
+for ac_var in $ac_precious_vars; do
+ eval ac_env_${ac_var}_set=\${${ac_var}+set}
+ eval ac_env_${ac_var}_value=\$${ac_var}
+ eval ac_cv_env_${ac_var}_set=\${${ac_var}+set}
+ eval ac_cv_env_${ac_var}_value=\$${ac_var}
+done
#
# Report the --help message.
@@ -793,20 +1264,17 @@ Configuration:
--help=short display options specific to this package
--help=recursive display the short help of all the included packages
-V, --version display version information and exit
- -q, --quiet, --silent do not print \`checking...' messages
+ -q, --quiet, --silent do not print \`checking ...' messages
--cache-file=FILE cache test results in FILE [disabled]
-C, --config-cache alias for \`--cache-file=config.cache'
-n, --no-create do not create output files
--srcdir=DIR find the sources in DIR [configure dir or \`..']
-_ACEOF
-
- cat <<_ACEOF
Installation directories:
--prefix=PREFIX install architecture-independent files in PREFIX
- [$ac_default_prefix]
+ [$ac_default_prefix]
--exec-prefix=EPREFIX install architecture-dependent files in EPREFIX
- [PREFIX]
+ [PREFIX]
By default, \`make install' will install all the files in
\`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc. You can specify
@@ -816,18 +1284,25 @@ for instance \`--prefix=\$HOME'.
For better control, use the options below.
Fine tuning of the installation directories:
- --bindir=DIR user executables [EPREFIX/bin]
- --sbindir=DIR system admin executables [EPREFIX/sbin]
- --libexecdir=DIR program executables [EPREFIX/libexec]
- --datadir=DIR read-only architecture-independent data [PREFIX/share]
- --sysconfdir=DIR read-only single-machine data [PREFIX/etc]
- --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com]
- --localstatedir=DIR modifiable single-machine data [PREFIX/var]
- --libdir=DIR object code libraries [EPREFIX/lib]
- --includedir=DIR C header files [PREFIX/include]
- --oldincludedir=DIR C header files for non-gcc [/usr/include]
- --infodir=DIR info documentation [PREFIX/info]
- --mandir=DIR man documentation [PREFIX/man]
+ --bindir=DIR user executables [EPREFIX/bin]
+ --sbindir=DIR system admin executables [EPREFIX/sbin]
+ --libexecdir=DIR program executables [EPREFIX/libexec]
+ --sysconfdir=DIR read-only single-machine data [PREFIX/etc]
+ --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com]
+ --localstatedir=DIR modifiable single-machine data [PREFIX/var]
+ --libdir=DIR object code libraries [EPREFIX/lib]
+ --includedir=DIR C header files [PREFIX/include]
+ --oldincludedir=DIR C header files for non-gcc [/usr/include]
+ --datarootdir=DIR read-only arch.-independent data root [PREFIX/share]
+ --datadir=DIR read-only architecture-independent data [DATAROOTDIR]
+ --infodir=DIR info documentation [DATAROOTDIR/info]
+ --localedir=DIR locale-dependent data [DATAROOTDIR/locale]
+ --mandir=DIR man documentation [DATAROOTDIR/man]
+ --docdir=DIR documentation root [DATAROOTDIR/doc/PACKAGE]
+ --htmldir=DIR html documentation [DOCDIR]
+ --dvidir=DIR dvi documentation [DOCDIR]
+ --pdfdir=DIR pdf documentation [DOCDIR]
+ --psdir=DIR ps documentation [DOCDIR]
_ACEOF
cat <<\_ACEOF
@@ -843,6 +1318,7 @@ if test -n "$ac_init_help"; then
cat <<\_ACEOF
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]
--disable-shared Produce static binaries
@@ -853,9 +1329,6 @@ Optional Packages:
--without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no)
--with-tcl Path to tcl library
--with-tcl-includes Path to tcl include files
- --with-tk Path to tk library
- --with-tk-includes Path to tk include files
- --with-itcl Path to itcl source
--with-cfitsio Path to cfitsio source
--with-x use the X Window System
@@ -864,162 +1337,541 @@ Some influential environment variables:
CFLAGS C compiler flags
LDFLAGS linker flags, e.g. -L<lib dir> if you have libraries in a
nonstandard directory <lib dir>
- CPPFLAGS C/C++ preprocessor flags, e.g. -I<include dir> if you have
- headers in a nonstandard directory <include dir>
+ LIBS libraries to pass to the linker, e.g. -l<library>
+ CPPFLAGS (Objective) C/C++ preprocessor flags, e.g. -I<include dir> if
+ you have headers in a nonstandard directory <include dir>
+ XMKMF Path to xmkmf, Makefile generator for X Window System
CPP C preprocessor
Use these variables to override the choices made by `configure' or to help
it to find libraries and programs with nonstandard names/locations.
+Report bugs to the package provider.
_ACEOF
+ac_status=$?
fi
if test "$ac_init_help" = "recursive"; then
# If there are subdirs, report their specific --help.
- ac_popdir=`pwd`
for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue
- test -d $ac_dir || continue
+ test -d "$ac_dir" ||
+ { cd "$srcdir" && ac_pwd=`pwd` && srcdir=. && test -d "$ac_dir"; } ||
+ continue
ac_builddir=.
-if test "$ac_dir" != .; then
- ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
- # A "../" for each directory in $ac_dir_suffix.
- ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'`
-else
- ac_dir_suffix= ac_top_builddir=
-fi
+case "$ac_dir" in
+.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
+*)
+ ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'`
+ # A ".." for each directory in $ac_dir_suffix.
+ ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
+ case $ac_top_builddir_sub in
+ "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
+ *) ac_top_build_prefix=$ac_top_builddir_sub/ ;;
+ esac ;;
+esac
+ac_abs_top_builddir=$ac_pwd
+ac_abs_builddir=$ac_pwd$ac_dir_suffix
+# for backward compatibility:
+ac_top_builddir=$ac_top_build_prefix
case $srcdir in
- .) # No --srcdir option. We are building in place.
+ .) # We are building in place.
ac_srcdir=.
- if test -z "$ac_top_builddir"; then
- ac_top_srcdir=.
- else
- ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'`
- fi ;;
- [\\/]* | ?:[\\/]* ) # Absolute path.
+ ac_top_srcdir=$ac_top_builddir_sub
+ ac_abs_top_srcdir=$ac_pwd ;;
+ [\\/]* | ?:[\\/]* ) # Absolute name.
ac_srcdir=$srcdir$ac_dir_suffix;
- ac_top_srcdir=$srcdir ;;
- *) # Relative path.
- ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix
- ac_top_srcdir=$ac_top_builddir$srcdir ;;
-esac
-
-# Do not use `cd foo && pwd` to compute absolute paths, because
-# the directories may not exist.
-case `pwd` in
-.) ac_abs_builddir="$ac_dir";;
-*)
- case "$ac_dir" in
- .) ac_abs_builddir=`pwd`;;
- [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";;
- *) ac_abs_builddir=`pwd`/"$ac_dir";;
- esac;;
-esac
-case $ac_abs_builddir in
-.) ac_abs_top_builddir=${ac_top_builddir}.;;
-*)
- case ${ac_top_builddir}. in
- .) ac_abs_top_builddir=$ac_abs_builddir;;
- [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;;
- *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;;
- esac;;
-esac
-case $ac_abs_builddir in
-.) ac_abs_srcdir=$ac_srcdir;;
-*)
- case $ac_srcdir in
- .) ac_abs_srcdir=$ac_abs_builddir;;
- [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;;
- *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;;
- esac;;
+ ac_top_srcdir=$srcdir
+ ac_abs_top_srcdir=$srcdir ;;
+ *) # Relative name.
+ ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix
+ ac_top_srcdir=$ac_top_build_prefix$srcdir
+ ac_abs_top_srcdir=$ac_pwd/$srcdir ;;
esac
-case $ac_abs_builddir in
-.) ac_abs_top_srcdir=$ac_top_srcdir;;
-*)
- case $ac_top_srcdir in
- .) ac_abs_top_srcdir=$ac_abs_builddir;;
- [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;;
- *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;;
- esac;;
-esac
-
- cd $ac_dir
- # Check for guested configure; otherwise get Cygnus style configure.
- if test -f $ac_srcdir/configure.gnu; then
- echo
- $SHELL $ac_srcdir/configure.gnu --help=recursive
- elif test -f $ac_srcdir/configure; then
- echo
- $SHELL $ac_srcdir/configure --help=recursive
- elif test -f $ac_srcdir/configure.ac ||
- test -f $ac_srcdir/configure.in; then
- echo
- $ac_configure --help
+ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
+
+ cd "$ac_dir" || { ac_status=$?; continue; }
+ # Check for guested configure.
+ if test -f "$ac_srcdir/configure.gnu"; then
+ echo &&
+ $SHELL "$ac_srcdir/configure.gnu" --help=recursive
+ elif test -f "$ac_srcdir/configure"; then
+ echo &&
+ $SHELL "$ac_srcdir/configure" --help=recursive
else
- echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
- fi
- cd $ac_popdir
+ $as_echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
+ fi || ac_status=$?
+ cd "$ac_pwd" || { ac_status=$?; break; }
done
fi
-test -n "$ac_init_help" && exit 0
+test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
+configure
+generated by GNU Autoconf 2.69
-Copyright (C) 2003 Free Software Foundation, Inc.
+Copyright (C) 2012 Free Software Foundation, Inc.
This configure script is free software; the Free Software Foundation
gives unlimited permission to copy, distribute and modify it.
_ACEOF
- exit 0
+ exit
fi
-exec 5>config.log
-cat >&5 <<_ACEOF
-This file contains any messages produced by compilers while
-running configure, to aid debugging if configure makes a mistake.
-It was created by $as_me, which was
-generated by GNU Autoconf 2.59. Invocation command line was
-
- $ $0 $@
+## ------------------------ ##
+## Autoconf initialization. ##
+## ------------------------ ##
-_ACEOF
+# ac_fn_c_try_compile LINENO
+# --------------------------
+# Try to compile conftest.$ac_ext, and return whether this succeeded.
+ac_fn_c_try_compile ()
{
-cat <<_ASUNAME
-## --------- ##
-## Platform. ##
-## --------- ##
-
-hostname = `(hostname || uname -n) 2>/dev/null | sed 1q`
-uname -m = `(uname -m) 2>/dev/null || echo unknown`
-uname -r = `(uname -r) 2>/dev/null || echo unknown`
-uname -s = `(uname -s) 2>/dev/null || echo unknown`
-uname -v = `(uname -v) 2>/dev/null || echo unknown`
+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+ rm -f conftest.$ac_objext
+ if { { ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+ (eval "$ac_compile") 2>conftest.err
+ ac_status=$?
+ if test -s conftest.err; then
+ grep -v '^ *+' conftest.err >conftest.er1
+ cat conftest.er1 >&5
+ mv -f conftest.er1 conftest.err
+ fi
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then :
+ ac_retval=0
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
-/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null || echo unknown`
-/bin/uname -X = `(/bin/uname -X) 2>/dev/null || echo unknown`
+ ac_retval=1
+fi
+ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+ as_fn_set_status $ac_retval
-/bin/arch = `(/bin/arch) 2>/dev/null || echo unknown`
-/usr/bin/arch -k = `(/usr/bin/arch -k) 2>/dev/null || echo unknown`
-/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null || echo unknown`
-hostinfo = `(hostinfo) 2>/dev/null || echo unknown`
-/bin/machine = `(/bin/machine) 2>/dev/null || echo unknown`
-/usr/bin/oslevel = `(/usr/bin/oslevel) 2>/dev/null || echo unknown`
-/bin/universe = `(/bin/universe) 2>/dev/null || echo unknown`
+} # ac_fn_c_try_compile
-_ASUNAME
+# ac_fn_c_try_link LINENO
+# -----------------------
+# Try to link conftest.$ac_ext, and return whether this succeeded.
+ac_fn_c_try_link ()
+{
+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+ rm -f conftest.$ac_objext conftest$ac_exeext
+ if { { ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+ (eval "$ac_link") 2>conftest.err
+ ac_status=$?
+ if test -s conftest.err; then
+ grep -v '^ *+' conftest.err >conftest.er1
+ cat conftest.er1 >&5
+ mv -f conftest.er1 conftest.err
+ fi
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext && {
+ test "$cross_compiling" = yes ||
+ test -x conftest$ac_exeext
+ }; then :
+ ac_retval=0
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- echo "PATH: $as_dir"
-done
+ ac_retval=1
+fi
+ # Delete the IPA/IPO (Inter Procedural Analysis/Optimization) information
+ # created by the PGI compiler (conftest_ipa8_conftest.oo), as it would
+ # interfere with the next link command; also delete a directory that is
+ # left behind by Apple's compiler. We do this before executing the actions.
+ rm -rf conftest.dSYM conftest_ipa8_conftest.oo
+ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+ as_fn_set_status $ac_retval
-} >&5
+} # ac_fn_c_try_link
-cat >&5 <<_ACEOF
+# 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
+
+# ac_fn_c_try_cpp LINENO
+# ----------------------
+# Try to preprocess conftest.$ac_ext, and return whether this succeeded.
+ac_fn_c_try_cpp ()
+{
+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+ if { { ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.err
+ ac_status=$?
+ if test -s conftest.err; then
+ grep -v '^ *+' conftest.err >conftest.er1
+ cat conftest.er1 >&5
+ mv -f conftest.er1 conftest.err
+ fi
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; } > conftest.i && {
+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ }; then :
+ ac_retval=0
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_retval=1
+fi
+ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+ as_fn_set_status $ac_retval
+
+} # ac_fn_c_try_cpp
+
+# ac_fn_c_try_run LINENO
+# ----------------------
+# Try to link conftest.$ac_ext, and return whether this succeeded. Assumes
+# that executables *can* be run.
+ac_fn_c_try_run ()
+{
+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+ if { { ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+ (eval "$ac_link") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; } && { ac_try='./conftest$ac_exeext'
+ { { case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+ (eval "$ac_try") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; }; then :
+ ac_retval=0
+else
+ $as_echo "$as_me: program exited with status $ac_status" >&5
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_retval=$ac_status
+fi
+ rm -rf conftest.dSYM conftest_ipa8_conftest.oo
+ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+ as_fn_set_status $ac_retval
+
+} # ac_fn_c_try_run
+
+# ac_fn_c_check_header_mongrel LINENO HEADER VAR INCLUDES
+# -------------------------------------------------------
+# Tests whether HEADER exists, giving a warning if it cannot be compiled using
+# the include files in INCLUDES and setting the cache variable VAR
+# accordingly.
+ac_fn_c_check_header_mongrel ()
+{
+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+ if eval \${$3+:} false; then :
+ { $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
+fi
+eval ac_res=\$$3
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+else
+ # Is the header compilable?
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 usability" >&5
+$as_echo_n "checking $2 usability... " >&6; }
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+$4
+#include <$2>
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+ ac_header_compiler=yes
+else
+ ac_header_compiler=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_compiler" >&5
+$as_echo "$ac_header_compiler" >&6; }
+
+# Is the header present?
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 presence" >&5
+$as_echo_n "checking $2 presence... " >&6; }
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+#include <$2>
+_ACEOF
+if ac_fn_c_try_cpp "$LINENO"; then :
+ ac_header_preproc=yes
+else
+ ac_header_preproc=no
+fi
+rm -f conftest.err conftest.i conftest.$ac_ext
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5
+$as_echo "$ac_header_preproc" >&6; }
+
+# So? What about this header?
+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in #((
+ yes:no: )
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&5
+$as_echo "$as_me: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&2;}
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
+ ;;
+ no:yes:* )
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: present but cannot be compiled" >&5
+$as_echo "$as_me: WARNING: $2: present but cannot be compiled" >&2;}
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: check for missing prerequisite headers?" >&5
+$as_echo "$as_me: WARNING: $2: check for missing prerequisite headers?" >&2;}
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: see the Autoconf documentation" >&5
+$as_echo "$as_me: WARNING: $2: see the Autoconf documentation" >&2;}
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&5
+$as_echo "$as_me: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&2;}
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
+ ;;
+esac
+ { $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
+ eval "$3=\$ac_header_compiler"
+fi
+eval ac_res=\$$3
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+fi
+ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+
+} # ac_fn_c_check_header_mongrel
+
+# ac_fn_c_check_header_compile LINENO HEADER VAR INCLUDES
+# -------------------------------------------------------
+# Tests whether HEADER exists and can be compiled using the include files in
+# INCLUDES, setting the cache variable VAR accordingly.
+ac_fn_c_check_header_compile ()
+{
+ 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. */
+$4
+#include <$2>
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+ eval "$3=yes"
+else
+ eval "$3=no"
+fi
+rm -f core conftest.err conftest.$ac_objext 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_header_compile
+
+# ac_fn_c_check_type LINENO TYPE VAR INCLUDES
+# -------------------------------------------
+# Tests whether TYPE exists after having included INCLUDES, setting cache
+# variable VAR accordingly.
+ac_fn_c_check_type ()
+{
+ 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
+ eval "$3=no"
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+$4
+int
+main ()
+{
+if (sizeof ($2))
+ return 0;
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+$4
+int
+main ()
+{
+if (sizeof (($2)))
+ return 0;
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+
+else
+ eval "$3=yes"
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+rm -f core conftest.err conftest.$ac_objext 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_type
+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 $as_me, which was
+generated by GNU Autoconf 2.69. Invocation command line was
+
+ $ $0 $@
+
+_ACEOF
+exec 5>>config.log
+{
+cat <<_ASUNAME
+## --------- ##
+## Platform. ##
+## --------- ##
+
+hostname = `(hostname || uname -n) 2>/dev/null | sed 1q`
+uname -m = `(uname -m) 2>/dev/null || echo unknown`
+uname -r = `(uname -r) 2>/dev/null || echo unknown`
+uname -s = `(uname -s) 2>/dev/null || echo unknown`
+uname -v = `(uname -v) 2>/dev/null || echo unknown`
+
+/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null || echo unknown`
+/bin/uname -X = `(/bin/uname -X) 2>/dev/null || echo unknown`
+
+/bin/arch = `(/bin/arch) 2>/dev/null || echo unknown`
+/usr/bin/arch -k = `(/usr/bin/arch -k) 2>/dev/null || echo unknown`
+/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null || echo unknown`
+/usr/bin/hostinfo = `(/usr/bin/hostinfo) 2>/dev/null || echo unknown`
+/bin/machine = `(/bin/machine) 2>/dev/null || echo unknown`
+/usr/bin/oslevel = `(/usr/bin/oslevel) 2>/dev/null || echo unknown`
+/bin/universe = `(/bin/universe) 2>/dev/null || echo unknown`
+
+_ASUNAME
+
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ $as_echo "PATH: $as_dir"
+ done
+IFS=$as_save_IFS
+
+} >&5
+
+cat >&5 <<_ACEOF
## ----------- ##
@@ -1037,7 +1889,6 @@ _ACEOF
ac_configure_args=
ac_configure_args0=
ac_configure_args1=
-ac_sep=
ac_must_keep_next=false
for ac_pass in 1 2
do
@@ -1048,13 +1899,13 @@ do
-q | -quiet | --quiet | --quie | --qui | --qu | --q \
| -silent | --silent | --silen | --sile | --sil)
continue ;;
- *" "*|*" "*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*)
- ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
+ *\'*)
+ ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
esac
case $ac_pass in
- 1) ac_configure_args0="$ac_configure_args0 '$ac_arg'" ;;
+ 1) as_fn_append ac_configure_args0 " '$ac_arg'" ;;
2)
- ac_configure_args1="$ac_configure_args1 '$ac_arg'"
+ as_fn_append ac_configure_args1 " '$ac_arg'"
if test $ac_must_keep_next = true; then
ac_must_keep_next=false # Got value, back to normal.
else
@@ -1070,104 +1921,115 @@ do
-* ) ac_must_keep_next=true ;;
esac
fi
- ac_configure_args="$ac_configure_args$ac_sep'$ac_arg'"
- # Get rid of the leading space.
- ac_sep=" "
+ as_fn_append ac_configure_args " '$ac_arg'"
;;
esac
done
done
-$as_unset ac_configure_args0 || test "${ac_configure_args0+set}" != set || { ac_configure_args0=; export ac_configure_args0; }
-$as_unset ac_configure_args1 || test "${ac_configure_args1+set}" != set || { ac_configure_args1=; export ac_configure_args1; }
+{ ac_configure_args0=; unset ac_configure_args0;}
+{ ac_configure_args1=; unset ac_configure_args1;}
# When interrupted or exit'd, cleanup temporary files, and complete
# config.log. We remove comments because anyway the quotes in there
# would cause problems or look ugly.
-# WARNING: Be sure not to use single quotes in there, as some shells,
-# such as our DU 5.0 friend, will then `close' the trap.
+# WARNING: Use '\'' to represent an apostrophe within the trap.
+# WARNING: Do not start the trap code with a newline, due to a FreeBSD 4.0 bug.
trap 'exit_status=$?
# Save into config.log some information that might help in debugging.
{
echo
- cat <<\_ASBOX
-## ---------------- ##
+ $as_echo "## ---------------- ##
## Cache variables. ##
-## ---------------- ##
-_ASBOX
+## ---------------- ##"
echo
# The following way of writing the cache mishandles newlines in values,
-{
+(
+ for ac_var in `(set) 2>&1 | sed -n '\''s/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'\''`; do
+ eval ac_val=\$$ac_var
+ case $ac_val in #(
+ *${as_nl}*)
+ case $ac_var in #(
+ *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5
+$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
+ esac
+ case $ac_var in #(
+ _ | IFS | as_nl) ;; #(
+ BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
+ *) { eval $ac_var=; unset $ac_var;} ;;
+ esac ;;
+ esac
+ done
(set) 2>&1 |
- case `(ac_space='"'"' '"'"'; set | grep ac_space) 2>&1` in
- *ac_space=\ *)
+ case $as_nl`(ac_space='\'' '\''; set) 2>&1` in #(
+ *${as_nl}ac_space=\ *)
sed -n \
- "s/'"'"'/'"'"'\\\\'"'"''"'"'/g;
- s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='"'"'\\2'"'"'/p"
- ;;
+ "s/'\''/'\''\\\\'\'''\''/g;
+ s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\''\\2'\''/p"
+ ;; #(
*)
- sed -n \
- "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"
+ sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p"
;;
- esac;
-}
+ esac |
+ sort
+)
echo
- cat <<\_ASBOX
-## ----------------- ##
+ $as_echo "## ----------------- ##
## Output variables. ##
-## ----------------- ##
-_ASBOX
+## ----------------- ##"
echo
for ac_var in $ac_subst_vars
do
- eval ac_val=$`echo $ac_var`
- echo "$ac_var='"'"'$ac_val'"'"'"
+ eval ac_val=\$$ac_var
+ case $ac_val in
+ *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
+ esac
+ $as_echo "$ac_var='\''$ac_val'\''"
done | sort
echo
if test -n "$ac_subst_files"; then
- cat <<\_ASBOX
-## ------------- ##
-## Output files. ##
-## ------------- ##
-_ASBOX
+ $as_echo "## ------------------- ##
+## File substitutions. ##
+## ------------------- ##"
echo
for ac_var in $ac_subst_files
do
- eval ac_val=$`echo $ac_var`
- echo "$ac_var='"'"'$ac_val'"'"'"
+ eval ac_val=\$$ac_var
+ case $ac_val in
+ *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
+ esac
+ $as_echo "$ac_var='\''$ac_val'\''"
done | sort
echo
fi
if test -s confdefs.h; then
- cat <<\_ASBOX
-## ----------- ##
+ $as_echo "## ----------- ##
## confdefs.h. ##
-## ----------- ##
-_ASBOX
+## ----------- ##"
echo
- sed "/^$/d" confdefs.h | sort
+ cat confdefs.h
echo
fi
test "$ac_signal" != 0 &&
- echo "$as_me: caught signal $ac_signal"
- echo "$as_me: exit $exit_status"
+ $as_echo "$as_me: caught signal $ac_signal"
+ $as_echo "$as_me: exit $exit_status"
} >&5
- rm -f core *.core &&
- rm -rf conftest* confdefs* conf$$* $ac_clean_files &&
+ rm -f core *.core core.conftest.* &&
+ rm -f -r conftest* confdefs* conf$$* $ac_clean_files &&
exit $exit_status
- ' 0
+' 0
for ac_signal in 1 2 13 15; do
- trap 'ac_signal='$ac_signal'; { (exit 1); exit 1; }' $ac_signal
+ trap 'ac_signal='$ac_signal'; as_fn_exit 1' $ac_signal
done
ac_signal=0
# confdefs.h avoids OS command line length limits that DEFS can exceed.
-rm -rf conftest* confdefs.h
-# AIX cpp loses on an empty file, so make sure it contains at least a newline.
-echo >confdefs.h
+rm -f -r conftest* confdefs.h
+
+$as_echo "/* confdefs.h */" > confdefs.h
# Predefined preprocessor variables.
@@ -1175,112 +2037,137 @@ cat >>confdefs.h <<_ACEOF
#define PACKAGE_NAME "$PACKAGE_NAME"
_ACEOF
-
cat >>confdefs.h <<_ACEOF
#define PACKAGE_TARNAME "$PACKAGE_TARNAME"
_ACEOF
-
cat >>confdefs.h <<_ACEOF
#define PACKAGE_VERSION "$PACKAGE_VERSION"
_ACEOF
-
cat >>confdefs.h <<_ACEOF
#define PACKAGE_STRING "$PACKAGE_STRING"
_ACEOF
-
cat >>confdefs.h <<_ACEOF
#define PACKAGE_BUGREPORT "$PACKAGE_BUGREPORT"
_ACEOF
+cat >>confdefs.h <<_ACEOF
+#define PACKAGE_URL "$PACKAGE_URL"
+_ACEOF
+
# Let the site file select an alternate cache file if it wants to.
-# Prefer explicitly selected file to automatically selected ones.
-if test -z "$CONFIG_SITE"; then
- if test "x$prefix" != xNONE; then
- CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site"
- else
- CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site"
- fi
+# Prefer an explicitly selected file to automatically selected ones.
+ac_site_file1=NONE
+ac_site_file2=NONE
+if test -n "$CONFIG_SITE"; then
+ # We do not want a PATH search for config.site.
+ case $CONFIG_SITE in #((
+ -*) ac_site_file1=./$CONFIG_SITE;;
+ */*) ac_site_file1=$CONFIG_SITE;;
+ *) ac_site_file1=./$CONFIG_SITE;;
+ esac
+elif test "x$prefix" != xNONE; then
+ ac_site_file1=$prefix/share/config.site
+ ac_site_file2=$prefix/etc/config.site
+else
+ ac_site_file1=$ac_default_prefix/share/config.site
+ ac_site_file2=$ac_default_prefix/etc/config.site
fi
-for ac_site_file in $CONFIG_SITE; do
- if test -r "$ac_site_file"; then
- { echo "$as_me:$LINENO: loading site script $ac_site_file" >&5
-echo "$as_me: loading site script $ac_site_file" >&6;}
+for ac_site_file in "$ac_site_file1" "$ac_site_file2"
+do
+ test "x$ac_site_file" = xNONE && continue
+ if test /dev/null != "$ac_site_file" && test -r "$ac_site_file"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5
+$as_echo "$as_me: loading site script $ac_site_file" >&6;}
sed 's/^/| /' "$ac_site_file" >&5
- . "$ac_site_file"
+ . "$ac_site_file" \
+ || { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "failed to load site script $ac_site_file
+See \`config.log' for more details" "$LINENO" 5; }
fi
done
if test -r "$cache_file"; then
- # Some versions of bash will fail to source /dev/null (special
- # files actually), so we avoid doing that.
- if test -f "$cache_file"; then
- { echo "$as_me:$LINENO: loading cache $cache_file" >&5
-echo "$as_me: loading cache $cache_file" >&6;}
+ # Some versions of bash will fail to source /dev/null (special files
+ # actually), so we avoid doing that. DJGPP emulates it as a regular file.
+ if test /dev/null != "$cache_file" && test -f "$cache_file"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: loading cache $cache_file" >&5
+$as_echo "$as_me: loading cache $cache_file" >&6;}
case $cache_file in
- [\\/]* | ?:[\\/]* ) . $cache_file;;
- *) . ./$cache_file;;
+ [\\/]* | ?:[\\/]* ) . "$cache_file";;
+ *) . "./$cache_file";;
esac
fi
else
- { echo "$as_me:$LINENO: creating cache $cache_file" >&5
-echo "$as_me: creating cache $cache_file" >&6;}
+ { $as_echo "$as_me:${as_lineno-$LINENO}: creating cache $cache_file" >&5
+$as_echo "$as_me: creating cache $cache_file" >&6;}
>$cache_file
fi
# Check that the precious variables saved in the cache have kept the same
# value.
ac_cache_corrupted=false
-for ac_var in `(set) 2>&1 |
- sed -n 's/^ac_env_\([a-zA-Z_0-9]*\)_set=.*/\1/p'`; do
+for ac_var in $ac_precious_vars; do
eval ac_old_set=\$ac_cv_env_${ac_var}_set
eval ac_new_set=\$ac_env_${ac_var}_set
- eval ac_old_val="\$ac_cv_env_${ac_var}_value"
- eval ac_new_val="\$ac_env_${ac_var}_value"
+ eval ac_old_val=\$ac_cv_env_${ac_var}_value
+ eval ac_new_val=\$ac_env_${ac_var}_value
case $ac_old_set,$ac_new_set in
set,)
- { echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
-echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
+ { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
+$as_echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
ac_cache_corrupted=: ;;
,set)
- { echo "$as_me:$LINENO: error: \`$ac_var' was not set in the previous run" >&5
-echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
+ { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was not set in the previous run" >&5
+$as_echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
ac_cache_corrupted=: ;;
,);;
*)
if test "x$ac_old_val" != "x$ac_new_val"; then
- { echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5
-echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
- { echo "$as_me:$LINENO: former value: $ac_old_val" >&5
-echo "$as_me: former value: $ac_old_val" >&2;}
- { echo "$as_me:$LINENO: current value: $ac_new_val" >&5
-echo "$as_me: current value: $ac_new_val" >&2;}
- ac_cache_corrupted=:
+ # differences in whitespace do not lead to failure.
+ ac_old_val_w=`echo x $ac_old_val`
+ ac_new_val_w=`echo x $ac_new_val`
+ if test "$ac_old_val_w" != "$ac_new_val_w"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' has changed since the previous run:" >&5
+$as_echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
+ ac_cache_corrupted=:
+ else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5
+$as_echo "$as_me: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&2;}
+ eval $ac_var=\$ac_old_val
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: former value: \`$ac_old_val'" >&5
+$as_echo "$as_me: former value: \`$ac_old_val'" >&2;}
+ { $as_echo "$as_me:${as_lineno-$LINENO}: current value: \`$ac_new_val'" >&5
+$as_echo "$as_me: current value: \`$ac_new_val'" >&2;}
fi;;
esac
# Pass precious variables to config.status.
if test "$ac_new_set" = set; then
case $ac_new_val in
- *" "*|*" "*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*)
- ac_arg=$ac_var=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
+ *\'*) ac_arg=$ac_var=`$as_echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
*) ac_arg=$ac_var=$ac_new_val ;;
esac
case " $ac_configure_args " in
*" '$ac_arg' "*) ;; # Avoid dups. Use of quotes ensures accuracy.
- *) ac_configure_args="$ac_configure_args '$ac_arg'" ;;
+ *) as_fn_append ac_configure_args " '$ac_arg'" ;;
esac
fi
done
if $ac_cache_corrupted; then
- { echo "$as_me:$LINENO: error: changes in the environment can compromise the build" >&5
-echo "$as_me: error: changes in the environment can compromise the build" >&2;}
- { { echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
-echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;}
- { (exit 1); exit 1; }; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+ { $as_echo "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5
+$as_echo "$as_me: error: changes in the environment can compromise the build" >&2;}
+ as_fn_error $? "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5
fi
+## -------------------- ##
+## Main body of script. ##
+## -------------------- ##
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
@@ -1293,130 +2180,89 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
+if test $cache_file = ./config.cache; then
+ cache_file=`pwd`/config.cache
+fi
+# Tcl:
+#-------------------------------------------
+# Check whether --with-tcl was given.
+if test "${with_tcl+set}" = set; then :
+ withval=$with_tcl; TCL_PATH=$withval
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-if test $cache_file = ./config.cache; then
- cache_file=`pwd`/config.cache
fi
-# Check whether --with-tcl or --without-tcl was given.
-if test "${with_tcl+set}" = set; then
- withval="$with_tcl"
- TCL_PATH=$withval
+# Check whether --with-tcl-includes was given.
+if test "${with_tcl_includes+set}" = set; then :
+ withval=$with_tcl_includes; TCL_INCLUDES=$withval
-fi;
+fi
-# Check whether --with-tcl-includes or --without-tcl-includes was given.
-if test "${with_tcl_includes+set}" = set; then
- withval="$with_tcl_includes"
- TCL_INCLUDES=$withval
-fi;
# Make sure we have tcl.h before proceeding:
#-------------------------------------------
-echo "$as_me:$LINENO: checking for tcl header file" >&5
-echo $ECHO_N "checking for tcl header file... $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for tcl header file" >&5
+$as_echo_n "checking for tcl header file... " >&6; }
TCL_INC_PATH=
for dir in $TCL_INCLUDES $prefix/include /usr/include ; do
if test -r $dir/tcl.h; then
TCL_INC_PATH=$dir
- echo "$as_me:$LINENO: result: $dir" >&5
-echo "${ECHO_T}$dir" >&6
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $dir" >&5
+$as_echo "$dir" >&6; }
break
fi
done
if test -z "$TCL_INC_PATH"; then
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
- { { echo "$as_me:$LINENO: error: Can't find Tcl header. Use --with-tcl-includes to specify the location of tcl.h on your system." >&5
-echo "$as_me: error: Can't find Tcl header. Use --with-tcl-includes to specify the location of tcl.h on your system." >&2;}
- { (exit 1); exit 1; }; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+ as_fn_error $? "Cannot find Tcl header. Use --with-tcl-includes to specify the location of tcl.h on your system." "$LINENO" 5
fi
-#-------------------------------------------
-
-# Check whether --with-tk or --without-tk was given.
-if test "${with_tk+set}" = set; then
- withval="$with_tk"
- TK_PATH=$withval
-
-fi;
-# Check whether --with-tk-includes or --without-tk-includes was given.
-if test "${with_tk_includes+set}" = set; then
- withval="$with_tk_includes"
- TK_INC_PATH=$withval
-fi;
-
-# Check whether --with-itcl or --without-itcl was given.
-if test "${with_itcl+set}" = set; then
- withval="$with_itcl"
- ITCL_PATH=$withval
+# CFITSIO:
+#-------------------------------------------
-fi;
+# Check whether --with-cfitsio was given.
+if test "${with_cfitsio+set}" = set; then :
+ withval=$with_cfitsio; CFITSIO=$withval
-# Check whether --with-cfitsio or --without-cfitsio was given.
-if test "${with_cfitsio+set}" = set; then
- withval="$with_cfitsio"
- CFITSIO=$withval
+fi
-fi;
# Make sure we have cfitsio before proceeding:
#-------------------------------------------
-echo "$as_me:$LINENO: checking for cfitsio source directory" >&5
-echo $ECHO_N "checking for cfitsio source directory... $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for cfitsio source directory" >&5
+$as_echo_n "checking for cfitsio source directory... " >&6; }
CFITSIODIR=
for dir in $CFITSIO ./cfitsio ; do
if test -r $dir/eval_defs.h; then
CFITSIODIR=$dir
- echo "$as_me:$LINENO: result: $dir" >&5
-echo "${ECHO_T}$dir" >&6
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $dir" >&5
+$as_echo "$dir" >&6; }
break
fi
done
if test -z "$CFITSIODIR"; then
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
- { { echo "$as_me:$LINENO: error: Can't find cfitsio. Use --with-cfitsio to specify the location of the cfitsio source code." >&5
-echo "$as_me: error: Can't find cfitsio. Use --with-cfitsio to specify the location of the cfitsio source code." >&2;}
- { (exit 1); exit 1; }; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+ as_fn_error $? "Cannot find cfitsio. Use --with-cfitsio to specify the location of the cfitsio source code." "$LINENO" 5
fi
+
+
#-------------------------------------------
-# Check whether --enable-shared or --disable-shared was given.
-if test "${enable_shared+set}" = set; then
- enableval="$enable_shared"
- lhea_shared=$enableval
+# Check whether --enable-shared was given.
+if test "${enable_shared+set}" = set; then :
+ enableval=$enable_shared; lhea_shared=$enableval
else
lhea_shared=yes
-fi;
-# Check whether --enable-static or --disable-static was given.
-if test "${enable_static+set}" = set; then
- enableval="$enable_static"
- if test $enableval = yes; then lhea_shared=no; fi
-
-fi;
-
-TCL_LIB=`echo $TCL_PATH | sed 's:.*tcl8:tcl8:' | sed 's:.[0-9]/unix$::'`
-TK_LIB=`echo $TK_PATH | sed 's:.*tk8:tk8:' | sed 's:.[0-9]/unix$::'`
-
+fi
+# Check whether --enable-static was given.
+if test "${enable_static+set}" = set; then :
+ enableval=$enable_static; if test $enableval = yes; then lhea_shared=no; fi
+fi
if test $lhea_shared = yes; then
@@ -1435,10 +2281,10 @@ if test "x$EXT" = x; then EXT=lnx; fi
if test "x$BINDIR" = x; then
# Extract the first word of "uname", so it can be a program name with args.
set dummy uname; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_prog_UNAME+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_UNAME+:} false; then :
+ $as_echo_n "(cached) " >&6
else
if test -n "$UNAME"; then
ac_cv_prog_UNAME="$UNAME" # Let the user override the test.
@@ -1448,31 +2294,31 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_UNAME="uname"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
-done
+ done
+IFS=$as_save_IFS
test -z "$ac_cv_prog_UNAME" && ac_cv_prog_UNAME="nouname"
fi
fi
UNAME=$ac_cv_prog_UNAME
if test -n "$UNAME"; then
- echo "$as_me:$LINENO: result: $UNAME" >&5
-echo "${ECHO_T}$UNAME" >&6
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $UNAME" >&5
+$as_echo "$UNAME" >&6; }
else
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
fi
+
if test $UNAME = nouname; then
- { { echo "$as_me:$LINENO: error: HEAsoft: Unable to guess system type. Please set it using --with-bindir option" >&5
-echo "$as_me: error: HEAsoft: Unable to guess system type. Please set it using --with-bindir option" >&2;}
- { (exit 1); exit 1; }; }
+ as_fn_error $? "HEAsoft: Unable to guess system type. Please set it using --with-bindir option" "$LINENO" 5
fi
BINDIR=`$UNAME -s 2> /dev/null`_`$UNAME -r 2> /dev/null | sed 's:[^0-9]*\([0-9][0-9]*\.[0-9]*\).*:\1:'`
@@ -1484,45 +2330,21 @@ echo "$as_me: error: HEAsoft: Unable to guess system type. Please set it using -
BINDIR=CYGWIN32_`$UNAME -a 2> /dev/null | awk '{ print $4 }'`
lhea_machine=
BIN_EXT=".exe"
- EXT=lnx
- ;;
- IRIX*)
- { echo "$as_me:$LINENO: WARNING: IRIX support is marginal" >&5
-echo "$as_me: WARNING: IRIX support is marginal" >&2;}
- EXT=sgi
- ;;
- HP-UX*)
- { echo "$as_me:$LINENO: WARNING: HP-UX support is marginal" >&5
-echo "$as_me: WARNING: HP-UX support is marginal" >&2;}
- EXT=hpu
- lhea_machine=`$UNAME -m 2> /dev/null | tr '/' ' ' | awk '{ print $2 }'`
+ EXT=win
;;
Linux*)
EXT=lnx
;;
- OSF1*)
- EXT=osf
- ;;
- SunOS_4*)
- { echo "$as_me:$LINENO: WARNING: SunOS 4.x is not supported!" >&5
-echo "$as_me: WARNING: SunOS 4.x is not supported!" >&2;}
- { echo "$as_me:$LINENO: WARNING: PROCEED AT YOUR OWN RISK!" >&5
-echo "$as_me: WARNING: PROCEED AT YOUR OWN RISK!" >&2;}
- EXT=sun
- lhea_machine=sparc
+ Darwin*)
+ EXT=darwin
+ lhea_machine=`$UNAME -p`
;;
SunOS_5*)
EXT=sol
lhea_machine=`$UNAME -p`
;;
- Darwin_*)
- EXT=darwin
- lhea_machine=`$UNAME -p`
- ;;
*)
- { { echo "$as_me:$LINENO: error: Unable to recognize your system. Please make sure this platform is supported." >&5
-echo "$as_me: error: Unable to recognize your system. Please make sure this platform is supported." >&2;}
- { (exit 1); exit 1; }; }
+ as_fn_error $? "Unable to recognize your system. Please make sure this platform is supported." "$LINENO" 5
;;
esac
if test x$lhea_machine != x; then
@@ -1542,10 +2364,10 @@ if test "x$CC" = x; then
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_prog_CC+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_CC+:} false; then :
+ $as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
ac_cv_prog_CC="$CC" # Let the user override the test.
@@ -1555,26 +2377,28 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_CC="$ac_prog"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
-done
+ done
+IFS=$as_save_IFS
fi
fi
CC=$ac_cv_prog_CC
if test -n "$CC"; then
- echo "$as_me:$LINENO: result: $CC" >&5
-echo "${ECHO_T}$CC" >&6
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+$as_echo "$CC" >&6; }
else
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
fi
+
test -n "$CC" && break
done
@@ -1589,10 +2413,10 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
set dummy ${ac_tool_prefix}gcc; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_prog_CC+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_CC+:} false; then :
+ $as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
ac_cv_prog_CC="$CC" # Let the user override the test.
@@ -1602,35 +2426,37 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_CC="${ac_tool_prefix}gcc"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
-done
+ done
+IFS=$as_save_IFS
fi
fi
CC=$ac_cv_prog_CC
if test -n "$CC"; then
- echo "$as_me:$LINENO: result: $CC" >&5
-echo "${ECHO_T}$CC" >&6
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+$as_echo "$CC" >&6; }
else
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
fi
+
fi
if test -z "$ac_cv_prog_CC"; then
ac_ct_CC=$CC
# Extract the first word of "gcc", so it can be a program name with args.
set dummy gcc; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_ac_ct_CC+:} false; then :
+ $as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_CC"; then
ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
@@ -1640,39 +2466,50 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_ac_ct_CC="gcc"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
-done
+ done
+IFS=$as_save_IFS
fi
fi
ac_ct_CC=$ac_cv_prog_ac_ct_CC
if test -n "$ac_ct_CC"; then
- echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
-echo "${ECHO_T}$ac_ct_CC" >&6
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
+$as_echo "$ac_ct_CC" >&6; }
else
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
fi
- CC=$ac_ct_CC
+ if test "x$ac_ct_CC" = x; then
+ CC=""
+ else
+ case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+ CC=$ac_ct_CC
+ fi
else
CC="$ac_cv_prog_CC"
fi
if test -z "$CC"; then
- if test -n "$ac_tool_prefix"; then
- # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
+ if test -n "$ac_tool_prefix"; then
+ # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
set dummy ${ac_tool_prefix}cc; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_prog_CC+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_CC+:} false; then :
+ $as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
ac_cv_prog_CC="$CC" # Let the user override the test.
@@ -1682,99 +2519,60 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_CC="${ac_tool_prefix}cc"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
-done
+ done
+IFS=$as_save_IFS
fi
fi
CC=$ac_cv_prog_CC
if test -n "$CC"; then
- echo "$as_me:$LINENO: result: $CC" >&5
-echo "${ECHO_T}$CC" >&6
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+$as_echo "$CC" >&6; }
else
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
fi
+
+ fi
fi
-if test -z "$ac_cv_prog_CC"; then
- ac_ct_CC=$CC
+if test -z "$CC"; then
# Extract the first word of "cc", so it can be a program name with args.
set dummy cc; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_CC+:} false; then :
+ $as_echo_n "(cached) " >&6
else
- if test -n "$ac_ct_CC"; then
- ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
+ if test -n "$CC"; then
+ ac_cv_prog_CC="$CC" # Let the user override the test.
else
+ ac_prog_rejected=no
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
- ac_cv_prog_ac_ct_CC="cc"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
-done
-
-fi
-fi
-ac_ct_CC=$ac_cv_prog_ac_ct_CC
-if test -n "$ac_ct_CC"; then
- echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
-echo "${ECHO_T}$ac_ct_CC" >&6
-else
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
-
- CC=$ac_ct_CC
-else
- CC="$ac_cv_prog_CC"
-fi
-
-fi
-if test -z "$CC"; then
- # Extract the first word of "cc", so it can be a program name with args.
-set dummy cc; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_prog_CC+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- if test -n "$CC"; then
- ac_cv_prog_CC="$CC" # Let the user override the test.
-else
- ac_prog_rejected=no
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
ac_prog_rejected=yes
continue
fi
ac_cv_prog_CC="cc"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
-done
+ done
+IFS=$as_save_IFS
if test $ac_prog_rejected = yes; then
# We found a bogon in the path, so make sure we never use it.
@@ -1792,24 +2590,25 @@ fi
fi
CC=$ac_cv_prog_CC
if test -n "$CC"; then
- echo "$as_me:$LINENO: result: $CC" >&5
-echo "${ECHO_T}$CC" >&6
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+$as_echo "$CC" >&6; }
else
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
fi
+
fi
if test -z "$CC"; then
if test -n "$ac_tool_prefix"; then
- for ac_prog in cl
+ for ac_prog in cl.exe
do
# Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_prog_CC+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_CC+:} false; then :
+ $as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
ac_cv_prog_CC="$CC" # Let the user override the test.
@@ -1819,39 +2618,41 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
-done
+ done
+IFS=$as_save_IFS
fi
fi
CC=$ac_cv_prog_CC
if test -n "$CC"; then
- echo "$as_me:$LINENO: result: $CC" >&5
-echo "${ECHO_T}$CC" >&6
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+$as_echo "$CC" >&6; }
else
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
fi
+
test -n "$CC" && break
done
fi
if test -z "$CC"; then
ac_ct_CC=$CC
- for ac_prog in cl
+ for ac_prog in cl.exe
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_ac_ct_CC+:} false; then :
+ $as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_CC"; then
ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
@@ -1861,66 +2662,78 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_ac_ct_CC="$ac_prog"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
-done
+ done
+IFS=$as_save_IFS
fi
fi
ac_ct_CC=$ac_cv_prog_ac_ct_CC
if test -n "$ac_ct_CC"; then
- echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
-echo "${ECHO_T}$ac_ct_CC" >&6
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
+$as_echo "$ac_ct_CC" >&6; }
else
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
fi
+
test -n "$ac_ct_CC" && break
done
- CC=$ac_ct_CC
+ if test "x$ac_ct_CC" = x; then
+ CC=""
+ else
+ case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+ CC=$ac_ct_CC
+ fi
fi
fi
-test -z "$CC" && { { echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH
-See \`config.log' for more details." >&5
-echo "$as_me: error: no acceptable C compiler found in \$PATH
-See \`config.log' for more details." >&2;}
- { (exit 1); exit 1; }; }
+test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "no acceptable C compiler found in \$PATH
+See \`config.log' for more details" "$LINENO" 5; }
# Provide some information about the compiler.
-echo "$as_me:$LINENO:" \
- "checking for C compiler version" >&5
-ac_compiler=`set X $ac_compile; echo $2`
-{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5
- (eval $ac_compiler --version </dev/null >&5) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }
-{ (eval echo "$as_me:$LINENO: \"$ac_compiler -v </dev/null >&5\"") >&5
- (eval $ac_compiler -v </dev/null >&5) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }
-{ (eval echo "$as_me:$LINENO: \"$ac_compiler -V </dev/null >&5\"") >&5
- (eval $ac_compiler -V </dev/null >&5) 2>&5
+$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
+set X $ac_compile
+ac_compiler=$2
+for ac_option in --version -v -V -qversion; do
+ { { ac_try="$ac_compiler $ac_option >&5"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+ (eval "$ac_compiler $ac_option >&5") 2>conftest.err
ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }
+ if test -s conftest.err; then
+ sed '10a\
+... rest of stderr output deleted ...
+ 10q' conftest.err >conftest.er1
+ cat conftest.er1 >&5
+ fi
+ rm -f conftest.er1 conftest.err
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }
+done
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
int
@@ -1932,112 +2745,108 @@ main ()
}
_ACEOF
ac_clean_files_save=$ac_clean_files
-ac_clean_files="$ac_clean_files a.out a.exe b.out"
+ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out"
# Try to create an executable without -o first, disregard a.out.
# It will help us diagnose broken compilers, and finding out an intuition
# of exeext.
-echo "$as_me:$LINENO: checking for C compiler default output file name" >&5
-echo $ECHO_N "checking for C compiler default output file name... $ECHO_C" >&6
-ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
-if { (eval echo "$as_me:$LINENO: \"$ac_link_default\"") >&5
- (eval $ac_link_default) 2>&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5
+$as_echo_n "checking whether the C compiler works... " >&6; }
+ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
+
+# The possible output files:
+ac_files="a.out conftest.exe conftest a.exe a_out.exe b.out conftest.*"
+
+ac_rmfiles=
+for ac_file in $ac_files
+do
+ case $ac_file in
+ *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;;
+ * ) ac_rmfiles="$ac_rmfiles $ac_file";;
+ esac
+done
+rm -f $ac_rmfiles
+
+if { { ac_try="$ac_link_default"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+ (eval "$ac_link_default") 2>&5
ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; then
- # Find the output, starting from the most likely. This scheme is
-# not robust to junk in `.', hence go to wildcards (a.*) only as a last
-# resort.
-
-# Be careful to initialize this variable, since it used to be cached.
-# Otherwise an old cache value of `no' led to `EXEEXT = no' in a Makefile.
-ac_cv_exeext=
-# b.out is created by i960 compilers.
-for ac_file in a_out.exe a.exe conftest.exe a.out conftest a.* conftest.* b.out
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then :
+ # Autoconf-2.13 could set the ac_cv_exeext variable to `no'.
+# So ignore a value of `no', otherwise this would lead to `EXEEXT = no'
+# in a Makefile. We should not override ac_cv_exeext if it was cached,
+# so that the user can short-circuit this test for compilers unknown to
+# Autoconf.
+for ac_file in $ac_files ''
do
test -f "$ac_file" || continue
case $ac_file in
- *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj )
- ;;
- conftest.$ac_ext )
- # This is the source file.
+ *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj )
;;
[ab].out )
# We found the default executable, but exeext='' is most
# certainly right.
break;;
*.* )
- ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
- # FIXME: I believe we export ac_cv_exeext for Libtool,
- # but it would be cool to find out if it's true. Does anybody
- # maintain Libtool? --akim.
- export ac_cv_exeext
+ if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no;
+ then :; else
+ ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
+ fi
+ # We set ac_cv_exeext here because the later test for it is not
+ # safe: cross compilers may not add the suffix if given an `-o'
+ # argument, so we may need to know it at that point already.
+ # Even if this section looks crufty: it has the advantage of
+ # actually working.
break;;
* )
break;;
esac
done
+test "$ac_cv_exeext" = no && ac_cv_exeext=
+
else
- echo "$as_me: failed program was:" >&5
+ ac_file=''
+fi
+if test -z "$ac_file"; then :
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+$as_echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-{ { echo "$as_me:$LINENO: error: C compiler cannot create executables
-See \`config.log' for more details." >&5
-echo "$as_me: error: C compiler cannot create executables
-See \`config.log' for more details." >&2;}
- { (exit 77); exit 77; }; }
+{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error 77 "C compiler cannot create executables
+See \`config.log' for more details" "$LINENO" 5; }
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
fi
-
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5
+$as_echo_n "checking for C compiler default output file name... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5
+$as_echo "$ac_file" >&6; }
ac_exeext=$ac_cv_exeext
-echo "$as_me:$LINENO: result: $ac_file" >&5
-echo "${ECHO_T}$ac_file" >&6
-
-# Check the compiler produces executables we can run. If not, either
-# the compiler is broken, or we cross compile.
-echo "$as_me:$LINENO: checking whether the C compiler works" >&5
-echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6
-# FIXME: These cross compiler hacks should be removed for Autoconf 3.0
-# If not cross compiling, check that we can run a simple program.
-if test "$cross_compiling" != yes; then
- if { ac_try='./$ac_file'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- cross_compiling=no
- else
- if test "$cross_compiling" = maybe; then
- cross_compiling=yes
- else
- { { echo "$as_me:$LINENO: error: cannot run C compiled programs.
-If you meant to cross compile, use \`--host'.
-See \`config.log' for more details." >&5
-echo "$as_me: error: cannot run C compiled programs.
-If you meant to cross compile, use \`--host'.
-See \`config.log' for more details." >&2;}
- { (exit 1); exit 1; }; }
- fi
- fi
-fi
-echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
-rm -f a.out a.exe conftest$ac_cv_exeext b.out
+rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out
ac_clean_files=$ac_clean_files_save
-# Check the compiler produces executables we can run. If not, either
-# the compiler is broken, or we cross compile.
-echo "$as_me:$LINENO: checking whether we are cross compiling" >&5
-echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6
-echo "$as_me:$LINENO: result: $cross_compiling" >&5
-echo "${ECHO_T}$cross_compiling" >&6
-
-echo "$as_me:$LINENO: checking for suffix of executables" >&5
-echo $ECHO_N "checking for suffix of executables... $ECHO_C" >&6
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of executables" >&5
+$as_echo_n "checking for suffix of executables... " >&6; }
+if { { ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+ (eval "$ac_link") 2>&5
ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; then
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then :
# If both `conftest.exe' and `conftest' are `present' (well, observable)
# catch `conftest.exe'. For instance with Cygwin, `ls conftest' will
# work properly (i.e., refer to `conftest.exe'), while it won't with
@@ -2045,38 +2854,90 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
for ac_file in conftest.exe conftest conftest.*; do
test -f "$ac_file" || continue
case $ac_file in
- *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj ) ;;
+ *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;;
*.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
- export ac_cv_exeext
break;;
* ) break;;
esac
done
else
- { { echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link
-See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute suffix of executables: cannot compile and link
-See \`config.log' for more details." >&2;}
- { (exit 1); exit 1; }; }
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "cannot compute suffix of executables: cannot compile and link
+See \`config.log' for more details" "$LINENO" 5; }
fi
-
-rm -f conftest$ac_cv_exeext
-echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5
-echo "${ECHO_T}$ac_cv_exeext" >&6
+rm -f conftest conftest$ac_cv_exeext
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5
+$as_echo "$ac_cv_exeext" >&6; }
rm -f conftest.$ac_ext
EXEEXT=$ac_cv_exeext
ac_exeext=$EXEEXT
-echo "$as_me:$LINENO: checking for suffix of object files" >&5
-echo $ECHO_N "checking for suffix of object files... $ECHO_C" >&6
-if test "${ac_cv_objext+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+#include <stdio.h>
+int
+main ()
+{
+FILE *f = fopen ("conftest.out", "w");
+ return ferror (f) || fclose (f) != 0;
+
+ ;
+ return 0;
+}
_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ac_clean_files="$ac_clean_files conftest.out"
+# Check that the compiler produces executables we can run. If not, either
+# the compiler is broken, or we cross compile.
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5
+$as_echo_n "checking whether we are cross compiling... " >&6; }
+if test "$cross_compiling" != yes; then
+ { { ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+ (eval "$ac_link") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }
+ if { ac_try='./conftest$ac_cv_exeext'
+ { { case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+ (eval "$ac_try") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; }; then
+ cross_compiling=no
+ else
+ if test "$cross_compiling" = maybe; then
+ cross_compiling=yes
+ else
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "cannot run C compiled programs.
+If you meant to cross compile, use \`--host'.
+See \`config.log' for more details" "$LINENO" 5; }
+ fi
+ fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5
+$as_echo "$cross_compiling" >&6; }
+
+rm -f conftest.$ac_ext conftest$ac_cv_exeext conftest.out
+ac_clean_files=$ac_clean_files_save
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5
+$as_echo_n "checking for suffix of object files... " >&6; }
+if ${ac_cv_objext+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
int
@@ -2088,45 +2949,46 @@ main ()
}
_ACEOF
rm -f conftest.o conftest.obj
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>&5
+if { { ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+ (eval "$ac_compile") 2>&5
ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; then
- for ac_file in `(ls conftest.o conftest.obj; ls conftest.*) 2>/dev/null`; do
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then :
+ for ac_file in conftest.o conftest.obj conftest.*; do
+ test -f "$ac_file" || continue;
case $ac_file in
- *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg ) ;;
+ *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM ) ;;
*) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'`
break;;
esac
done
else
- echo "$as_me: failed program was:" >&5
+ $as_echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-{ { echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile
-See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute suffix of object files: cannot compile
-See \`config.log' for more details." >&2;}
- { (exit 1); exit 1; }; }
+{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "cannot compute suffix of object files: cannot compile
+See \`config.log' for more details" "$LINENO" 5; }
fi
-
rm -f conftest.$ac_cv_objext conftest.$ac_ext
fi
-echo "$as_me:$LINENO: result: $ac_cv_objext" >&5
-echo "${ECHO_T}$ac_cv_objext" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_objext" >&5
+$as_echo "$ac_cv_objext" >&6; }
OBJEXT=$ac_cv_objext
ac_objext=$OBJEXT
-echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5
-echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6
-if test "${ac_cv_c_compiler_gnu+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5
+$as_echo_n "checking whether we are using the GNU C compiler... " >&6; }
+if ${ac_cv_c_compiler_gnu+:} false; then :
+ $as_echo_n "(cached) " >&6
else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
int
@@ -2140,55 +3002,34 @@ main ()
return 0;
}
_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
+if ac_fn_c_try_compile "$LINENO"; then :
ac_compiler_gnu=yes
else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_compiler_gnu=no
+ ac_compiler_gnu=no
fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
ac_cv_c_compiler_gnu=$ac_compiler_gnu
fi
-echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5
-echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6
-GCC=`test $ac_compiler_gnu = yes && echo yes`
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5
+$as_echo "$ac_cv_c_compiler_gnu" >&6; }
+if test $ac_compiler_gnu = yes; then
+ GCC=yes
+else
+ GCC=
+fi
ac_test_CFLAGS=${CFLAGS+set}
ac_save_CFLAGS=$CFLAGS
-CFLAGS="-g"
-echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5
-echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6
-if test "${ac_cv_prog_cc_g+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5
+$as_echo_n "checking whether $CC accepts -g... " >&6; }
+if ${ac_cv_prog_cc_g+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ ac_save_c_werror_flag=$ac_c_werror_flag
+ ac_c_werror_flag=yes
+ ac_cv_prog_cc_g=no
+ CFLAGS="-g"
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
int
@@ -2199,39 +3040,49 @@ main ()
return 0;
}
_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
+if ac_fn_c_try_compile "$LINENO"; then :
ac_cv_prog_cc_g=yes
else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+ CFLAGS=""
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+int
+main ()
+{
+
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+
+else
+ ac_c_werror_flag=$ac_save_c_werror_flag
+ CFLAGS="-g"
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+int
+main ()
+{
-ac_cv_prog_cc_g=no
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+ ac_cv_prog_cc_g=yes
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ ac_c_werror_flag=$ac_save_c_werror_flag
fi
-echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
-echo "${ECHO_T}$ac_cv_prog_cc_g" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5
+$as_echo "$ac_cv_prog_cc_g" >&6; }
if test "$ac_test_CFLAGS" = set; then
CFLAGS=$ac_save_CFLAGS
elif test $ac_cv_prog_cc_g = yes; then
@@ -2247,23 +3098,18 @@ else
CFLAGS=
fi
fi
-echo "$as_me:$LINENO: checking for $CC option to accept ANSI C" >&5
-echo $ECHO_N "checking for $CC option to accept ANSI C... $ECHO_C" >&6
-if test "${ac_cv_prog_cc_stdc+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5
+$as_echo_n "checking for $CC option to accept ISO C89... " >&6; }
+if ${ac_cv_prog_cc_c89+:} false; then :
+ $as_echo_n "(cached) " >&6
else
- ac_cv_prog_cc_stdc=no
+ ac_cv_prog_cc_c89=no
ac_save_CC=$CC
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#include <stdarg.h>
#include <stdio.h>
-#include <sys/types.h>
-#include <sys/stat.h>
+struct stat;
/* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */
struct buf { int x; };
FILE * (*rcsopen) (struct buf *, struct stat *, int);
@@ -2286,12 +3132,17 @@ static char *f (char * (*g) (char **, int), char **p, ...)
/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default. It has
function prototypes and stuff, but not '\xHH' hex character constants.
These don't provoke an error unfortunately, instead are silently treated
- as 'x'. The following induces an error, until -std1 is added to get
+ as 'x'. The following induces an error, until -std is added to get
proper ANSI mode. Curiously '\x00'!='x' always comes out true, for an
array size at least. It's necessary to write '\x00'==0 to get something
- that's true only with -std1. */
+ that's true only with -std. */
int osf4_cc_array ['\x00' == 0 ? 1 : -1];
+/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters
+ inside strings and character constants. */
+#define FOO(x) 'x'
+int xlc6_cc_array[FOO(a) == 'x' ? 1 : -1];
+
int test (int i, double x);
struct s1 {int (*f) (int a);};
struct s2 {int (*f) (double a);};
@@ -2306,205 +3157,37 @@ return f (e, argv, 0) != argv[0] || f (e, argv, 1) != argv[1];
return 0;
}
_ACEOF
-# Don't try gcc -ansi; that turns off useful extensions and
-# breaks some systems' header files.
-# AIX -qlanglvl=ansi
-# Ultrix and OSF/1 -std1
-# HP-UX 10.20 and later -Ae
-# HP-UX older versions -Aa -D_HPUX_SOURCE
-# SVR4 -Xc -D__EXTENSIONS__
-for ac_arg in "" -qlanglvl=ansi -std1 -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
+for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \
+ -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
do
CC="$ac_save_CC $ac_arg"
- rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- ac_cv_prog_cc_stdc=$ac_arg
-break
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
+ if ac_fn_c_try_compile "$LINENO"; then :
+ ac_cv_prog_cc_c89=$ac_arg
fi
-rm -f conftest.err conftest.$ac_objext
+rm -f core conftest.err conftest.$ac_objext
+ test "x$ac_cv_prog_cc_c89" != "xno" && break
done
-rm -f conftest.$ac_ext conftest.$ac_objext
+rm -f conftest.$ac_ext
CC=$ac_save_CC
fi
-
-case "x$ac_cv_prog_cc_stdc" in
- x|xno)
- echo "$as_me:$LINENO: result: none needed" >&5
-echo "${ECHO_T}none needed" >&6 ;;
+# AC_CACHE_VAL
+case "x$ac_cv_prog_cc_c89" in
+ x)
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
+$as_echo "none needed" >&6; } ;;
+ xno)
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
+$as_echo "unsupported" >&6; } ;;
*)
- echo "$as_me:$LINENO: result: $ac_cv_prog_cc_stdc" >&5
-echo "${ECHO_T}$ac_cv_prog_cc_stdc" >&6
- CC="$CC $ac_cv_prog_cc_stdc" ;;
+ CC="$CC $ac_cv_prog_cc_c89"
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5
+$as_echo "$ac_cv_prog_cc_c89" >&6; } ;;
esac
+if test "x$ac_cv_prog_cc_c89" != xno; then :
-# Some people use a C++ compiler to compile C. Since we use `exit',
-# in C++ we need to declare it. In case someone uses the same compiler
-# for both compiling C and C++ we need to have the C++ compiler decide
-# the declaration of exit, since it's the most demanding environment.
-cat >conftest.$ac_ext <<_ACEOF
-#ifndef __cplusplus
- choke me
-#endif
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- for ac_declaration in \
- '' \
- 'extern "C" void std::exit (int) throw (); using std::exit;' \
- 'extern "C" void std::exit (int); using std::exit;' \
- 'extern "C" void exit (int) throw ();' \
- 'extern "C" void exit (int);' \
- 'void exit (int);'
-do
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-$ac_declaration
-#include <stdlib.h>
-int
-main ()
-{
-exit (42);
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- :
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-continue
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-$ac_declaration
-int
-main ()
-{
-exit (42);
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- break
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-done
-rm -f conftest*
-if test -n "$ac_declaration"; then
- echo '#ifdef __cplusplus' >>confdefs.h
- echo $ac_declaration >>confdefs.h
- echo '#endif' >>confdefs.h
fi
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -2512,21 +3195,19 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $
ac_compiler_gnu=$ac_cv_c_compiler_gnu
if test "$cross_compiling" = yes; then
- { echo "$as_me:$LINENO: WARNING: Cannot run a simple C executable on your system:" >&5
-echo "$as_me: WARNING: Cannot run a simple C executable on your system:" >&2;}
- { echo "$as_me:$LINENO: WARNING: There may be something wrong with your compiler" >&5
-echo "$as_me: WARNING: There may be something wrong with your compiler" >&2;}
- { echo "$as_me:$LINENO: WARNING: or perhaps you're trying to cross-compile?" >&5
-echo "$as_me: WARNING: or perhaps you're trying to cross-compile?" >&2;}
- { echo "$as_me:$LINENO: WARNING: Cross-compiling is not supported within HEAsoft." >&5
-echo "$as_me: WARNING: Cross-compiling is not supported within HEAsoft." >&2;}
- { echo "$as_me:$LINENO: WARNING: Please make sure your compiler is working." >&5
-echo "$as_me: WARNING: Please make sure your compiler is working." >&2;}
- { echo "$as_me:$LINENO: WARNING: Contact the FTOOLS help desk for further assistance." >&5
-echo "$as_me: WARNING: Contact the FTOOLS help desk for further assistance." >&2;}
- { { echo "$as_me:$LINENO: error: Cross-compiling is not allowed." >&5
-echo "$as_me: error: Cross-compiling is not allowed." >&2;}
- { (exit 1); exit 1; }; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Cannot run a simple C executable on your system:" >&5
+$as_echo "$as_me: WARNING: Cannot run a simple C executable on your system:" >&2;}
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: There may be something wrong with your compiler" >&5
+$as_echo "$as_me: WARNING: There may be something wrong with your compiler" >&2;}
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: or perhaps you are trying to cross-compile?" >&5
+$as_echo "$as_me: WARNING: or perhaps you are trying to cross-compile?" >&2;}
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Cross-compiling is not supported within HEAsoft." >&5
+$as_echo "$as_me: WARNING: Cross-compiling is not supported within HEAsoft." >&2;}
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Please make sure your compiler is working." >&5
+$as_echo "$as_me: WARNING: Please make sure your compiler is working." >&2;}
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Contact the FTOOLS help desk for further assistance." >&5
+$as_echo "$as_me: WARNING: Contact the FTOOLS help desk for further assistance." >&2;}
+ as_fn_error $? "Cross-compiling is not allowed." "$LINENO" 5
fi
if test "x$GCC" = x; then
GCC=no
@@ -2535,10 +3216,10 @@ fi
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
set dummy ${ac_tool_prefix}ranlib; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_prog_RANLIB+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_RANLIB+:} false; then :
+ $as_echo_n "(cached) " >&6
else
if test -n "$RANLIB"; then
ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
@@ -2548,35 +3229,37 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
-done
+ done
+IFS=$as_save_IFS
fi
fi
RANLIB=$ac_cv_prog_RANLIB
if test -n "$RANLIB"; then
- echo "$as_me:$LINENO: result: $RANLIB" >&5
-echo "${ECHO_T}$RANLIB" >&6
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $RANLIB" >&5
+$as_echo "$RANLIB" >&6; }
else
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
fi
+
fi
if test -z "$ac_cv_prog_RANLIB"; then
ac_ct_RANLIB=$RANLIB
# Extract the first word of "ranlib", so it can be a program name with args.
set dummy ranlib; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_ac_ct_RANLIB+:} false; then :
+ $as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_RANLIB"; then
ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test.
@@ -2586,28 +3269,38 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_ac_ct_RANLIB="ranlib"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
-done
+ done
+IFS=$as_save_IFS
- test -z "$ac_cv_prog_ac_ct_RANLIB" && ac_cv_prog_ac_ct_RANLIB=":"
fi
fi
ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
if test -n "$ac_ct_RANLIB"; then
- echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5
-echo "${ECHO_T}$ac_ct_RANLIB" >&6
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_RANLIB" >&5
+$as_echo "$ac_ct_RANLIB" >&6; }
else
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
fi
- RANLIB=$ac_ct_RANLIB
+ if test "x$ac_ct_RANLIB" = x; then
+ RANLIB=":"
+ else
+ case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+ RANLIB=$ac_ct_RANLIB
+ fi
else
RANLIB="$ac_cv_prog_RANLIB"
fi
@@ -2615,10 +3308,6 @@ fi
if test $EXT = darwin; then
RANLIB="$RANLIB -cs"
fi
-# RANLIB on IRIX is flaky
-if test $EXT = sgi; then
- RANLIB=:
-fi
#-------------------------------------------------------------------------------
@@ -2631,166 +3320,48 @@ XLIBPTH=
XINCLUDES=
# socket and nsl libraries -- only if needed
-echo "$as_me:$LINENO: checking for gethostbyname" >&5
-echo $ECHO_N "checking for gethostbyname... $ECHO_C" >&6
-if test "${ac_cv_func_gethostbyname+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-/* Define gethostbyname to an innocuous variant, in case <limits.h> declares gethostbyname.
- For example, HP-UX 11i <limits.h> declares gettimeofday. */
-#define gethostbyname innocuous_gethostbyname
-
-/* System header to define __stub macros and hopefully few prototypes,
- which can conflict with char gethostbyname (); 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
+ac_fn_c_check_func "$LINENO" "gethostbyname" "ac_cv_func_gethostbyname"
+if test "x$ac_cv_func_gethostbyname" = xyes; then :
-#undef gethostbyname
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gethostbyname in -lnsl" >&5
+$as_echo_n "checking for gethostbyname in -lnsl... " >&6; }
+if ${ac_cv_lib_nsl_gethostbyname+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ ac_check_lib_save_LIBS=$LIBS
+LIBS="-lnsl $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
-/* Override any gcc2 internal prototype to avoid an error. */
+/* 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
-/* We use char because int might match the return type of a gcc2
- builtin and then its argument prototype would still apply. */
char gethostbyname ();
-/* 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_gethostbyname) || defined (__stub___gethostbyname)
-choke me
-#else
-char (*f) () = gethostbyname;
-#endif
-#ifdef __cplusplus
-}
-#endif
-
int
main ()
{
-return f != gethostbyname;
+return gethostbyname ();
;
return 0;
}
_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- ac_cv_func_gethostbyname=yes
+if ac_fn_c_try_link "$LINENO"; then :
+ ac_cv_lib_nsl_gethostbyname=yes
else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_func_gethostbyname=no
+ ac_cv_lib_nsl_gethostbyname=no
fi
-rm -f conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
fi
-echo "$as_me:$LINENO: result: $ac_cv_func_gethostbyname" >&5
-echo "${ECHO_T}$ac_cv_func_gethostbyname" >&6
-if test $ac_cv_func_gethostbyname = yes; then
- :
-else
-
-echo "$as_me:$LINENO: checking for gethostbyname in -lnsl" >&5
-echo $ECHO_N "checking for gethostbyname in -lnsl... $ECHO_C" >&6
-if test "${ac_cv_lib_nsl_gethostbyname+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- ac_check_lib_save_LIBS=$LIBS
-LIBS="-lnsl $LIBS"
-
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-
-/* Override any gcc2 internal prototype to avoid an error. */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
- builtin and then its argument prototype would still apply. */
-char gethostbyname ();
-int
-main ()
-{
-gethostbyname ();
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- ac_cv_lib_nsl_gethostbyname=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_nsl_gethostbyname=no
-fi
-rm -f conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_nsl_gethostbyname" >&5
-echo "${ECHO_T}$ac_cv_lib_nsl_gethostbyname" >&6
-if test $ac_cv_lib_nsl_gethostbyname = yes; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_nsl_gethostbyname" >&5
+$as_echo "$ac_cv_lib_nsl_gethostbyname" >&6; }
+if test "x$ac_cv_lib_nsl_gethostbyname" = xyes; then :
cat >>confdefs.h <<_ACEOF
#define HAVE_LIBNSL 1
_ACEOF
@@ -2801,167 +3372,47 @@ fi
fi
-
-
for ac_func in connect accept
-do
-as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:$LINENO: checking for $ac_func" >&5
-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
-if eval "test \"\${$as_ac_var+set}\" = set"; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
- For example, HP-UX 11i <limits.h> declares gettimeofday. */
-#define $ac_func innocuous_$ac_func
-
-/* System header to define __stub macros and hopefully few prototypes,
- which can conflict with char $ac_func (); 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 $ac_func
-
-/* Override any gcc2 internal prototype to avoid an error. */
-#ifdef __cplusplus
-extern "C"
-{
-#endif
-/* We use char because int might match the return type of a gcc2
- builtin and then its argument prototype would still apply. */
-char $ac_func ();
-/* 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_$ac_func) || defined (__stub___$ac_func)
-choke me
-#else
-char (*f) () = $ac_func;
-#endif
-#ifdef __cplusplus
-}
-#endif
-
-int
-main ()
-{
-return f != $ac_func;
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- eval "$as_ac_var=yes"
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-eval "$as_ac_var=no"
-fi
-rm -f conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
-if test `eval echo '${'$as_ac_var'}'` = yes; then
+do :
+ as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
+if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
_ACEOF
else
-
-echo "$as_me:$LINENO: checking for main in -lsocket" >&5
-echo $ECHO_N "checking for main in -lsocket... $ECHO_C" >&6
-if test "${ac_cv_lib_socket_main+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lsocket" >&5
+$as_echo_n "checking for main in -lsocket... " >&6; }
+if ${ac_cv_lib_socket_main+:} false; then :
+ $as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lsocket $XLIBS $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
int
main ()
{
-main ();
+return main ();
;
return 0;
}
_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
+if ac_fn_c_try_link "$LINENO"; then :
ac_cv_lib_socket_main=yes
else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_socket_main=no
+ ac_cv_lib_socket_main=no
fi
-rm -f conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_socket_main" >&5
-echo "${ECHO_T}$ac_cv_lib_socket_main" >&6
-if test $ac_cv_lib_socket_main = yes; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_socket_main" >&5
+$as_echo "$ac_cv_lib_socket_main" >&6; }
+if test "x$ac_cv_lib_socket_main" = xyes; then :
cat >>confdefs.h <<_ACEOF
#define HAVE_LIBSOCKET 1
_ACEOF
@@ -2970,25 +3421,34 @@ _ACEOF
fi
-
fi
done
+# Prepend the standard location X11 bin directory (if it exists) to PATH
+# to assist AC_PATH_X in finding headers & libraries:
+if test -d /usr/X11R6/bin; then
+ if test "x$PATH" != x; then
+ PATH=$PATH:/usr/X11R6/bin
+ else
+ PATH=/usr/X11R6/bin
+ fi
+ export PATH
+fi
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
ac_compiler_gnu=$ac_cv_c_compiler_gnu
-echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5
-echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C preprocessor" >&5
+$as_echo_n "checking how to run the C preprocessor... " >&6; }
# On Suns, sometimes $CPP names a directory.
if test -n "$CPP" && test -d "$CPP"; then
CPP=
fi
if test -z "$CPP"; then
- if test "${ac_cv_prog_CPP+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ if ${ac_cv_prog_CPP+:} false; then :
+ $as_echo_n "(cached) " >&6
else
# Double quotes because CPP needs to be expanded
for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp"
@@ -3002,11 +3462,7 @@ do
# <limits.h> exists even on freestanding compilers.
# On the NeXT, cc -E runs the code through the compiler's parser,
# not just through cpp. "Syntax error" is here to catch this case.
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#ifdef __STDC__
# include <limits.h>
@@ -3015,78 +3471,34 @@ cat >>conftest.$ac_ext <<_ACEOF
#endif
Syntax error
_ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } >/dev/null; then
- if test -s conftest.err; then
- ac_cpp_err=$ac_c_preproc_warn_flag
- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
- else
- ac_cpp_err=
- fi
-else
- ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
- :
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+if ac_fn_c_try_cpp "$LINENO"; then :
+else
# Broken: fails on valid input.
continue
fi
-rm -f conftest.err conftest.$ac_ext
+rm -f conftest.err conftest.i conftest.$ac_ext
- # OK, works on sane cases. Now check whether non-existent headers
+ # OK, works on sane cases. Now check whether nonexistent headers
# can be detected and how.
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#include <ac_nonexistent.h>
_ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } >/dev/null; then
- if test -s conftest.err; then
- ac_cpp_err=$ac_c_preproc_warn_flag
- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
- else
- ac_cpp_err=
- fi
-else
- ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
+if ac_fn_c_try_cpp "$LINENO"; then :
# Broken: success on invalid input.
continue
else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
# Passes both tests.
ac_preproc_ok=:
break
fi
-rm -f conftest.err conftest.$ac_ext
+rm -f conftest.err conftest.i conftest.$ac_ext
done
# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
-rm -f conftest.err conftest.$ac_ext
-if $ac_preproc_ok; then
+rm -f conftest.i conftest.err conftest.$ac_ext
+if $ac_preproc_ok; then :
break
fi
@@ -3098,8 +3510,8 @@ fi
else
ac_cv_prog_CPP=$CPP
fi
-echo "$as_me:$LINENO: result: $CPP" >&5
-echo "${ECHO_T}$CPP" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CPP" >&5
+$as_echo "$CPP" >&6; }
ac_preproc_ok=false
for ac_c_preproc_warn_flag in '' yes
do
@@ -3109,11 +3521,7 @@ do
# <limits.h> exists even on freestanding compilers.
# On the NeXT, cc -E runs the code through the compiler's parser,
# not just through cpp. "Syntax error" is here to catch this case.
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#ifdef __STDC__
# include <limits.h>
@@ -3122,85 +3530,40 @@ cat >>conftest.$ac_ext <<_ACEOF
#endif
Syntax error
_ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } >/dev/null; then
- if test -s conftest.err; then
- ac_cpp_err=$ac_c_preproc_warn_flag
- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
- else
- ac_cpp_err=
- fi
-else
- ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
- :
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+if ac_fn_c_try_cpp "$LINENO"; then :
+else
# Broken: fails on valid input.
continue
fi
-rm -f conftest.err conftest.$ac_ext
+rm -f conftest.err conftest.i conftest.$ac_ext
- # OK, works on sane cases. Now check whether non-existent headers
+ # OK, works on sane cases. Now check whether nonexistent headers
# can be detected and how.
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#include <ac_nonexistent.h>
_ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } >/dev/null; then
- if test -s conftest.err; then
- ac_cpp_err=$ac_c_preproc_warn_flag
- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
- else
- ac_cpp_err=
- fi
-else
- ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
+if ac_fn_c_try_cpp "$LINENO"; then :
# Broken: success on invalid input.
continue
else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
# Passes both tests.
ac_preproc_ok=:
break
fi
-rm -f conftest.err conftest.$ac_ext
+rm -f conftest.err conftest.i conftest.$ac_ext
done
# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
-rm -f conftest.err conftest.$ac_ext
-if $ac_preproc_ok; then
- :
+rm -f conftest.i conftest.err conftest.$ac_ext
+if $ac_preproc_ok; then :
+
else
- { { echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check
-See \`config.log' for more details." >&5
-echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check
-See \`config.log' for more details." >&2;}
- { (exit 1); exit 1; }; }
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "C preprocessor \"$CPP\" fails sanity check
+See \`config.log' for more details" "$LINENO" 5; }
fi
ac_ext=c
@@ -3210,44 +3573,47 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $
ac_compiler_gnu=$ac_cv_c_compiler_gnu
-echo "$as_me:$LINENO: checking for X" >&5
-echo $ECHO_N "checking for X... $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for X" >&5
+$as_echo_n "checking for X... " >&6; }
-# Check whether --with-x or --without-x was given.
-if test "${with_x+set}" = set; then
- withval="$with_x"
+# Check whether --with-x was given.
+if test "${with_x+set}" = set; then :
+ withval=$with_x;
+fi
-fi;
# $have_x is `yes', `no', `disabled', or empty when we do not yet know.
if test "x$with_x" = xno; then
# The user explicitly disabled X.
have_x=disabled
else
- if test "x$x_includes" != xNONE && test "x$x_libraries" != xNONE; then
- # Both variables are already set.
- have_x=yes
- else
- if test "${ac_cv_have_x+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ case $x_includes,$x_libraries in #(
+ *\'*) as_fn_error $? "cannot use X directory names containing '" "$LINENO" 5;; #(
+ *,NONE | NONE,*) if ${ac_cv_have_x+:} false; then :
+ $as_echo_n "(cached) " >&6
else
# One or both of the vars are not set, and there is no cached value.
ac_x_includes=no ac_x_libraries=no
-rm -fr conftest.dir
+rm -f -r conftest.dir
if mkdir conftest.dir; then
cd conftest.dir
- # Make sure to not put "make" in the Imakefile rules, since we grep it out.
cat >Imakefile <<'_ACEOF'
-acfindx:
- @echo 'ac_im_incroot="${INCROOT}"; ac_im_usrlibdir="${USRLIBDIR}"; ac_im_libdir="${LIBDIR}"'
-_ACEOF
- if (xmkmf) >/dev/null 2>/dev/null && test -f Makefile; then
- # GNU make sometimes prints "make[1]: Entering...", which would confuse us.
- eval `${MAKE-make} acfindx 2>/dev/null | grep -v make`
+incroot:
+ @echo incroot='${INCROOT}'
+usrlibdir:
+ @echo usrlibdir='${USRLIBDIR}'
+libdir:
+ @echo libdir='${LIBDIR}'
+_ACEOF
+ if (export CC; ${XMKMF-xmkmf}) >/dev/null 2>/dev/null && test -f Makefile; then
+ # GNU make sometimes prints "make[1]: Entering ...", which would confuse us.
+ for ac_var in incroot usrlibdir libdir; do
+ eval "ac_im_$ac_var=\`\${MAKE-make} $ac_var 2>/dev/null | sed -n 's/^$ac_var=//p'\`"
+ done
# Open Windows xmkmf reportedly sets LIBDIR instead of USRLIBDIR.
- for ac_extension in a so sl; do
- if test ! -f $ac_im_usrlibdir/libX11.$ac_extension &&
- test -f $ac_im_libdir/libX11.$ac_extension; then
+ for ac_extension in a so sl dylib la dll; do
+ if test ! -f "$ac_im_usrlibdir/libX11.$ac_extension" &&
+ test -f "$ac_im_libdir/libX11.$ac_extension"; then
ac_im_usrlibdir=$ac_im_libdir; break
fi
done
@@ -3255,37 +3621,41 @@ _ACEOF
# bogus both because they are the default anyway, and because
# using them would break gcc on systems where it needs fixed includes.
case $ac_im_incroot in
- /usr/include) ;;
+ /usr/include) ac_x_includes= ;;
*) test -f "$ac_im_incroot/X11/Xos.h" && ac_x_includes=$ac_im_incroot;;
esac
case $ac_im_usrlibdir in
- /usr/lib | /lib) ;;
+ /usr/lib | /usr/lib64 | /lib | /lib64) ;;
*) test -d "$ac_im_usrlibdir" && ac_x_libraries=$ac_im_usrlibdir ;;
esac
fi
cd ..
- rm -fr conftest.dir
+ rm -f -r conftest.dir
fi
# Standard set of common directories for X headers.
# Check X11 before X11Rn because it is often a symlink to the current release.
ac_x_header_dirs='
/usr/X11/include
+/usr/X11R7/include
/usr/X11R6/include
/usr/X11R5/include
/usr/X11R4/include
/usr/include/X11
+/usr/include/X11R7
/usr/include/X11R6
/usr/include/X11R5
/usr/include/X11R4
/usr/local/X11/include
+/usr/local/X11R7/include
/usr/local/X11R6/include
/usr/local/X11R5/include
/usr/local/X11R4/include
/usr/local/include/X11
+/usr/local/include/X11R7
/usr/local/include/X11R6
/usr/local/include/X11R5
/usr/local/include/X11R4
@@ -3305,48 +3675,24 @@ ac_x_header_dirs='
/usr/openwin/share/include'
if test "$ac_x_includes" = no; then
- # Guess where to find include files, by looking for Intrinsic.h.
+ # Guess where to find include files, by looking for Xlib.h.
# First, try using that file with no special directory specified.
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
-#include <X11/Intrinsic.h>
+#include <X11/Xlib.h>
_ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } >/dev/null; then
- if test -s conftest.err; then
- ac_cpp_err=$ac_c_preproc_warn_flag
- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
- else
- ac_cpp_err=
- fi
-else
- ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
+if ac_fn_c_try_cpp "$LINENO"; then :
# We can compile using X headers with no special include directory.
ac_x_includes=
else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
for ac_dir in $ac_x_header_dirs; do
- if test -r "$ac_dir/X11/Intrinsic.h"; then
+ if test -r "$ac_dir/X11/Xlib.h"; then
ac_x_includes=$ac_dir
break
fi
done
fi
-rm -f conftest.err conftest.$ac_ext
+rm -f conftest.err conftest.i conftest.$ac_ext
fi # $ac_x_includes = no
if test "$ac_x_libraries" = no; then
@@ -3354,96 +3700,73 @@ if test "$ac_x_libraries" = no; then
# See if we find them without any special options.
# Don't add to $LIBS permanently.
ac_save_LIBS=$LIBS
- LIBS="-lXt $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ LIBS="-lX11 $LIBS"
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
-#include <X11/Intrinsic.h>
+#include <X11/Xlib.h>
int
main ()
{
-XtMalloc (0)
+XrmInitialize ()
;
return 0;
}
_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
+if ac_fn_c_try_link "$LINENO"; then :
LIBS=$ac_save_LIBS
# We can link X programs with no special library path.
ac_x_libraries=
else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-LIBS=$ac_save_LIBS
-for ac_dir in `echo "$ac_x_includes $ac_x_header_dirs" | sed s/include/lib/g`
+ LIBS=$ac_save_LIBS
+for ac_dir in `$as_echo "$ac_x_includes $ac_x_header_dirs" | sed s/include/lib/g`
do
# Don't even attempt the hair of trying to link an X program!
- for ac_extension in a so sl; do
- if test -r $ac_dir/libXt.$ac_extension; then
+ for ac_extension in a so sl dylib la dll; do
+ if test -r "$ac_dir/libX11.$ac_extension"; then
ac_x_libraries=$ac_dir
break 2
fi
done
done
fi
-rm -f conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
fi # $ac_x_libraries = no
-if test "$ac_x_includes" = no || test "$ac_x_libraries" = no; then
- # Didn't find X anywhere. Cache the known absence of X.
- ac_cv_have_x="have_x=no"
-else
- # Record where we found X for the cache.
- ac_cv_have_x="have_x=yes \
- ac_x_includes=$ac_x_includes ac_x_libraries=$ac_x_libraries"
-fi
+case $ac_x_includes,$ac_x_libraries in #(
+ no,* | *,no | *\'*)
+ # Didn't find X, or a directory has "'" in its name.
+ ac_cv_have_x="have_x=no";; #(
+ *)
+ # Record where we found X for the cache.
+ ac_cv_have_x="have_x=yes\
+ ac_x_includes='$ac_x_includes'\
+ ac_x_libraries='$ac_x_libraries'"
+esac
fi
-
- fi
+;; #(
+ *) have_x=yes;;
+ esac
eval "$ac_cv_have_x"
fi # $with_x != no
if test "$have_x" != yes; then
- echo "$as_me:$LINENO: result: $have_x" >&5
-echo "${ECHO_T}$have_x" >&6
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $have_x" >&5
+$as_echo "$have_x" >&6; }
no_x=yes
else
# If each of the values was on the command line, it overrides each guess.
test "x$x_includes" = xNONE && x_includes=$ac_x_includes
test "x$x_libraries" = xNONE && x_libraries=$ac_x_libraries
# Update the cache value to reflect the command line values.
- ac_cv_have_x="have_x=yes \
- ac_x_includes=$x_includes ac_x_libraries=$x_libraries"
- echo "$as_me:$LINENO: result: libraries $x_libraries, headers $x_includes" >&5
-echo "${ECHO_T}libraries $x_libraries, headers $x_includes" >&6
+ ac_cv_have_x="have_x=yes\
+ ac_x_includes='$x_includes'\
+ ac_x_libraries='$x_libraries'"
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: libraries $x_libraries, headers $x_includes" >&5
+$as_echo "libraries $x_libraries, headers $x_includes" >&6; }
fi
+
if test "x$no_x" != xyes; then
USE_X=yes
no_x=no
@@ -3458,71 +3781,43 @@ if test "x$no_x" != xyes; then
XLIBS="$XLIBS -lXt"
fi
# dnet_stub
- echo "$as_me:$LINENO: checking for getnodebyname in -ldnet_stub" >&5
-echo $ECHO_N "checking for getnodebyname in -ldnet_stub... $ECHO_C" >&6
-if test "${ac_cv_lib_dnet_stub_getnodebyname+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for getnodebyname in -ldnet_stub" >&5
+$as_echo_n "checking for getnodebyname in -ldnet_stub... " >&6; }
+if ${ac_cv_lib_dnet_stub_getnodebyname+:} false; then :
+ $as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-ldnet_stub $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
-/* Override any gcc2 internal prototype to avoid an error. */
+/* 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
-/* We use char because int might match the return type of a gcc2
- builtin and then its argument prototype would still apply. */
char getnodebyname ();
int
main ()
{
-getnodebyname ();
+return getnodebyname ();
;
return 0;
}
_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
+if ac_fn_c_try_link "$LINENO"; then :
ac_cv_lib_dnet_stub_getnodebyname=yes
else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_dnet_stub_getnodebyname=no
+ ac_cv_lib_dnet_stub_getnodebyname=no
fi
-rm -f conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_dnet_stub_getnodebyname" >&5
-echo "${ECHO_T}$ac_cv_lib_dnet_stub_getnodebyname" >&6
-if test $ac_cv_lib_dnet_stub_getnodebyname = yes; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dnet_stub_getnodebyname" >&5
+$as_echo "$ac_cv_lib_dnet_stub_getnodebyname" >&6; }
+if test "x$ac_cv_lib_dnet_stub_getnodebyname" = xyes; then :
XLIBS="$XLIBS -ldnet_stub"
fi
@@ -3535,72 +3830,43 @@ fi
# dl
-
-echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
-echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6
-if test "${ac_cv_lib_dl_dlopen+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5
+$as_echo_n "checking for dlopen in -ldl... " >&6; }
+if ${ac_cv_lib_dl_dlopen+:} false; then :
+ $as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-ldl $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
-/* Override any gcc2 internal prototype to avoid an error. */
+/* 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
-/* We use char because int might match the return type of a gcc2
- builtin and then its argument prototype would still apply. */
char dlopen ();
int
main ()
{
-dlopen ();
+return dlopen ();
;
return 0;
}
_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
+if ac_fn_c_try_link "$LINENO"; then :
ac_cv_lib_dl_dlopen=yes
else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_dl_dlopen=no
+ ac_cv_lib_dl_dlopen=no
fi
-rm -f conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
-echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6
-if test $ac_cv_lib_dl_dlopen = yes; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5
+$as_echo "$ac_cv_lib_dl_dlopen" >&6; }
+if test "x$ac_cv_lib_dl_dlopen" = xyes; then :
cat >>confdefs.h <<_ACEOF
#define HAVE_LIBDL 1
_ACEOF
@@ -3610,72 +3876,43 @@ _ACEOF
fi
if test `echo $LIBS | grep -c '\-ldl'` -eq 0; then
-
-echo "$as_me:$LINENO: checking for dlopen in -ldld" >&5
-echo $ECHO_N "checking for dlopen in -ldld... $ECHO_C" >&6
-if test "${ac_cv_lib_dld_dlopen+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldld" >&5
+$as_echo_n "checking for dlopen in -ldld... " >&6; }
+if ${ac_cv_lib_dld_dlopen+:} false; then :
+ $as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-ldld $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
-/* Override any gcc2 internal prototype to avoid an error. */
+/* 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
-/* We use char because int might match the return type of a gcc2
- builtin and then its argument prototype would still apply. */
char dlopen ();
int
main ()
{
-dlopen ();
+return dlopen ();
;
return 0;
}
_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
+if ac_fn_c_try_link "$LINENO"; then :
ac_cv_lib_dld_dlopen=yes
else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_dld_dlopen=no
+ ac_cv_lib_dld_dlopen=no
fi
-rm -f conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_dld_dlopen" >&5
-echo "${ECHO_T}$ac_cv_lib_dld_dlopen" >&6
-if test $ac_cv_lib_dld_dlopen = yes; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_dlopen" >&5
+$as_echo "$ac_cv_lib_dld_dlopen" >&6; }
+if test "x$ac_cv_lib_dld_dlopen" = xyes; then :
cat >>confdefs.h <<_ACEOF
#define HAVE_LIBDLD 1
_ACEOF
@@ -3689,31 +3926,142 @@ fi
#-------------------------------------------------------------------------------
# Checks for header files.
#-------------------------------------------------------------------------------
-echo "$as_me:$LINENO: checking for egrep" >&5
-echo $ECHO_N "checking for egrep... $ECHO_C" >&6
-if test "${ac_cv_prog_egrep+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- if echo a | (grep -E '(a|b)') >/dev/null 2>&1
- then ac_cv_prog_egrep='grep -E'
- else ac_cv_prog_egrep='egrep'
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5
+$as_echo_n "checking for grep that handles long lines and -e... " >&6; }
+if ${ac_cv_path_GREP+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ if test -z "$GREP"; then
+ ac_path_GREP_found=false
+ # Loop through the user's path and test for each of PROGNAME-LIST
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_prog in grep ggrep; do
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
+ as_fn_executable_p "$ac_path_GREP" || continue
+# Check for GNU ac_path_GREP and select it if it is found.
+ # Check for GNU $ac_path_GREP
+case `"$ac_path_GREP" --version 2>&1` in
+*GNU*)
+ ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;;
+*)
+ ac_count=0
+ $as_echo_n 0123456789 >"conftest.in"
+ while :
+ do
+ cat "conftest.in" "conftest.in" >"conftest.tmp"
+ mv "conftest.tmp" "conftest.in"
+ cp "conftest.in" "conftest.nl"
+ $as_echo 'GREP' >> "conftest.nl"
+ "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break
+ diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
+ as_fn_arith $ac_count + 1 && ac_count=$as_val
+ if test $ac_count -gt ${ac_path_GREP_max-0}; then
+ # Best one so far, save it but keep looking for a better one
+ ac_cv_path_GREP="$ac_path_GREP"
+ ac_path_GREP_max=$ac_count
+ fi
+ # 10*(2^10) chars as input seems more than enough
+ test $ac_count -gt 10 && break
+ done
+ rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
+esac
+
+ $ac_path_GREP_found && break 3
+ done
+ done
+ done
+IFS=$as_save_IFS
+ if test -z "$ac_cv_path_GREP"; then
+ as_fn_error $? "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
+ fi
+else
+ ac_cv_path_GREP=$GREP
+fi
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_GREP" >&5
+$as_echo "$ac_cv_path_GREP" >&6; }
+ GREP="$ac_cv_path_GREP"
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5
+$as_echo_n "checking for egrep... " >&6; }
+if ${ac_cv_path_EGREP+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
+ then ac_cv_path_EGREP="$GREP -E"
+ else
+ if test -z "$EGREP"; then
+ ac_path_EGREP_found=false
+ # Loop through the user's path and test for each of PROGNAME-LIST
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_prog in egrep; do
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
+ as_fn_executable_p "$ac_path_EGREP" || continue
+# Check for GNU ac_path_EGREP and select it if it is found.
+ # Check for GNU $ac_path_EGREP
+case `"$ac_path_EGREP" --version 2>&1` in
+*GNU*)
+ ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;;
+*)
+ ac_count=0
+ $as_echo_n 0123456789 >"conftest.in"
+ while :
+ do
+ cat "conftest.in" "conftest.in" >"conftest.tmp"
+ mv "conftest.tmp" "conftest.in"
+ cp "conftest.in" "conftest.nl"
+ $as_echo 'EGREP' >> "conftest.nl"
+ "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break
+ diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
+ as_fn_arith $ac_count + 1 && ac_count=$as_val
+ if test $ac_count -gt ${ac_path_EGREP_max-0}; then
+ # Best one so far, save it but keep looking for a better one
+ ac_cv_path_EGREP="$ac_path_EGREP"
+ ac_path_EGREP_max=$ac_count
fi
+ # 10*(2^10) chars as input seems more than enough
+ test $ac_count -gt 10 && break
+ done
+ rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
+esac
+
+ $ac_path_EGREP_found && break 3
+ done
+ done
+ done
+IFS=$as_save_IFS
+ if test -z "$ac_cv_path_EGREP"; then
+ as_fn_error $? "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
+ fi
+else
+ ac_cv_path_EGREP=$EGREP
+fi
+
+ fi
fi
-echo "$as_me:$LINENO: result: $ac_cv_prog_egrep" >&5
-echo "${ECHO_T}$ac_cv_prog_egrep" >&6
- EGREP=$ac_cv_prog_egrep
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_EGREP" >&5
+$as_echo "$ac_cv_path_EGREP" >&6; }
+ EGREP="$ac_cv_path_EGREP"
-echo "$as_me:$LINENO: checking for ANSI C header files" >&5
-echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6
-if test "${ac_cv_header_stdc+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5
+$as_echo_n "checking for ANSI C header files... " >&6; }
+if ${ac_cv_header_stdc+:} false; then :
+ $as_echo_n "(cached) " >&6
else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#include <stdlib.h>
#include <stdarg.h>
@@ -3728,51 +4076,23 @@ main ()
return 0;
}
_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
+if ac_fn_c_try_compile "$LINENO"; then :
ac_cv_header_stdc=yes
else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_header_stdc=no
+ ac_cv_header_stdc=no
fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
if test $ac_cv_header_stdc = yes; then
# SunOS 4.x string.h does not declare mem*, contrary to ANSI.
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#include <string.h>
_ACEOF
if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
- $EGREP "memchr" >/dev/null 2>&1; then
- :
+ $EGREP "memchr" >/dev/null 2>&1; then :
+
else
ac_cv_header_stdc=no
fi
@@ -3782,18 +4102,14 @@ fi
if test $ac_cv_header_stdc = yes; then
# ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#include <stdlib.h>
_ACEOF
if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
- $EGREP "free" >/dev/null 2>&1; then
- :
+ $EGREP "free" >/dev/null 2>&1; then :
+
else
ac_cv_header_stdc=no
fi
@@ -3803,16 +4119,13 @@ fi
if test $ac_cv_header_stdc = yes; then
# /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
- if test "$cross_compiling" = yes; then
+ if test "$cross_compiling" = yes; then :
:
else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#include <ctype.h>
+#include <stdlib.h>
#if ((' ' & 0x0FF) == 0x020)
# define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
@@ -3832,283 +4145,66 @@ main ()
for (i = 0; i < 256; i++)
if (XOR (islower (i), ISLOWER (i))
|| toupper (i) != TOUPPER (i))
- exit(2);
- exit (0);
+ return 2;
+ return 0;
}
_ACEOF
-rm -f conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- :
-else
- echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+if ac_fn_c_try_run "$LINENO"; then :
-( exit $ac_status )
-ac_cv_header_stdc=no
+else
+ ac_cv_header_stdc=no
fi
-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+ conftest.$ac_objext conftest.beam conftest.$ac_ext
fi
+
fi
fi
-echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
-echo "${ECHO_T}$ac_cv_header_stdc" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdc" >&5
+$as_echo "$ac_cv_header_stdc" >&6; }
if test $ac_cv_header_stdc = yes; then
-cat >>confdefs.h <<\_ACEOF
-#define STDC_HEADERS 1
-_ACEOF
+$as_echo "#define STDC_HEADERS 1" >>confdefs.h
fi
# On IRIX 5.3, sys/types and inttypes.h are conflicting.
+for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
+ inttypes.h stdint.h unistd.h
+do :
+ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default
+"
+if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
+ cat >>confdefs.h <<_ACEOF
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+_ACEOF
+fi
+done
+for ac_header in dirent.h fcntl.h limits.h malloc.h string.h sys/time.h unistd.h
+do :
+ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
+if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
+ cat >>confdefs.h <<_ACEOF
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+_ACEOF
+fi
+done
-
-for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
- inttypes.h stdint.h unistd.h
-do
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-$ac_includes_default
-
-#include <$ac_header>
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- eval "$as_ac_Header=yes"
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-eval "$as_ac_Header=no"
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
- cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
-_ACEOF
-
-fi
-
-done
-
-
-
-
-
-
-
-
-
-for ac_header in dirent.h fcntl.h limits.h malloc.h string.h sys/time.h unistd.h
-
-do
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
- echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-else
- # Is the header compilable?
-echo "$as_me:$LINENO: checking $ac_header usability" >&5
-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-$ac_includes_default
-#include <$ac_header>
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- ac_header_compiler=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_header_compiler=no
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6
-
-# Is the header present?
-echo "$as_me:$LINENO: checking $ac_header presence" >&5
-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#include <$ac_header>
-_ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } >/dev/null; then
- if test -s conftest.err; then
- ac_cpp_err=$ac_c_preproc_warn_flag
- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
- else
- ac_cpp_err=
- fi
-else
- ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
- ac_header_preproc=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_header_preproc=no
-fi
-rm -f conftest.err conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6
-
-# So? What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
- yes:no: )
- { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
- ac_header_preproc=yes
- ;;
- no:yes:* )
- { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
- (
- cat <<\_ASBOX
-## ------------------------------------------ ##
-## Report this to the AC_PACKAGE_NAME lists. ##
-## ------------------------------------------ ##
-_ASBOX
- ) |
- sed "s/^/$as_me: WARNING: /" >&2
- ;;
-esac
-echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- eval "$as_ac_Header=\$ac_header_preproc"
-fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-
-fi
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
- cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
-_ACEOF
-
-fi
-
-done
-
-echo "$as_me:$LINENO: checking whether time.h and sys/time.h may both be included" >&5
-echo $ECHO_N "checking whether time.h and sys/time.h may both be included... $ECHO_C" >&6
-if test "${ac_cv_header_time+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether time.h and sys/time.h may both be included" >&5
+$as_echo_n "checking whether time.h and sys/time.h may both be included... " >&6; }
+if ${ac_cv_header_time+:} false; then :
+ $as_echo_n "(cached) " >&6
else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#include <sys/types.h>
#include <sys/time.h>
@@ -4123,121 +4219,73 @@ return 0;
return 0;
}
_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
+if ac_fn_c_try_compile "$LINENO"; then :
ac_cv_header_time=yes
else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_header_time=no
+ ac_cv_header_time=no
fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
-echo "$as_me:$LINENO: result: $ac_cv_header_time" >&5
-echo "${ECHO_T}$ac_cv_header_time" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_time" >&5
+$as_echo "$ac_cv_header_time" >&6; }
if test $ac_cv_header_time = yes; then
-cat >>confdefs.h <<\_ACEOF
-#define TIME_WITH_SYS_TIME 1
+$as_echo "#define TIME_WITH_SYS_TIME 1" >>confdefs.h
+
+fi
+
+ac_fn_c_check_type "$LINENO" "size_t" "ac_cv_type_size_t" "$ac_includes_default"
+if test "x$ac_cv_type_size_t" = xyes; then :
+
+else
+
+cat >>confdefs.h <<_ACEOF
+#define size_t unsigned int
_ACEOF
fi
# The Ultrix 4.2 mips builtin alloca declared by alloca.h only works
# for constant arguments. Useless!
-echo "$as_me:$LINENO: checking for working alloca.h" >&5
-echo $ECHO_N "checking for working alloca.h... $ECHO_C" >&6
-if test "${ac_cv_working_alloca_h+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for working alloca.h" >&5
+$as_echo_n "checking for working alloca.h... " >&6; }
+if ${ac_cv_working_alloca_h+:} false; then :
+ $as_echo_n "(cached) " >&6
else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#include <alloca.h>
int
main ()
{
char *p = (char *) alloca (2 * sizeof (int));
+ if (p) return 0;
;
return 0;
}
_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
+if ac_fn_c_try_link "$LINENO"; then :
ac_cv_working_alloca_h=yes
else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_working_alloca_h=no
+ ac_cv_working_alloca_h=no
fi
-rm -f conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
fi
-echo "$as_me:$LINENO: result: $ac_cv_working_alloca_h" >&5
-echo "${ECHO_T}$ac_cv_working_alloca_h" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_working_alloca_h" >&5
+$as_echo "$ac_cv_working_alloca_h" >&6; }
if test $ac_cv_working_alloca_h = yes; then
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_ALLOCA_H 1
-_ACEOF
+$as_echo "#define HAVE_ALLOCA_H 1" >>confdefs.h
fi
-echo "$as_me:$LINENO: checking for alloca" >&5
-echo $ECHO_N "checking for alloca... $ECHO_C" >&6
-if test "${ac_cv_func_alloca_works+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for alloca" >&5
+$as_echo_n "checking for alloca... " >&6; }
+if ${ac_cv_func_alloca_works+:} false; then :
+ $as_echo_n "(cached) " >&6
else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#ifdef __GNUC__
# define alloca __builtin_alloca
@@ -4246,14 +4294,14 @@ cat >>conftest.$ac_ext <<_ACEOF
# include <malloc.h>
# define alloca _alloca
# else
-# if HAVE_ALLOCA_H
+# ifdef HAVE_ALLOCA_H
# include <alloca.h>
# else
# ifdef _AIX
#pragma alloca
# else
# ifndef alloca /* predefined by HP cc +Olibcalls */
-char *alloca ();
+void *alloca (size_t);
# endif
# endif
# endif
@@ -4264,50 +4312,25 @@ int
main ()
{
char *p = (char *) alloca (1);
+ if (p) return 0;
;
return 0;
}
_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
+if ac_fn_c_try_link "$LINENO"; then :
ac_cv_func_alloca_works=yes
else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_func_alloca_works=no
+ ac_cv_func_alloca_works=no
fi
-rm -f conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
fi
-echo "$as_me:$LINENO: result: $ac_cv_func_alloca_works" >&5
-echo "${ECHO_T}$ac_cv_func_alloca_works" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_alloca_works" >&5
+$as_echo "$ac_cv_func_alloca_works" >&6; }
if test $ac_cv_func_alloca_works = yes; then
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_ALLOCA 1
-_ACEOF
+$as_echo "#define HAVE_ALLOCA 1" >>confdefs.h
else
# The SVR3 libPW and SVR4 libucb both contain incompatible functions
@@ -4315,25 +4338,19 @@ else
# contain a buggy version. If you still want to use their alloca,
# use ar to extract alloca.o from them instead of compiling alloca.c.
-ALLOCA=alloca.$ac_objext
+ALLOCA=\${LIBOBJDIR}alloca.$ac_objext
-cat >>confdefs.h <<\_ACEOF
-#define C_ALLOCA 1
-_ACEOF
+$as_echo "#define C_ALLOCA 1" >>confdefs.h
-echo "$as_me:$LINENO: checking whether \`alloca.c' needs Cray hooks" >&5
-echo $ECHO_N "checking whether \`alloca.c' needs Cray hooks... $ECHO_C" >&6
-if test "${ac_cv_os_cray+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether \`alloca.c' needs Cray hooks" >&5
+$as_echo_n "checking whether \`alloca.c' needs Cray hooks... " >&6; }
+if ${ac_cv_os_cray+:} false; then :
+ $as_echo_n "(cached) " >&6
else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
-#if defined(CRAY) && ! defined(CRAY2)
+#if defined CRAY && ! defined CRAY2
webecray
#else
wenotbecray
@@ -4341,7 +4358,7 @@ wenotbecray
_ACEOF
if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
- $EGREP "webecray" >/dev/null 2>&1; then
+ $EGREP "webecray" >/dev/null 2>&1; then :
ac_cv_os_cray=yes
else
ac_cv_os_cray=no
@@ -4349,102 +4366,13 @@ fi
rm -f conftest*
fi
-echo "$as_me:$LINENO: result: $ac_cv_os_cray" >&5
-echo "${ECHO_T}$ac_cv_os_cray" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_os_cray" >&5
+$as_echo "$ac_cv_os_cray" >&6; }
if test $ac_cv_os_cray = yes; then
for ac_func in _getb67 GETB67 getb67; do
- as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:$LINENO: checking for $ac_func" >&5
-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
-if eval "test \"\${$as_ac_var+set}\" = set"; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
- For example, HP-UX 11i <limits.h> declares gettimeofday. */
-#define $ac_func innocuous_$ac_func
-
-/* System header to define __stub macros and hopefully few prototypes,
- which can conflict with char $ac_func (); 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 $ac_func
-
-/* Override any gcc2 internal prototype to avoid an error. */
-#ifdef __cplusplus
-extern "C"
-{
-#endif
-/* We use char because int might match the return type of a gcc2
- builtin and then its argument prototype would still apply. */
-char $ac_func ();
-/* 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_$ac_func) || defined (__stub___$ac_func)
-choke me
-#else
-char (*f) () = $ac_func;
-#endif
-#ifdef __cplusplus
-}
-#endif
-
-int
-main ()
-{
-return f != $ac_func;
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- eval "$as_ac_var=yes"
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-eval "$as_ac_var=no"
-fi
-rm -f conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
-if test `eval echo '${'$as_ac_var'}'` = yes; then
+ as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
+if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
cat >>confdefs.h <<_ACEOF
#define CRAY_STACKSEG_END $ac_func
@@ -4456,66 +4384,46 @@ fi
done
fi
-echo "$as_me:$LINENO: checking stack direction for C alloca" >&5
-echo $ECHO_N "checking stack direction for C alloca... $ECHO_C" >&6
-if test "${ac_cv_c_stack_direction+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking stack direction for C alloca" >&5
+$as_echo_n "checking stack direction for C alloca... " >&6; }
+if ${ac_cv_c_stack_direction+:} false; then :
+ $as_echo_n "(cached) " >&6
else
- if test "$cross_compiling" = yes; then
+ if test "$cross_compiling" = yes; then :
ac_cv_c_stack_direction=0
else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
+$ac_includes_default
int
-find_stack_direction ()
+find_stack_direction (int *addr, int depth)
{
- static char *addr = 0;
- auto char dummy;
- if (addr == 0)
- {
- addr = &dummy;
- return find_stack_direction ();
- }
- else
- return (&dummy > addr) ? 1 : -1;
+ int dir, dummy = 0;
+ if (! addr)
+ addr = &dummy;
+ *addr = addr < &dummy ? 1 : addr == &dummy ? 0 : -1;
+ dir = depth ? find_stack_direction (addr, depth - 1) : 0;
+ return dir + dummy;
}
int
-main ()
+main (int argc, char **argv)
{
- exit (find_stack_direction () < 0);
+ return find_stack_direction (0, argc + !argv + 20) < 0;
}
_ACEOF
-rm -f conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
+if ac_fn_c_try_run "$LINENO"; then :
ac_cv_c_stack_direction=1
else
- echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-ac_cv_c_stack_direction=-1
-fi
-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+ ac_cv_c_stack_direction=-1
fi
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+ conftest.$ac_objext conftest.beam conftest.$ac_ext
fi
-echo "$as_me:$LINENO: result: $ac_cv_c_stack_direction" >&5
-echo "${ECHO_T}$ac_cv_c_stack_direction" >&6
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_stack_direction" >&5
+$as_echo "$ac_cv_c_stack_direction" >&6; }
cat >>confdefs.h <<_ACEOF
#define STACK_DIRECTION $ac_cv_c_stack_direction
_ACEOF
@@ -4527,29 +4435,25 @@ fi
# Checks for typedefs, structures, and compiler characteristics.
#-------------------------------------------------------------------------------
-echo "$as_me:$LINENO: checking for an ANSI C-conforming const" >&5
-echo $ECHO_N "checking for an ANSI C-conforming const... $ECHO_C" >&6
-if test "${ac_cv_c_const+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for an ANSI C-conforming const" >&5
+$as_echo_n "checking for an ANSI C-conforming const... " >&6; }
+if ${ac_cv_c_const+:} false; then :
+ $as_echo_n "(cached) " >&6
else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
int
main ()
{
-/* FIXME: Include the comments suggested by Paul. */
+
#ifndef __cplusplus
- /* Ultrix mips cc rejects this. */
+ /* Ultrix mips cc rejects this sort of thing. */
typedef int charset[2];
- const charset x;
+ const charset cs = { 0, 0 };
/* SunOS 4.1.1 cc rejects this. */
- char const *const *ccp;
- char **p;
+ char const *const *pcpcc;
+ char **ppc;
/* NEC SVR4.0.2 mips cc rejects this. */
struct point {int x, y;};
static struct point const zero = {0,0};
@@ -4558,16 +4462,18 @@ main ()
an arm of an if-expression whose if-part is not a constant
expression */
const char *g = "string";
- ccp = &g + (g ? g-g : 0);
+ pcpcc = &g + (g ? g-g : 0);
/* HPUX 7.0 cc rejects these. */
- ++ccp;
- p = (char**) ccp;
- ccp = (char const *const *) p;
- { /* SCO 3.2v4 cc rejects this. */
- char *t;
+ ++pcpcc;
+ ppc = (char**) pcpcc;
+ pcpcc = (char const *const *) ppc;
+ { /* SCO 3.2v4 cc rejects this sort of thing. */
+ char tx;
+ char *t = &tx;
char const *s = 0 ? (char *) 0 : (char const *) 0;
*t++ = 0;
+ if (s) return 0;
}
{ /* Someone thinks the Sun supposedly-ANSI compiler will reject this. */
int x[] = {25, 17};
@@ -4579,119 +4485,40 @@ main ()
iptr p = 0;
++p;
}
- { /* AIX XL C 1.02.0.0 rejects this saying
+ { /* AIX XL C 1.02.0.0 rejects this sort of thing, saying
"k.c", line 2.27: 1506-025 (S) Operand must be a modifiable lvalue. */
- struct s { int j; const int *ap[3]; };
- struct s *b; b->j = 5;
+ struct s { int j; const int *ap[3]; } bx;
+ struct s *b = &bx; b->j = 5;
}
{ /* ULTRIX-32 V3.1 (Rev 9) vcc rejects this */
const int foo = 10;
+ if (!foo) return 0;
}
+ return !cs[0] && !zero.x;
#endif
;
return 0;
}
_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
+if ac_fn_c_try_compile "$LINENO"; then :
ac_cv_c_const=yes
else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_c_const=no
+ ac_cv_c_const=no
fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
-echo "$as_me:$LINENO: result: $ac_cv_c_const" >&5
-echo "${ECHO_T}$ac_cv_c_const" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_const" >&5
+$as_echo "$ac_cv_c_const" >&6; }
if test $ac_cv_c_const = no; then
-cat >>confdefs.h <<\_ACEOF
-#define const
-_ACEOF
+$as_echo "#define const /**/" >>confdefs.h
fi
-echo "$as_me:$LINENO: checking for mode_t" >&5
-echo $ECHO_N "checking for mode_t... $ECHO_C" >&6
-if test "${ac_cv_type_mode_t+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-$ac_includes_default
-int
-main ()
-{
-if ((mode_t *) 0)
- return 0;
-if (sizeof (mode_t))
- return 0;
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- ac_cv_type_mode_t=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+ac_fn_c_check_type "$LINENO" "mode_t" "ac_cv_type_mode_t" "$ac_includes_default"
+if test "x$ac_cv_type_mode_t" = xyes; then :
-ac_cv_type_mode_t=no
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: $ac_cv_type_mode_t" >&5
-echo "${ECHO_T}$ac_cv_type_mode_t" >&6
-if test $ac_cv_type_mode_t = yes; then
- :
else
cat >>confdefs.h <<_ACEOF
@@ -4700,82 +4527,23 @@ _ACEOF
fi
-echo "$as_me:$LINENO: checking for size_t" >&5
-echo $ECHO_N "checking for size_t... $ECHO_C" >&6
-if test "${ac_cv_type_size_t+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-$ac_includes_default
-int
-main ()
-{
-if ((size_t *) 0)
- return 0;
-if (sizeof (size_t))
- return 0;
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- ac_cv_type_size_t=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+ac_fn_c_check_type "$LINENO" "size_t" "ac_cv_type_size_t" "$ac_includes_default"
+if test "x$ac_cv_type_size_t" = xyes; then :
-ac_cv_type_size_t=no
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: $ac_cv_type_size_t" >&5
-echo "${ECHO_T}$ac_cv_type_size_t" >&6
-if test $ac_cv_type_size_t = yes; then
- :
else
cat >>confdefs.h <<_ACEOF
-#define size_t unsigned
+#define size_t unsigned int
_ACEOF
fi
-echo "$as_me:$LINENO: checking whether struct tm is in sys/time.h or time.h" >&5
-echo $ECHO_N "checking whether struct tm is in sys/time.h or time.h... $ECHO_C" >&6
-if test "${ac_cv_struct_tm+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether struct tm is in sys/time.h or time.h" >&5
+$as_echo_n "checking whether struct tm is in sys/time.h or time.h... " >&6; }
+if ${ac_cv_struct_tm+:} false; then :
+ $as_echo_n "(cached) " >&6
else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#include <sys/types.h>
#include <time.h>
@@ -4783,49 +4551,25 @@ cat >>conftest.$ac_ext <<_ACEOF
int
main ()
{
-struct tm *tp; tp->tm_sec;
+struct tm tm;
+ int *p = &tm.tm_sec;
+ return !p;
;
return 0;
}
_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
+if ac_fn_c_try_compile "$LINENO"; then :
ac_cv_struct_tm=time.h
else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_struct_tm=sys/time.h
+ ac_cv_struct_tm=sys/time.h
fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
-echo "$as_me:$LINENO: result: $ac_cv_struct_tm" >&5
-echo "${ECHO_T}$ac_cv_struct_tm" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_struct_tm" >&5
+$as_echo "$ac_cv_struct_tm" >&6; }
if test $ac_cv_struct_tm = sys/time.h; then
-cat >>confdefs.h <<\_ACEOF
-#define TM_IN_SYS_TIME 1
-_ACEOF
+$as_echo "#define TM_IN_SYS_TIME 1" >>confdefs.h
fi
@@ -4839,38 +4583,13 @@ case $EXT in
;;
lnx)
;;
- osf)
-
- if test $GCC = yes; then
- # Remove optimization on DEC systems
- CFLAGS=`echo $CFLAGS | sed 's:-O[0-9]* *::g'`
- else
- # Standard DEC cc behavior is *STILL* K&R -- force ANSI compliance
- CFLAGS="$CFLAGS -std1 -Dunix"
- fi
-
- ;;
- sgi)
- cat >>confdefs.h <<\_ACEOF
-#define HAVE_POSIX_SIGNALS 1
-_ACEOF
-
- ;;
sol)
- cat >>confdefs.h <<\_ACEOF
-#define HAVE_POSIX_SIGNALS 1
-_ACEOF
+ $as_echo "#define HAVE_POSIX_SIGNALS 1" >>confdefs.h
;;
*)
;;
esac
-# Remove optimization on all systems for all older gcc
-if test $GCC = yes; then
- if test `$CC -v 2> /dev/null | grep -c 'version 2\.45678'` -ne 0; then
- CFLAGS=`echo $CFLAGS | sed 's:-O0-9* *::g'`
- fi
-fi
#-------------------------------------------------------------------------------
# Shared library section
@@ -4888,33 +4607,22 @@ if test $lhea_shared = yes; then
lhea_shlib_cflags='-fPIC -fno-common'
lhea_shlib_fflags='-fPIC -fno-common'
;;
- hpu)
- SHLIB_LD="ld -b"
- SHLIB_LD_LIBS='${LIBS}'
- SHLIB_SUFFIX=".sl"
- ;;
lnx)
SHLIB_LD=":"
;;
- osf)
- SHLIB_LD="ld -shared -expect_unresolved '*'"
- ;;
sol)
SHLIB_LD="/usr/ccs/bin/ld -G"
SHLIB_LD_LIBS='${LIBS}'
lhea_shlib_cflags="-KPIC"
lhea_shlib_fflags="-KPIC"
;;
- sgi)
- SHLIB_LD="ld -shared -rdata_shared"
- ;;
win)
SHLIB_LD="$CC -shared"
SHLIB_SUFFIX=".dll"
;;
*)
- { echo "$as_me:$LINENO: WARNING: Unable to determine how to make a shared library" >&5
-echo "$as_me: WARNING: Unable to determine how to make a shared library" >&2;}
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unable to determine how to make a shared library" >&5
+$as_echo "$as_me: WARNING: Unable to determine how to make a shared library" >&2;}
;;
esac
# Darwin uses gcc, but uses -dynamiclib flag
@@ -4937,19 +4645,15 @@ fi
# Checks for library functions.
#-------------------------------------------------------------------------------
-echo "$as_me:$LINENO: checking for working memcmp" >&5
-echo $ECHO_N "checking for working memcmp... $ECHO_C" >&6
-if test "${ac_cv_func_memcmp_working+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for working memcmp" >&5
+$as_echo_n "checking for working memcmp... " >&6; }
+if ${ac_cv_func_memcmp_working+:} false; then :
+ $as_echo_n "(cached) " >&6
else
- if test "$cross_compiling" = yes; then
+ if test "$cross_compiling" = yes; then :
ac_cv_func_memcmp_working=no
else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
$ac_includes_default
int
@@ -4957,9 +4661,9 @@ main ()
{
/* Some versions of memcmp are not 8-bit clean. */
- char c0 = 0x40, c1 = 0x80, c2 = 0x81;
+ char c0 = '\100', c1 = '\200', c2 = '\201';
if (memcmp(&c0, &c2, 1) >= 0 || memcmp(&c1, &c2, 1) >= 0)
- exit (1);
+ return 1;
/* The Next x86 OpenStep bug shows up only when comparing 16 bytes
or more and with at least one buffer not starting on a 4-byte boundary.
@@ -4975,287 +4679,115 @@ main ()
strcpy (a, "--------01111111");
strcpy (b, "--------10000000");
if (memcmp (a, b, 16) >= 0)
- exit (1);
+ return 1;
}
- exit (0);
+ return 0;
}
;
return 0;
}
_ACEOF
-rm -f conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
+if ac_fn_c_try_run "$LINENO"; then :
ac_cv_func_memcmp_working=yes
else
- echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-ac_cv_func_memcmp_working=no
+ ac_cv_func_memcmp_working=no
fi
-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+ conftest.$ac_objext conftest.beam conftest.$ac_ext
fi
+
fi
-echo "$as_me:$LINENO: result: $ac_cv_func_memcmp_working" >&5
-echo "${ECHO_T}$ac_cv_func_memcmp_working" >&6
-test $ac_cv_func_memcmp_working = no && case $LIBOBJS in
- "memcmp.$ac_objext" | \
- *" memcmp.$ac_objext" | \
- "memcmp.$ac_objext "* | \
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_memcmp_working" >&5
+$as_echo "$ac_cv_func_memcmp_working" >&6; }
+test $ac_cv_func_memcmp_working = no && case " $LIBOBJS " in
*" memcmp.$ac_objext "* ) ;;
- *) LIBOBJS="$LIBOBJS memcmp.$ac_objext" ;;
+ *) LIBOBJS="$LIBOBJS memcmp.$ac_objext"
+ ;;
esac
-echo "$as_me:$LINENO: checking return type of signal handlers" >&5
-echo $ECHO_N "checking return type of signal handlers... $ECHO_C" >&6
-if test "${ac_cv_type_signal+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking return type of signal handlers" >&5
+$as_echo_n "checking return type of signal handlers... " >&6; }
+if ${ac_cv_type_signal+:} false; then :
+ $as_echo_n "(cached) " >&6
else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#include <sys/types.h>
#include <signal.h>
-#ifdef signal
-# undef signal
-#endif
-#ifdef __cplusplus
-extern "C" void (*signal (int, void (*)(int)))(int);
-#else
-void (*signal ()) ();
-#endif
int
main ()
{
-int i;
+return *(signal (0, 0)) (0) == 1;
;
return 0;
}
_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- ac_cv_type_signal=void
+if ac_fn_c_try_compile "$LINENO"; then :
+ ac_cv_type_signal=int
else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_type_signal=int
+ ac_cv_type_signal=void
fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
-echo "$as_me:$LINENO: result: $ac_cv_type_signal" >&5
-echo "${ECHO_T}$ac_cv_type_signal" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_type_signal" >&5
+$as_echo "$ac_cv_type_signal" >&6; }
cat >>confdefs.h <<_ACEOF
#define RETSIGTYPE $ac_cv_type_signal
_ACEOF
-
for ac_func in strftime
-do
-as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:$LINENO: checking for $ac_func" >&5
-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
-if eval "test \"\${$as_ac_var+set}\" = set"; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
- For example, HP-UX 11i <limits.h> declares gettimeofday. */
-#define $ac_func innocuous_$ac_func
-
-/* System header to define __stub macros and hopefully few prototypes,
- which can conflict with char $ac_func (); 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 $ac_func
-
-/* Override any gcc2 internal prototype to avoid an error. */
-#ifdef __cplusplus
-extern "C"
-{
-#endif
-/* We use char because int might match the return type of a gcc2
- builtin and then its argument prototype would still apply. */
-char $ac_func ();
-/* 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_$ac_func) || defined (__stub___$ac_func)
-choke me
-#else
-char (*f) () = $ac_func;
-#endif
-#ifdef __cplusplus
-}
-#endif
-
-int
-main ()
-{
-return f != $ac_func;
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- eval "$as_ac_var=yes"
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-eval "$as_ac_var=no"
-fi
-rm -f conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
-if test `eval echo '${'$as_ac_var'}'` = yes; then
+do :
+ ac_fn_c_check_func "$LINENO" "strftime" "ac_cv_func_strftime"
+if test "x$ac_cv_func_strftime" = xyes; then :
cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+#define HAVE_STRFTIME 1
_ACEOF
else
# strftime is in -lintl on SCO UNIX.
-echo "$as_me:$LINENO: checking for strftime in -lintl" >&5
-echo $ECHO_N "checking for strftime in -lintl... $ECHO_C" >&6
-if test "${ac_cv_lib_intl_strftime+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for strftime in -lintl" >&5
+$as_echo_n "checking for strftime in -lintl... " >&6; }
+if ${ac_cv_lib_intl_strftime+:} false; then :
+ $as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lintl $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
-/* Override any gcc2 internal prototype to avoid an error. */
+/* 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
-/* We use char because int might match the return type of a gcc2
- builtin and then its argument prototype would still apply. */
char strftime ();
int
main ()
{
-strftime ();
+return strftime ();
;
return 0;
}
_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
+if ac_fn_c_try_link "$LINENO"; then :
ac_cv_lib_intl_strftime=yes
else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_intl_strftime=no
+ ac_cv_lib_intl_strftime=no
fi
-rm -f conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_intl_strftime" >&5
-echo "${ECHO_T}$ac_cv_lib_intl_strftime" >&6
-if test $ac_cv_lib_intl_strftime = yes; then
- cat >>confdefs.h <<\_ACEOF
-#define HAVE_STRFTIME 1
-_ACEOF
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_strftime" >&5
+$as_echo "$ac_cv_lib_intl_strftime" >&6; }
+if test "x$ac_cv_lib_intl_strftime" = xyes; then :
+ $as_echo "#define HAVE_STRFTIME 1" >>confdefs.h
LIBS="-lintl $LIBS"
fi
@@ -5263,109 +4795,13 @@ fi
fi
done
-
-
-
-
-
-
-
for ac_func in getcwd socket strcspn strspn strstr strtod strtol
-do
-as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:$LINENO: checking for $ac_func" >&5
-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
-if eval "test \"\${$as_ac_var+set}\" = set"; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
- For example, HP-UX 11i <limits.h> declares gettimeofday. */
-#define $ac_func innocuous_$ac_func
-
-/* System header to define __stub macros and hopefully few prototypes,
- which can conflict with char $ac_func (); 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 $ac_func
-
-/* Override any gcc2 internal prototype to avoid an error. */
-#ifdef __cplusplus
-extern "C"
-{
-#endif
-/* We use char because int might match the return type of a gcc2
- builtin and then its argument prototype would still apply. */
-char $ac_func ();
-/* 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_$ac_func) || defined (__stub___$ac_func)
-choke me
-#else
-char (*f) () = $ac_func;
-#endif
-#ifdef __cplusplus
-}
-#endif
-
-int
-main ()
-{
-return f != $ac_func;
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- eval "$as_ac_var=yes"
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-eval "$as_ac_var=no"
-fi
-rm -f conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
-if test `eval echo '${'$as_ac_var'}'` = yes; then
+do :
+ as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
+if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
_ACEOF
fi
@@ -5373,13 +4809,16 @@ done
#-------------------------------------------------------------------------------
+# Construct TCL_LIB:
+#-------------------------------------------------------------------------------
+for tclversion in 8 8.5 8.4; do
+ if test -e "$TCL_PATH/libtcl${tclversion}${SHLIB_SUFFIX}"; then
+ TCL_LIB="tcl${tclversion}"
+ fi
+done
-
-
-
-
- ac_config_files="$ac_config_files Makefile"
+ac_config_files="$ac_config_files Makefile"
cat >confcache <<\_ACEOF
# This file is a shell script that caches the results of configure
@@ -5399,39 +4838,70 @@ _ACEOF
# The following way of writing the cache mishandles newlines in values,
# but we know of no workaround that is simple, portable, and efficient.
-# So, don't put newlines in cache variables' values.
+# So, we kill variables containing newlines.
# Ultrix sh set writes to stderr and can't be redirected directly,
# and sets the high bit in the cache file unless we assign to the vars.
-{
+(
+ for ac_var in `(set) 2>&1 | sed -n 's/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'`; do
+ eval ac_val=\$$ac_var
+ case $ac_val in #(
+ *${as_nl}*)
+ case $ac_var in #(
+ *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5
+$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
+ esac
+ case $ac_var in #(
+ _ | IFS | as_nl) ;; #(
+ BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
+ *) { eval $ac_var=; unset $ac_var;} ;;
+ esac ;;
+ esac
+ done
+
(set) 2>&1 |
- case `(ac_space=' '; set | grep ac_space) 2>&1` in
- *ac_space=\ *)
- # `set' does not quote correctly, so add quotes (double-quote
- # substitution turns \\\\ into \\, and sed turns \\ into \).
+ case $as_nl`(ac_space=' '; set) 2>&1` in #(
+ *${as_nl}ac_space=\ *)
+ # `set' does not quote correctly, so add quotes: double-quote
+ # substitution turns \\\\ into \\, and sed turns \\ into \.
sed -n \
"s/'/'\\\\''/g;
s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
- ;;
+ ;; #(
*)
# `set' quotes correctly as required by POSIX, so do not add quotes.
- sed -n \
- "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"
+ sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p"
;;
- esac;
-} |
+ esac |
+ sort
+) |
sed '
+ /^ac_cv_env_/b end
t clear
- : clear
+ :clear
s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/
t end
- /^ac_cv_env/!s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
- : end' >>confcache
-if diff $cache_file confcache >/dev/null 2>&1; then :; else
- if test -w $cache_file; then
- test "x$cache_file" != "x/dev/null" && echo "updating cache $cache_file"
- cat confcache >$cache_file
+ s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
+ :end' >>confcache
+if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
+ if test -w "$cache_file"; then
+ if test "x$cache_file" != "x/dev/null"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5
+$as_echo "$as_me: updating cache $cache_file" >&6;}
+ if test ! -f "$cache_file" || test -h "$cache_file"; then
+ cat confcache >"$cache_file"
+ else
+ case $cache_file in #(
+ */* | ?:*)
+ mv -f confcache "$cache_file"$$ &&
+ mv -f "$cache_file"$$ "$cache_file" ;; #(
+ *)
+ mv -f confcache "$cache_file" ;;
+ esac
+ fi
+ fi
else
- echo "not updating unwritable cache $cache_file"
+ { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5
+$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
fi
fi
rm -f confcache
@@ -5440,63 +4910,55 @@ test "x$prefix" = xNONE && prefix=$ac_default_prefix
# Let make expand exec_prefix.
test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
-# VPATH may cause trouble with some makes, so we remove $(srcdir),
-# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and
-# trailing colons and then remove the whole line if VPATH becomes empty
-# (actually we leave an empty line to preserve line numbers).
-if test "x$srcdir" = x.; then
- ac_vpsub='/^[ ]*VPATH[ ]*=/{
-s/:*\$(srcdir):*/:/;
-s/:*\${srcdir}:*/:/;
-s/:*@srcdir@:*/:/;
-s/^\([^=]*=[ ]*\):*/\1/;
-s/:*$//;
-s/^[^=]*=[ ]*$//;
-}'
-fi
-
# Transform confdefs.h into DEFS.
# Protect against shell expansion while executing Makefile rules.
# Protect against Makefile macro expansion.
#
# If the first sed substitution is executed (which looks for macros that
-# take arguments), then we branch to the quote section. Otherwise,
+# take arguments), then branch to the quote section. Otherwise,
# look for a macro that doesn't take arguments.
-cat >confdef2opt.sed <<\_ACEOF
+ac_script='
+:mline
+/\\$/{
+ N
+ s,\\\n,,
+ b mline
+}
t clear
-: clear
-s,^[ ]*#[ ]*define[ ][ ]*\([^ (][^ (]*([^)]*)\)[ ]*\(.*\),-D\1=\2,g
+:clear
+s/^[ ]*#[ ]*define[ ][ ]*\([^ (][^ (]*([^)]*)\)[ ]*\(.*\)/-D\1=\2/g
t quote
-s,^[ ]*#[ ]*define[ ][ ]*\([^ ][^ ]*\)[ ]*\(.*\),-D\1=\2,g
+s/^[ ]*#[ ]*define[ ][ ]*\([^ ][^ ]*\)[ ]*\(.*\)/-D\1=\2/g
t quote
-d
-: quote
-s,[ `~#$^&*(){}\\|;'"<>?],\\&,g
-s,\[,\\&,g
-s,\],\\&,g
-s,\$,$$,g
-p
-_ACEOF
-# We use echo to avoid assuming a particular line-breaking character.
-# The extra dot is to prevent the shell from consuming trailing
-# line-breaks from the sub-command output. A line-break within
-# single-quotes doesn't work because, if this script is created in a
-# platform that uses two characters for line-breaks (e.g., DOS), tr
-# would break.
-ac_LF_and_DOT=`echo; echo .`
-DEFS=`sed -n -f confdef2opt.sed confdefs.h | tr "$ac_LF_and_DOT" ' .'`
-rm -f confdef2opt.sed
+b any
+:quote
+s/[ `~#$^&*(){}\\|;'\''"<>?]/\\&/g
+s/\[/\\&/g
+s/\]/\\&/g
+s/\$/$$/g
+H
+:any
+${
+ g
+ s/^\n//
+ s/\n/ /g
+ p
+}
+'
+DEFS=`sed -n "$ac_script" confdefs.h`
ac_libobjs=
ac_ltlibobjs=
+U=
for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
# 1. Remove the extension, and $U if already installed.
- ac_i=`echo "$ac_i" |
- sed 's/\$U\././;s/\.o$//;s/\.obj$//'`
- # 2. Add them.
- ac_libobjs="$ac_libobjs $ac_i\$U.$ac_objext"
- ac_ltlibobjs="$ac_ltlibobjs $ac_i"'$U.lo'
+ ac_script='s/\$U\././;s/\.o$//;s/\.obj$//'
+ ac_i=`$as_echo "$ac_i" | sed "$ac_script"`
+ # 2. Prepend LIBOBJDIR. When used with automake>=1.10 LIBOBJDIR
+ # will be set to the directory where LIBOBJS objects are built.
+ as_fn_append ac_libobjs " \${LIBOBJDIR}$ac_i\$U.$ac_objext"
+ as_fn_append ac_ltlibobjs " \${LIBOBJDIR}$ac_i"'$U.lo'
done
LIBOBJS=$ac_libobjs
@@ -5504,12 +4966,14 @@ LTLIBOBJS=$ac_ltlibobjs
-: ${CONFIG_STATUS=./config.status}
+: "${CONFIG_STATUS=./config.status}"
+ac_write_fail=0
ac_clean_files_save=$ac_clean_files
ac_clean_files="$ac_clean_files $CONFIG_STATUS"
-{ echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5
-echo "$as_me: creating $CONFIG_STATUS" >&6;}
-cat >$CONFIG_STATUS <<_ACEOF
+{ $as_echo "$as_me:${as_lineno-$LINENO}: creating $CONFIG_STATUS" >&5
+$as_echo "$as_me: creating $CONFIG_STATUS" >&6;}
+as_write_fail=0
+cat >$CONFIG_STATUS <<_ASEOF || as_write_fail=1
#! $SHELL
# Generated by $as_me.
# Run this file to recreate the current configuration.
@@ -5519,81 +4983,253 @@ cat >$CONFIG_STATUS <<_ACEOF
debug=false
ac_cs_recheck=false
ac_cs_silent=false
-SHELL=\${CONFIG_SHELL-$SHELL}
-_ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF
-## --------------------- ##
-## M4sh Initialization. ##
-## --------------------- ##
-
-# Be Bourne compatible
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
+SHELL=\${CONFIG_SHELL-$SHELL}
+export SHELL
+_ASEOF
+cat >>$CONFIG_STATUS <<\_ASEOF || as_write_fail=1
+## -------------------- ##
+## M4sh Initialization. ##
+## -------------------- ##
+
+# Be more Bourne compatible
+DUALCASE=1; export DUALCASE # for MKS sh
+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then :
emulate sh
NULLCMD=:
- # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
+ # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
# is contrary to our usage. Disable this feature.
alias -g '${1+"$@"}'='"$@"'
-elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then
- set -o posix
+ setopt NO_GLOB_SUBST
+else
+ case `(set -o) 2>/dev/null` in #(
+ *posix*) :
+ set -o posix ;; #(
+ *) :
+ ;;
+esac
fi
-DUALCASE=1; export DUALCASE # for MKS sh
-# Support unset when possible.
-if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
- as_unset=unset
-else
- as_unset=false
+
+as_nl='
+'
+export as_nl
+# Printing a long string crashes Solaris 7 /usr/bin/printf.
+as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
+# Prefer a ksh shell builtin over an external printf program on Solaris,
+# but without wasting forks for bash or zsh.
+if test -z "$BASH_VERSION$ZSH_VERSION" \
+ && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then
+ as_echo='print -r --'
+ as_echo_n='print -rn --'
+elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
+ as_echo='printf %s\n'
+ as_echo_n='printf %s'
+else
+ if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then
+ as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"'
+ as_echo_n='/usr/ucb/echo -n'
+ else
+ as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
+ as_echo_n_body='eval
+ arg=$1;
+ case $arg in #(
+ *"$as_nl"*)
+ expr "X$arg" : "X\\(.*\\)$as_nl";
+ arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
+ esac;
+ expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl"
+ '
+ export as_echo_n_body
+ as_echo_n='sh -c $as_echo_n_body as_echo'
+ fi
+ export as_echo_body
+ as_echo='sh -c $as_echo_body as_echo'
fi
+# The user is always right.
+if test "${PATH_SEPARATOR+set}" != set; then
+ PATH_SEPARATOR=:
+ (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && {
+ (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 ||
+ PATH_SEPARATOR=';'
+ }
+fi
+
+
+# IFS
+# We need space, tab and new line, in precisely that order. Quoting is
+# there to prevent editors from complaining about space-tab.
+# (If _AS_PATH_WALK were called with IFS unset, it would disable word
+# splitting by setting IFS to empty value.)
+IFS=" "" $as_nl"
+
+# Find who we are. Look in the path if we contain no directory separator.
+as_myself=
+case $0 in #((
+ *[\\/]* ) as_myself=$0 ;;
+ *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
+ done
+IFS=$as_save_IFS
-# Work around bugs in pre-3.0 UWIN ksh.
-$as_unset ENV MAIL MAILPATH
+ ;;
+esac
+# We did not find ourselves, most probably we were run as `sh COMMAND'
+# in which case we are not to be found in the path.
+if test "x$as_myself" = x; then
+ as_myself=$0
+fi
+if test ! -f "$as_myself"; then
+ $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
+ exit 1
+fi
+
+# Unset variables that we do not need and which cause bugs (e.g. in
+# pre-3.0 UWIN ksh). But do not cause bugs in bash 2.01; the "|| exit 1"
+# suppresses any "Segmentation fault" message there. '((' could
+# trigger a bug in pdksh 5.2.14.
+for as_var in BASH_ENV ENV MAIL MAILPATH
+do eval test x\${$as_var+set} = xset \
+ && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || :
+done
PS1='$ '
PS2='> '
PS4='+ '
# NLS nuisances.
-for as_var in \
- LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \
- LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
- LC_TELEPHONE LC_TIME
-do
- if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
- eval $as_var=C; export $as_var
- else
- $as_unset $as_var
+LC_ALL=C
+export LC_ALL
+LANGUAGE=C
+export LANGUAGE
+
+# CDPATH.
+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
+
+
+# as_fn_error STATUS ERROR [LINENO LOG_FD]
+# ----------------------------------------
+# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
+# provided, also output the error to LOG_FD, referencing LINENO. Then exit the
+# script with STATUS, using 1 if that was 0.
+as_fn_error ()
+{
+ as_status=$1; test $as_status -eq 0 && as_status=1
+ if test "$4"; then
+ as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+ $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
fi
-done
+ $as_echo "$as_me: error: $2" >&2
+ as_fn_exit $as_status
+} # as_fn_error
-# Required to use basename.
-if expr a : '\(a\)' >/dev/null 2>&1; then
+
+# as_fn_set_status STATUS
+# -----------------------
+# Set $? to STATUS, without forking.
+as_fn_set_status ()
+{
+ return $1
+} # as_fn_set_status
+
+# as_fn_exit STATUS
+# -----------------
+# Exit the shell with STATUS, even in a "trap 0" or "set -e" context.
+as_fn_exit ()
+{
+ set +e
+ as_fn_set_status $1
+ exit $1
+} # as_fn_exit
+
+# as_fn_unset VAR
+# ---------------
+# Portably unset VAR.
+as_fn_unset ()
+{
+ { eval $1=; unset $1;}
+}
+as_unset=as_fn_unset
+# as_fn_append VAR VALUE
+# ----------------------
+# Append the text in VALUE to the end of the definition contained in VAR. Take
+# advantage of any shell optimizations that allow amortized linear growth over
+# repeated appends, instead of the typical quadratic growth present in naive
+# implementations.
+if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then :
+ eval 'as_fn_append ()
+ {
+ eval $1+=\$2
+ }'
+else
+ as_fn_append ()
+ {
+ eval $1=\$$1\$2
+ }
+fi # as_fn_append
+
+# as_fn_arith ARG...
+# ------------------
+# Perform arithmetic evaluation on the ARGs, and store the result in the
+# global $as_val. Take advantage of shells that can avoid forks. The arguments
+# must be portable across $(()) and expr.
+if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then :
+ eval 'as_fn_arith ()
+ {
+ as_val=$(( $* ))
+ }'
+else
+ as_fn_arith ()
+ {
+ as_val=`expr "$@" || test $? -eq 1`
+ }
+fi # as_fn_arith
+
+
+if expr a : '\(a\)' >/dev/null 2>&1 &&
+ test "X`expr 00001 : '.*\(...\)'`" = X001; then
as_expr=expr
else
as_expr=false
fi
-if (basename /) >/dev/null 2>&1 && test "X`basename / 2>&1`" = "X/"; then
+if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
as_basename=basename
else
as_basename=false
fi
+if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
+ as_dirname=dirname
+else
+ as_dirname=false
+fi
-# Name of the executable.
-as_me=`$as_basename "$0" ||
+as_me=`$as_basename -- "$0" ||
$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
X"$0" : 'X\(//\)$' \| \
- X"$0" : 'X\(/\)$' \| \
- . : '\(.\)' 2>/dev/null ||
-echo X/"$0" |
- sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/; q; }
- /^X\/\(\/\/\)$/{ s//\1/; q; }
- /^X\/\(\/\).*/{ s//\1/; q; }
- s/.*/./; q'`
-
+ X"$0" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X/"$0" |
+ sed '/^.*\/\([^/][^/]*\)\/*$/{
+ s//\1/
+ q
+ }
+ /^X\/\(\/\/\)$/{
+ s//\1/
+ q
+ }
+ /^X\/\(\/\).*/{
+ s//\1/
+ q
+ }
+ s/.*/./; q'`
-# PATH needs CR, and LINENO needs CR and PATH.
# Avoid depending upon Character Ranges.
as_cr_letters='abcdefghijklmnopqrstuvwxyz'
as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
@@ -5601,148 +5237,111 @@ as_cr_Letters=$as_cr_letters$as_cr_LETTERS
as_cr_digits='0123456789'
as_cr_alnum=$as_cr_Letters$as_cr_digits
-# The user is always right.
-if test "${PATH_SEPARATOR+set}" != set; then
- echo "#! /bin/sh" >conf$$.sh
- echo "exit 0" >>conf$$.sh
- chmod +x conf$$.sh
- if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
- PATH_SEPARATOR=';'
- else
- PATH_SEPARATOR=:
- fi
- rm -f conf$$.sh
-fi
-
-
- as_lineno_1=$LINENO
- as_lineno_2=$LINENO
- as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
- test "x$as_lineno_1" != "x$as_lineno_2" &&
- test "x$as_lineno_3" = "x$as_lineno_2" || {
- # Find who we are. Look in the path if we contain no path at all
- # relative or not.
- case $0 in
- *[\\/]* ) as_myself=$0 ;;
- *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
-done
-
- ;;
- esac
- # We did not find ourselves, most probably we were run as `sh COMMAND'
- # in which case we are not to be found in the path.
- if test "x$as_myself" = x; then
- as_myself=$0
- fi
- if test ! -f "$as_myself"; then
- { { echo "$as_me:$LINENO: error: cannot find myself; rerun with an absolute path" >&5
-echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2;}
- { (exit 1); exit 1; }; }
- fi
- case $CONFIG_SHELL in
- '')
- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for as_base in sh bash ksh sh5; do
- case $as_dir in
- /*)
- if ("$as_dir/$as_base" -c '
- as_lineno_1=$LINENO
- as_lineno_2=$LINENO
- as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
- test "x$as_lineno_1" != "x$as_lineno_2" &&
- test "x$as_lineno_3" = "x$as_lineno_2" ') 2>/dev/null; then
- $as_unset BASH_ENV || test "${BASH_ENV+set}" != set || { BASH_ENV=; export BASH_ENV; }
- $as_unset ENV || test "${ENV+set}" != set || { ENV=; export ENV; }
- CONFIG_SHELL=$as_dir/$as_base
- export CONFIG_SHELL
- exec "$CONFIG_SHELL" "$0" ${1+"$@"}
- fi;;
- esac
- done
-done
-;;
- esac
-
- # Create $as_me.lineno as a copy of $as_myself, but with $LINENO
- # uniformly replaced by the line number. The first 'sed' inserts a
- # line-number line before each line; the second 'sed' does the real
- # work. The second script uses 'N' to pair each line-number line
- # with the numbered line, and appends trailing '-' during
- # substitution so that $LINENO is not a special case at line end.
- # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the
- # second 'sed' script. Blame Lee E. McMahon for sed's syntax. :-)
- sed '=' <$as_myself |
- sed '
- N
- s,$,-,
- : loop
- s,^\(['$as_cr_digits']*\)\(.*\)[$]LINENO\([^'$as_cr_alnum'_]\),\1\2\1\3,
- t loop
- s,-$,,
- s,^['$as_cr_digits']*\n,,
- ' >$as_me.lineno &&
- chmod +x $as_me.lineno ||
- { { echo "$as_me:$LINENO: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&5
-echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2;}
- { (exit 1); exit 1; }; }
-
- # Don't try to exec as it changes $[0], causing all sort of problems
- # (the dirname of $[0] is not the place where we might find the
- # original and so on. Autoconf is especially sensible to this).
- . ./$as_me.lineno
- # Exit status is that of the last command.
- exit
-}
-
-
-case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in
- *c*,-n*) ECHO_N= ECHO_C='
-' ECHO_T=' ' ;;
- *c*,* ) ECHO_N=-n ECHO_C= ECHO_T= ;;
- *) ECHO_N= ECHO_C='\c' ECHO_T= ;;
+ECHO_C= ECHO_N= ECHO_T=
+case `echo -n x` in #(((((
+-n*)
+ case `echo 'xy\c'` in
+ *c*) ECHO_T=' ';; # ECHO_T is single tab character.
+ xy) ECHO_C='\c';;
+ *) echo `echo ksh88 bug on AIX 6.1` > /dev/null
+ ECHO_T=' ';;
+ esac;;
+*)
+ ECHO_N='-n';;
esac
-if expr a : '\(a\)' >/dev/null 2>&1; then
- as_expr=expr
+rm -f conf$$ conf$$.exe conf$$.file
+if test -d conf$$.dir; then
+ rm -f conf$$.dir/conf$$.file
else
- as_expr=false
+ rm -f conf$$.dir
+ mkdir conf$$.dir 2>/dev/null
fi
-
-rm -f conf$$ conf$$.exe conf$$.file
-echo >conf$$.file
-if ln -s conf$$.file conf$$ 2>/dev/null; then
- # We could just check for DJGPP; but this test a) works b) is more generic
- # and c) will remain valid once DJGPP supports symlinks (DJGPP 2.04).
- if test -f conf$$.exe; then
- # Don't use ln at all; we don't have any links
- as_ln_s='cp -p'
- else
+if (echo >conf$$.file) 2>/dev/null; then
+ if ln -s conf$$.file conf$$ 2>/dev/null; then
as_ln_s='ln -s'
+ # ... but there are two gotchas:
+ # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
+ # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
+ # In both cases, we have to default to `cp -pR'.
+ ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
+ as_ln_s='cp -pR'
+ elif ln conf$$.file conf$$ 2>/dev/null; then
+ as_ln_s=ln
+ else
+ as_ln_s='cp -pR'
fi
-elif ln conf$$.file conf$$ 2>/dev/null; then
- as_ln_s=ln
else
- as_ln_s='cp -p'
+ as_ln_s='cp -pR'
fi
-rm -f conf$$ conf$$.exe conf$$.file
+rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
+rmdir conf$$.dir 2>/dev/null
+
+
+# as_fn_mkdir_p
+# -------------
+# Create "$as_dir" as a directory, including parents if necessary.
+as_fn_mkdir_p ()
+{
+
+ case $as_dir in #(
+ -*) as_dir=./$as_dir;;
+ esac
+ test -d "$as_dir" || eval $as_mkdir_p || {
+ as_dirs=
+ while :; do
+ case $as_dir in #(
+ *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
+ *) as_qdir=$as_dir;;
+ esac
+ as_dirs="'$as_qdir' $as_dirs"
+ as_dir=`$as_dirname -- "$as_dir" ||
+$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+ X"$as_dir" : 'X\(//\)[^/]' \| \
+ X"$as_dir" : 'X\(//\)$' \| \
+ X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X"$as_dir" |
+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+ s//\1/
+ q
+ }
+ /^X\(\/\/\)[^/].*/{
+ s//\1/
+ q
+ }
+ /^X\(\/\/\)$/{
+ s//\1/
+ q
+ }
+ /^X\(\/\).*/{
+ s//\1/
+ q
+ }
+ s/.*/./; q'`
+ test -d "$as_dir" && break
+ done
+ test -z "$as_dirs" || eval "mkdir $as_dirs"
+ } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir"
+
+} # as_fn_mkdir_p
if mkdir -p . 2>/dev/null; then
- as_mkdir_p=:
+ as_mkdir_p='mkdir -p "$as_dir"'
else
test -d ./-p && rmdir ./-p
as_mkdir_p=false
fi
-as_executable_p="test -f"
+
+# as_fn_executable_p FILE
+# -----------------------
+# Test if FILE is an executable regular file.
+as_fn_executable_p ()
+{
+ test -f "$1" && test -x "$1"
+} # as_fn_executable_p
+as_test_x='test -x'
+as_executable_p=as_fn_executable_p
# Sed expression to map a string onto a valid CPP name.
as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
@@ -5751,31 +5350,20 @@ as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
-# IFS
-# We need space, tab and new line, in precisely that order.
-as_nl='
-'
-IFS=" $as_nl"
-
-# CDPATH.
-$as_unset CDPATH
-
exec 6>&1
-
-# Open the log real soon, to keep \$[0] and so on meaningful, and to
+## ----------------------------------- ##
+## Main body of $CONFIG_STATUS script. ##
+## ----------------------------------- ##
+_ASEOF
+test $as_write_fail = 0 && chmod +x $CONFIG_STATUS || ac_write_fail=1
+
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+# Save the log message, to keep $0 and so on meaningful, and to
# report actual input values of CONFIG_FILES etc. instead of their
-# values after options handling. Logging --version etc. is OK.
-exec 5>>config.log
-{
- echo
- sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX
-## Running $as_me. ##
-_ASBOX
-} >&5
-cat >&5 <<_CSEOF
-
+# values after options handling.
+ac_log="
This file was extended by $as_me, which was
-generated by GNU Autoconf 2.59. Invocation command line was
+generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
CONFIG_HEADERS = $CONFIG_HEADERS
@@ -5783,124 +5371,116 @@ generated by GNU Autoconf 2.59. Invocation command line was
CONFIG_COMMANDS = $CONFIG_COMMANDS
$ $0 $@
-_CSEOF
-echo "on `(hostname || uname -n) 2>/dev/null | sed 1q`" >&5
-echo >&5
+on `(hostname || uname -n) 2>/dev/null | sed 1q`
+"
+
_ACEOF
-# Files that config.status was made for.
-if test -n "$ac_config_files"; then
- echo "config_files=\"$ac_config_files\"" >>$CONFIG_STATUS
-fi
+case $ac_config_files in *"
+"*) set x $ac_config_files; shift; ac_config_files=$*;;
+esac
-if test -n "$ac_config_headers"; then
- echo "config_headers=\"$ac_config_headers\"" >>$CONFIG_STATUS
-fi
-if test -n "$ac_config_links"; then
- echo "config_links=\"$ac_config_links\"" >>$CONFIG_STATUS
-fi
-if test -n "$ac_config_commands"; then
- echo "config_commands=\"$ac_config_commands\"" >>$CONFIG_STATUS
-fi
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+# Files that config.status was made for.
+config_files="$ac_config_files"
-cat >>$CONFIG_STATUS <<\_ACEOF
+_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
ac_cs_usage="\
-\`$as_me' instantiates files from templates according to the
-current configuration.
+\`$as_me' instantiates files and other configuration actions
+from templates according to the current configuration. Unless the files
+and actions are specified as TAGs, all are instantiated by default.
-Usage: $0 [OPTIONS] [FILE]...
+Usage: $0 [OPTION]... [TAG]...
-h, --help print this help, then exit
- -V, --version print version number, then exit
- -q, --quiet do not print progress messages
+ -V, --version print version number and configuration settings, then exit
+ --config print configuration, then exit
+ -q, --quiet, --silent
+ do not print progress messages
-d, --debug don't remove temporary files
--recheck update $as_me by reconfiguring in the same conditions
- --file=FILE[:TEMPLATE]
- instantiate the configuration file FILE
+ --file=FILE[:TEMPLATE]
+ instantiate the configuration file FILE
Configuration files:
$config_files
-Report bugs to <bug-autoconf at gnu.org>."
-_ACEOF
+Report bugs to the package provider."
-cat >>$CONFIG_STATUS <<_ACEOF
+_ACEOF
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
config.status
-configured by $0, generated by GNU Autoconf 2.59,
- with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
+configured by $0, generated by GNU Autoconf 2.69,
+ with options \\"\$ac_cs_config\\"
-Copyright (C) 2003 Free Software Foundation, Inc.
+Copyright (C) 2012 Free Software Foundation, Inc.
This config.status script is free software; the Free Software Foundation
gives unlimited permission to copy, distribute and modify it."
-srcdir=$srcdir
+
+ac_pwd='$ac_pwd'
+srcdir='$srcdir'
+test -n "\$AWK" || AWK=awk
_ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF
-# If no file are specified by the user, then we need to provide default
-# value. By we need to know if files were specified by the user.
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+# The default lists apply if the user does not specify any file.
ac_need_defaults=:
while test $# != 0
do
case $1 in
- --*=*)
- ac_option=`expr "x$1" : 'x\([^=]*\)='`
- ac_optarg=`expr "x$1" : 'x[^=]*=\(.*\)'`
+ --*=?*)
+ ac_option=`expr "X$1" : 'X\([^=]*\)='`
+ ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'`
ac_shift=:
;;
- -*)
+ --*=)
+ ac_option=`expr "X$1" : 'X\([^=]*\)='`
+ ac_optarg=
+ ac_shift=:
+ ;;
+ *)
ac_option=$1
ac_optarg=$2
ac_shift=shift
;;
- *) # This is not an option, so the user has probably given explicit
- # arguments.
- ac_option=$1
- ac_need_defaults=false;;
esac
case $ac_option in
# Handling of the options.
-_ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF
-recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
ac_cs_recheck=: ;;
- --version | --vers* | -V )
- echo "$ac_cs_version"; exit 0 ;;
- --he | --h)
- # Conflict between --help and --header
- { { echo "$as_me:$LINENO: error: ambiguous option: $1
-Try \`$0 --help' for more information." >&5
-echo "$as_me: error: ambiguous option: $1
-Try \`$0 --help' for more information." >&2;}
- { (exit 1); exit 1; }; };;
- --help | --hel | -h )
- echo "$ac_cs_usage"; exit 0 ;;
- --debug | --d* | -d )
+ --version | --versio | --versi | --vers | --ver | --ve | --v | -V )
+ $as_echo "$ac_cs_version"; exit ;;
+ --config | --confi | --conf | --con | --co | --c )
+ $as_echo "$ac_cs_config"; exit ;;
+ --debug | --debu | --deb | --de | --d | -d )
debug=: ;;
--file | --fil | --fi | --f )
$ac_shift
- CONFIG_FILES="$CONFIG_FILES $ac_optarg"
- ac_need_defaults=false;;
- --header | --heade | --head | --hea )
- $ac_shift
- CONFIG_HEADERS="$CONFIG_HEADERS $ac_optarg"
+ case $ac_optarg in
+ *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
+ '') as_fn_error $? "missing file argument" ;;
+ esac
+ as_fn_append CONFIG_FILES " '$ac_optarg'"
ac_need_defaults=false;;
+ --he | --h | --help | --hel | -h )
+ $as_echo "$ac_cs_usage"; exit ;;
-q | -quiet | --quiet | --quie | --qui | --qu | --q \
| -silent | --silent | --silen | --sile | --sil | --si | --s)
ac_cs_silent=: ;;
# This is an error.
- -*) { { echo "$as_me:$LINENO: error: unrecognized option: $1
-Try \`$0 --help' for more information." >&5
-echo "$as_me: error: unrecognized option: $1
-Try \`$0 --help' for more information." >&2;}
- { (exit 1); exit 1; }; } ;;
+ -*) as_fn_error $? "unrecognized option: \`$1'
+Try \`$0 --help' for more information." ;;
- *) ac_config_targets="$ac_config_targets $1" ;;
+ *) as_fn_append ac_config_targets " $1"
+ ac_need_defaults=false ;;
esac
shift
@@ -5914,30 +5494,44 @@ if $ac_cs_silent; then
fi
_ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
if \$ac_cs_recheck; then
- echo "running $SHELL $0 " $ac_configure_args \$ac_configure_extra_args " --no-create --no-recursion" >&6
- exec $SHELL $0 $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
+ set X $SHELL '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
+ shift
+ \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6
+ CONFIG_SHELL='$SHELL'
+ export CONFIG_SHELL
+ exec "\$@"
fi
_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+exec 5>>config.log
+{
+ echo
+ sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX
+## Running $as_me. ##
+_ASBOX
+ $as_echo "$ac_log"
+} >&5
+_ACEOF
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-
-
-cat >>$CONFIG_STATUS <<\_ACEOF
+# Handling of arguments.
for ac_config_target in $ac_config_targets
do
- case "$ac_config_target" in
- # Handling of arguments.
- "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;;
- *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
-echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
- { (exit 1); exit 1; }; };;
+ case $ac_config_target in
+ "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
+
+ *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
esac
done
+
# If the user did not use the arguments to specify the items to instantiate,
# then the envvar interface is used. Set only those that are not.
# We use the long form for the default assignment because of an extremely
@@ -5947,350 +5541,414 @@ if $ac_need_defaults; then
fi
# Have a temporary directory for convenience. Make it in the build tree
-# simply because there is no reason to put it here, and in addition,
+# simply because there is no reason against having it here, and in addition,
# creating and moving files from /tmp can sometimes cause problems.
-# Create a temporary directory, and hook for its removal unless debugging.
+# Hook for its removal unless debugging.
+# Note that there is a small window in which the directory will not be cleaned:
+# after its creation but before its name has been assigned to `$tmp'.
$debug ||
{
- trap 'exit_status=$?; rm -rf $tmp && exit $exit_status' 0
- trap '{ (exit 1); exit 1; }' 1 2 13 15
+ tmp= ac_tmp=
+ trap 'exit_status=$?
+ : "${ac_tmp:=$tmp}"
+ { test ! -d "$ac_tmp" || rm -fr "$ac_tmp"; } && exit $exit_status
+' 0
+ trap 'as_fn_exit 1' 1 2 13 15
}
-
# Create a (secure) tmp directory for tmp files.
{
- tmp=`(umask 077 && mktemp -d -q "./confstatXXXXXX") 2>/dev/null` &&
- test -n "$tmp" && test -d "$tmp"
+ tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` &&
+ test -d "$tmp"
} ||
{
- tmp=./confstat$$-$RANDOM
- (umask 077 && mkdir $tmp)
-} ||
+ tmp=./conf$$-$RANDOM
+ (umask 077 && mkdir "$tmp")
+} || as_fn_error $? "cannot create a temporary directory in ." "$LINENO" 5
+ac_tmp=$tmp
+
+# Set up the scripts for CONFIG_FILES section.
+# No need to generate them if there are no CONFIG_FILES.
+# This happens for instance with `./config.status config.h'.
+if test -n "$CONFIG_FILES"; then
+
+
+ac_cr=`echo X | tr X '\015'`
+# On cygwin, bash can eat \r inside `` if the user requested igncr.
+# But we know of no other shell where ac_cr would be empty at this
+# point, so we can use a bashism as a fallback.
+if test "x$ac_cr" = x; then
+ eval ac_cr=\$\'\\r\'
+fi
+ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' </dev/null 2>/dev/null`
+if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then
+ ac_cs_awk_cr='\\r'
+else
+ ac_cs_awk_cr=$ac_cr
+fi
+
+echo 'BEGIN {' >"$ac_tmp/subs1.awk" &&
+_ACEOF
+
+
+{
+ echo "cat >conf$$subs.awk <<_ACEOF" &&
+ echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' &&
+ echo "_ACEOF"
+} >conf$$subs.sh ||
+ as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
+ac_delim_num=`echo "$ac_subst_vars" | grep -c '^'`
+ac_delim='%!_!# '
+for ac_last_try in false false false false false :; do
+ . ./conf$$subs.sh ||
+ as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
+
+ ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X`
+ if test $ac_delim_n = $ac_delim_num; then
+ break
+ elif $ac_last_try; then
+ as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
+ else
+ ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
+ fi
+done
+rm -f conf$$subs.sh
+
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+cat >>"\$ac_tmp/subs1.awk" <<\\_ACAWK &&
+_ACEOF
+sed -n '
+h
+s/^/S["/; s/!.*/"]=/
+p
+g
+s/^[^!]*!//
+:repl
+t repl
+s/'"$ac_delim"'$//
+t delim
+:nl
+h
+s/\(.\{148\}\)..*/\1/
+t more1
+s/["\\]/\\&/g; s/^/"/; s/$/\\n"\\/
+p
+n
+b repl
+:more1
+s/["\\]/\\&/g; s/^/"/; s/$/"\\/
+p
+g
+s/.\{148\}//
+t nl
+:delim
+h
+s/\(.\{148\}\)..*/\1/
+t more2
+s/["\\]/\\&/g; s/^/"/; s/$/"/
+p
+b
+:more2
+s/["\\]/\\&/g; s/^/"/; s/$/"\\/
+p
+g
+s/.\{148\}//
+t delim
+' <conf$$subs.awk | sed '
+/^[^""]/{
+ N
+ s/\n//
+}
+' >>$CONFIG_STATUS || ac_write_fail=1
+rm -f conf$$subs.awk
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+_ACAWK
+cat >>"\$ac_tmp/subs1.awk" <<_ACAWK &&
+ for (key in S) S_is_set[key] = 1
+ FS = ""
+
+}
{
- echo "$me: cannot create a temporary directory in ." >&2
- { (exit 1); exit 1; }
+ line = $ 0
+ nfields = split(line, field, "@")
+ substed = 0
+ len = length(field[1])
+ for (i = 2; i < nfields; i++) {
+ key = field[i]
+ keylen = length(key)
+ if (S_is_set[key]) {
+ value = S[key]
+ line = substr(line, 1, len) "" value "" substr(line, len + keylen + 3)
+ len += length(value) + length(field[++i])
+ substed = 1
+ } else
+ len += 1 + keylen
+ }
+
+ print line
}
+_ACAWK
+_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+if sed "s/$ac_cr//" < /dev/null > /dev/null 2>&1; then
+ sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g"
+else
+ cat
+fi < "$ac_tmp/subs1.awk" > "$ac_tmp/subs.awk" \
+ || as_fn_error $? "could not setup config files machinery" "$LINENO" 5
_ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF
+# VPATH may cause trouble with some makes, so we remove sole $(srcdir),
+# ${srcdir} and @srcdir@ entries from VPATH if srcdir is ".", strip leading and
+# trailing colons and then remove the whole line if VPATH becomes empty
+# (actually we leave an empty line to preserve line numbers).
+if test "x$srcdir" = x.; then
+ ac_vpsub='/^[ ]*VPATH[ ]*=[ ]*/{
+h
+s///
+s/^/:/
+s/[ ]*$/:/
+s/:\$(srcdir):/:/g
+s/:\${srcdir}:/:/g
+s/:@srcdir@:/:/g
+s/^:*//
+s/:*$//
+x
+s/\(=[ ]*\).*/\1/
+G
+s/\n//
+s/^[^=]*=[ ]*$//
+}'
+fi
-#
-# CONFIG_FILES section.
-#
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+fi # test -n "$CONFIG_FILES"
-# No need to generate the scripts if there are no CONFIG_FILES.
-# This happens for instance when ./config.status config.h
-if test -n "\$CONFIG_FILES"; then
- # Protect against being on the right side of a sed subst in config.status.
- sed 's/,@/@@/; s/@,/@@/; s/,;t t\$/@;t t/; /@;t t\$/s/[\\\\&,]/\\\\&/g;
- s/@@/,@/; s/@@/@,/; s/@;t t\$/,;t t/' >\$tmp/subs.sed <<\\CEOF
-s, at SHELL@,$SHELL,;t t
-s, at PATH_SEPARATOR@,$PATH_SEPARATOR,;t t
-s, at PACKAGE_NAME@,$PACKAGE_NAME,;t t
-s, at PACKAGE_TARNAME@,$PACKAGE_TARNAME,;t t
-s, at PACKAGE_VERSION@,$PACKAGE_VERSION,;t t
-s, at PACKAGE_STRING@,$PACKAGE_STRING,;t t
-s, at PACKAGE_BUGREPORT@,$PACKAGE_BUGREPORT,;t t
-s, at exec_prefix@,$exec_prefix,;t t
-s, at prefix@,$prefix,;t t
-s, at program_transform_name@,$program_transform_name,;t t
-s, at bindir@,$bindir,;t t
-s, at sbindir@,$sbindir,;t t
-s, at libexecdir@,$libexecdir,;t t
-s, at datadir@,$datadir,;t t
-s, at sysconfdir@,$sysconfdir,;t t
-s, at sharedstatedir@,$sharedstatedir,;t t
-s, at localstatedir@,$localstatedir,;t t
-s, at libdir@,$libdir,;t t
-s, at includedir@,$includedir,;t t
-s, at oldincludedir@,$oldincludedir,;t t
-s, at infodir@,$infodir,;t t
-s, at mandir@,$mandir,;t t
-s, at build_alias@,$build_alias,;t t
-s, at host_alias@,$host_alias,;t t
-s, at target_alias@,$target_alias,;t t
-s, at DEFS@,$DEFS,;t t
-s, at ECHO_C@,$ECHO_C,;t t
-s, at ECHO_N@,$ECHO_N,;t t
-s, at ECHO_T@,$ECHO_T,;t t
-s, at LIBS@,$LIBS,;t t
-s, at TCL_LIB@,$TCL_LIB,;t t
-s, at TK_LIB@,$TK_LIB,;t t
-s, at CFITSIODIR@,$CFITSIODIR,;t t
-s, at C_LIB_OPTION@,$C_LIB_OPTION,;t t
-s, at UNAME@,$UNAME,;t t
-s, at BINDIR@,$BINDIR,;t t
-s, at BIN_EXT@,$BIN_EXT,;t t
-s, at EXT@,$EXT,;t t
-s, at CC@,$CC,;t t
-s, at CFLAGS@,$CFLAGS,;t t
-s, at LDFLAGS@,$LDFLAGS,;t t
-s, at CPPFLAGS@,$CPPFLAGS,;t t
-s, at ac_ct_CC@,$ac_ct_CC,;t t
-s, at EXEEXT@,$EXEEXT,;t t
-s, at OBJEXT@,$OBJEXT,;t t
-s, at RANLIB@,$RANLIB,;t t
-s, at ac_ct_RANLIB@,$ac_ct_RANLIB,;t t
-s, at CPP@,$CPP,;t t
-s, at USE_X@,$USE_X,;t t
-s, at XINCLUDES@,$XINCLUDES,;t t
-s, at XLIBPTH@,$XLIBPTH,;t t
-s, at XLIBS@,$XLIBS,;t t
-s, at EGREP@,$EGREP,;t t
-s, at ALLOCA@,$ALLOCA,;t t
-s, at LD_FLAGS@,$LD_FLAGS,;t t
-s, at SHLIB_LD@,$SHLIB_LD,;t t
-s, at SHLIB_LD_LIBS@,$SHLIB_LD_LIBS,;t t
-s, at SHLIB_SUFFIX@,$SHLIB_SUFFIX,;t t
-s, at LIBOBJS@,$LIBOBJS,;t t
-s, at TCL_PATH@,$TCL_PATH,;t t
-s, at TCL_INC_PATH@,$TCL_INC_PATH,;t t
-s, at ITCL_PATH@,$ITCL_PATH,;t t
-s, at TK_PATH@,$TK_PATH,;t t
-s, at TK_INC_PATH@,$TK_INC_PATH,;t t
-s, at LTLIBOBJS@,$LTLIBOBJS,;t t
-CEOF
-_ACEOF
+eval set X " :F $CONFIG_FILES "
+shift
+for ac_tag
+do
+ case $ac_tag in
+ :[FHLC]) ac_mode=$ac_tag; continue;;
+ esac
+ case $ac_mode$ac_tag in
+ :[FHL]*:*);;
+ :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5;;
+ :[FH]-) ac_tag=-:-;;
+ :[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
+ esac
+ ac_save_IFS=$IFS
+ IFS=:
+ set x $ac_tag
+ IFS=$ac_save_IFS
+ shift
+ ac_file=$1
+ shift
- cat >>$CONFIG_STATUS <<\_ACEOF
- # Split the substitutions into bite-sized pieces for seds with
- # small command number limits, like on Digital OSF/1 and HP-UX.
- ac_max_sed_lines=48
- ac_sed_frag=1 # Number of current file.
- ac_beg=1 # First line for current file.
- ac_end=$ac_max_sed_lines # Line after last line for current file.
- ac_more_lines=:
- ac_sed_cmds=
- while $ac_more_lines; do
- if test $ac_beg -gt 1; then
- sed "1,${ac_beg}d; ${ac_end}q" $tmp/subs.sed >$tmp/subs.frag
- else
- sed "${ac_end}q" $tmp/subs.sed >$tmp/subs.frag
- fi
- if test ! -s $tmp/subs.frag; then
- ac_more_lines=false
- else
- # The purpose of the label and of the branching condition is to
- # speed up the sed processing (if there are no `@' at all, there
- # is no need to browse any of the substitutions).
- # These are the two extra sed commands mentioned above.
- (echo ':t
- /@[a-zA-Z_][a-zA-Z_0-9]*@/!b' && cat $tmp/subs.frag) >$tmp/subs-$ac_sed_frag.sed
- if test -z "$ac_sed_cmds"; then
- ac_sed_cmds="sed -f $tmp/subs-$ac_sed_frag.sed"
- else
- ac_sed_cmds="$ac_sed_cmds | sed -f $tmp/subs-$ac_sed_frag.sed"
- fi
- ac_sed_frag=`expr $ac_sed_frag + 1`
- ac_beg=$ac_end
- ac_end=`expr $ac_end + $ac_max_sed_lines`
+ case $ac_mode in
+ :L) ac_source=$1;;
+ :[FH])
+ ac_file_inputs=
+ for ac_f
+ do
+ case $ac_f in
+ -) ac_f="$ac_tmp/stdin";;
+ *) # Look for the file first in the build tree, then in the source tree
+ # (if the path is not absolute). The absolute path cannot be DOS-style,
+ # because $ac_f cannot contain `:'.
+ test -f "$ac_f" ||
+ case $ac_f in
+ [\\/$]*) false;;
+ *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
+ esac ||
+ as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5;;
+ esac
+ case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
+ as_fn_append ac_file_inputs " '$ac_f'"
+ done
+
+ # Let's still pretend it is `configure' which instantiates (i.e., don't
+ # use $as_me), people would be surprised to read:
+ # /* config.h. Generated by config.status. */
+ configure_input='Generated from '`
+ $as_echo "$*" | sed 's|^[^:]*/||;s|:[^:]*/|, |g'
+ `' by configure.'
+ if test x"$ac_file" != x-; then
+ configure_input="$ac_file. $configure_input"
+ { $as_echo "$as_me:${as_lineno-$LINENO}: creating $ac_file" >&5
+$as_echo "$as_me: creating $ac_file" >&6;}
fi
- done
- if test -z "$ac_sed_cmds"; then
- ac_sed_cmds=cat
- fi
-fi # test -n "$CONFIG_FILES"
+ # Neutralize special characters interpreted by sed in replacement strings.
+ case $configure_input in #(
+ *\&* | *\|* | *\\* )
+ ac_sed_conf_input=`$as_echo "$configure_input" |
+ sed 's/[\\\\&|]/\\\\&/g'`;; #(
+ *) ac_sed_conf_input=$configure_input;;
+ esac
-_ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF
-for ac_file in : $CONFIG_FILES; do test "x$ac_file" = x: && continue
- # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in".
- case $ac_file in
- - | *:- | *:-:* ) # input from stdin
- cat >$tmp/stdin
- ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
- ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
- *:* ) ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
- ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
- * ) ac_file_in=$ac_file.in ;;
+ case $ac_tag in
+ *:-:* | *:-) cat >"$ac_tmp/stdin" \
+ || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;;
+ esac
+ ;;
esac
- # Compute @srcdir@, @top_srcdir@, and @INSTALL@ for subdirectories.
- ac_dir=`(dirname "$ac_file") 2>/dev/null ||
+ ac_dir=`$as_dirname -- "$ac_file" ||
$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
X"$ac_file" : 'X\(//\)[^/]' \| \
X"$ac_file" : 'X\(//\)$' \| \
- X"$ac_file" : 'X\(/\)' \| \
- . : '\(.\)' 2>/dev/null ||
-echo X"$ac_file" |
- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
- /^X\(\/\/\)[^/].*/{ s//\1/; q; }
- /^X\(\/\/\)$/{ s//\1/; q; }
- /^X\(\/\).*/{ s//\1/; q; }
- s/.*/./; q'`
- { if $as_mkdir_p; then
- mkdir -p "$ac_dir"
- else
- as_dir="$ac_dir"
- as_dirs=
- while test ! -d "$as_dir"; do
- as_dirs="$as_dir $as_dirs"
- as_dir=`(dirname "$as_dir") 2>/dev/null ||
-$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
- X"$as_dir" : 'X\(//\)[^/]' \| \
- X"$as_dir" : 'X\(//\)$' \| \
- X"$as_dir" : 'X\(/\)' \| \
- . : '\(.\)' 2>/dev/null ||
-echo X"$as_dir" |
- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
- /^X\(\/\/\)[^/].*/{ s//\1/; q; }
- /^X\(\/\/\)$/{ s//\1/; q; }
- /^X\(\/\).*/{ s//\1/; q; }
- s/.*/./; q'`
- done
- test ! -n "$as_dirs" || mkdir $as_dirs
- fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5
-echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;}
- { (exit 1); exit 1; }; }; }
-
+ X"$ac_file" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X"$ac_file" |
+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+ s//\1/
+ q
+ }
+ /^X\(\/\/\)[^/].*/{
+ s//\1/
+ q
+ }
+ /^X\(\/\/\)$/{
+ s//\1/
+ q
+ }
+ /^X\(\/\).*/{
+ s//\1/
+ q
+ }
+ s/.*/./; q'`
+ as_dir="$ac_dir"; as_fn_mkdir_p
ac_builddir=.
-if test "$ac_dir" != .; then
- ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
- # A "../" for each directory in $ac_dir_suffix.
- ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'`
-else
- ac_dir_suffix= ac_top_builddir=
-fi
+case "$ac_dir" in
+.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
+*)
+ ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'`
+ # A ".." for each directory in $ac_dir_suffix.
+ ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
+ case $ac_top_builddir_sub in
+ "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
+ *) ac_top_build_prefix=$ac_top_builddir_sub/ ;;
+ esac ;;
+esac
+ac_abs_top_builddir=$ac_pwd
+ac_abs_builddir=$ac_pwd$ac_dir_suffix
+# for backward compatibility:
+ac_top_builddir=$ac_top_build_prefix
case $srcdir in
- .) # No --srcdir option. We are building in place.
+ .) # We are building in place.
ac_srcdir=.
- if test -z "$ac_top_builddir"; then
- ac_top_srcdir=.
- else
- ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'`
- fi ;;
- [\\/]* | ?:[\\/]* ) # Absolute path.
+ ac_top_srcdir=$ac_top_builddir_sub
+ ac_abs_top_srcdir=$ac_pwd ;;
+ [\\/]* | ?:[\\/]* ) # Absolute name.
ac_srcdir=$srcdir$ac_dir_suffix;
- ac_top_srcdir=$srcdir ;;
- *) # Relative path.
- ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix
- ac_top_srcdir=$ac_top_builddir$srcdir ;;
+ ac_top_srcdir=$srcdir
+ ac_abs_top_srcdir=$srcdir ;;
+ *) # Relative name.
+ ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix
+ ac_top_srcdir=$ac_top_build_prefix$srcdir
+ ac_abs_top_srcdir=$ac_pwd/$srcdir ;;
esac
+ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
-# Do not use `cd foo && pwd` to compute absolute paths, because
-# the directories may not exist.
-case `pwd` in
-.) ac_abs_builddir="$ac_dir";;
-*)
- case "$ac_dir" in
- .) ac_abs_builddir=`pwd`;;
- [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";;
- *) ac_abs_builddir=`pwd`/"$ac_dir";;
- esac;;
-esac
-case $ac_abs_builddir in
-.) ac_abs_top_builddir=${ac_top_builddir}.;;
-*)
- case ${ac_top_builddir}. in
- .) ac_abs_top_builddir=$ac_abs_builddir;;
- [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;;
- *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;;
- esac;;
-esac
-case $ac_abs_builddir in
-.) ac_abs_srcdir=$ac_srcdir;;
-*)
- case $ac_srcdir in
- .) ac_abs_srcdir=$ac_abs_builddir;;
- [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;;
- *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;;
- esac;;
-esac
-case $ac_abs_builddir in
-.) ac_abs_top_srcdir=$ac_top_srcdir;;
-*)
- case $ac_top_srcdir in
- .) ac_abs_top_srcdir=$ac_abs_builddir;;
- [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;;
- *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;;
- esac;;
-esac
+ case $ac_mode in
+ :F)
+ #
+ # CONFIG_FILE
+ #
+_ACEOF
- if test x"$ac_file" != x-; then
- { echo "$as_me:$LINENO: creating $ac_file" >&5
-echo "$as_me: creating $ac_file" >&6;}
- rm -f "$ac_file"
- fi
- # Let's still pretend it is `configure' which instantiates (i.e., don't
- # use $as_me), people would be surprised to read:
- # /* config.h. Generated by config.status. */
- if test x"$ac_file" = x-; then
- configure_input=
- else
- configure_input="$ac_file. "
- fi
- configure_input=$configure_input"Generated from `echo $ac_file_in |
- sed 's,.*/,,'` by configure."
-
- # First look for the input files in the build tree, otherwise in the
- # src tree.
- ac_file_inputs=`IFS=:
- for f in $ac_file_in; do
- case $f in
- -) echo $tmp/stdin ;;
- [\\/$]*)
- # Absolute (can't be DOS-style, as IFS=:)
- test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
-echo "$as_me: error: cannot find input file: $f" >&2;}
- { (exit 1); exit 1; }; }
- echo "$f";;
- *) # Relative
- if test -f "$f"; then
- # Build tree
- echo "$f"
- elif test -f "$srcdir/$f"; then
- # Source tree
- echo "$srcdir/$f"
- else
- # /dev/null tree
- { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
-echo "$as_me: error: cannot find input file: $f" >&2;}
- { (exit 1); exit 1; }; }
- fi;;
- esac
- done` || { (exit 1); exit 1; }
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+# If the template does not know about datarootdir, expand it.
+# FIXME: This hack should be removed a few years after 2.60.
+ac_datarootdir_hack=; ac_datarootdir_seen=
+ac_sed_dataroot='
+/datarootdir/ {
+ p
+ q
+}
+/@datadir@/p
+/@docdir@/p
+/@infodir@/p
+/@localedir@/p
+/@mandir@/p'
+case `eval "sed -n \"\$ac_sed_dataroot\" $ac_file_inputs"` in
+*datarootdir*) ac_datarootdir_seen=yes;;
+*@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*)
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5
+$as_echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}
+_ACEOF
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+ ac_datarootdir_hack='
+ s&@datadir@&$datadir&g
+ s&@docdir@&$docdir&g
+ s&@infodir@&$infodir&g
+ s&@localedir@&$localedir&g
+ s&@mandir@&$mandir&g
+ s&\\\${datarootdir}&$datarootdir&g' ;;
+esac
_ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF
- sed "$ac_vpsub
+
+# Neutralize VPATH when `$srcdir' = `.'.
+# Shell code in configure.ac might set extrasub.
+# FIXME: do we really want to maintain this feature?
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+ac_sed_extra="$ac_vpsub
$extrasub
_ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
:t
/@[a-zA-Z_][a-zA-Z_0-9]*@/!b
-s, at configure_input@,$configure_input,;t t
-s, at srcdir@,$ac_srcdir,;t t
-s, at abs_srcdir@,$ac_abs_srcdir,;t t
-s, at top_srcdir@,$ac_top_srcdir,;t t
-s, at abs_top_srcdir@,$ac_abs_top_srcdir,;t t
-s, at builddir@,$ac_builddir,;t t
-s, at abs_builddir@,$ac_abs_builddir,;t t
-s, at top_builddir@,$ac_top_builddir,;t t
-s, at abs_top_builddir@,$ac_abs_top_builddir,;t t
-" $ac_file_inputs | (eval "$ac_sed_cmds") >$tmp/out
- rm -f $tmp/stdin
- if test x"$ac_file" != x-; then
- mv $tmp/out $ac_file
- else
- cat $tmp/out
- rm -f $tmp/out
- fi
+s|@configure_input@|$ac_sed_conf_input|;t t
+s&@top_builddir@&$ac_top_builddir_sub&;t t
+s&@top_build_prefix@&$ac_top_build_prefix&;t t
+s&@srcdir@&$ac_srcdir&;t t
+s&@abs_srcdir@&$ac_abs_srcdir&;t t
+s&@top_srcdir@&$ac_top_srcdir&;t t
+s&@abs_top_srcdir@&$ac_abs_top_srcdir&;t t
+s&@builddir@&$ac_builddir&;t t
+s&@abs_builddir@&$ac_abs_builddir&;t t
+s&@abs_top_builddir@&$ac_abs_top_builddir&;t t
+$ac_datarootdir_hack
+"
+eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$ac_tmp/subs.awk" \
+ >$ac_tmp/out || as_fn_error $? "could not create $ac_file" "$LINENO" 5
+
+test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
+ { ac_out=`sed -n '/\${datarootdir}/p' "$ac_tmp/out"`; test -n "$ac_out"; } &&
+ { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' \
+ "$ac_tmp/out"`; test -z "$ac_out"; } &&
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir'
+which seems to be undefined. Please make sure it is defined" >&5
+$as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
+which seems to be undefined. Please make sure it is defined" >&2;}
+
+ rm -f "$ac_tmp/stdin"
+ case $ac_file in
+ -) cat "$ac_tmp/out" && rm -f "$ac_tmp/out";;
+ *) rm -f "$ac_file" && mv "$ac_tmp/out" "$ac_file";;
+ esac \
+ || as_fn_error $? "could not create $ac_file" "$LINENO" 5
+ ;;
-done
-_ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF
-{ (exit 0); exit 0; }
+ esac
+
+done # for ac_tag
+
+
+as_fn_exit 0
_ACEOF
-chmod +x $CONFIG_STATUS
ac_clean_files=$ac_clean_files_save
+test $ac_write_fail = 0 ||
+ as_fn_error $? "write failure creating $CONFIG_STATUS" "$LINENO" 5
+
# configure is writing to config.log, and then calls config.status.
# config.status does its own redirection, appending to config.log.
@@ -6310,6 +5968,10 @@ if test "$no_create" != yes; then
exec 5>>config.log
# Use ||, not &&, to avoid exiting from the if with $? = 1, which
# would make configure fail if this is the last instruction.
- $ac_cs_success || { (exit 1); exit 1; }
+ $ac_cs_success || as_fn_exit 1
+fi
+if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5
+$as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
fi
diff --git a/configure.in b/configure.in
index 282a0eb..b765ec9 100644
--- a/configure.in
+++ b/configure.in
@@ -8,13 +8,15 @@ dnl ----------------------------------------------------------------------------
AC_INIT
AC_CONFIG_SRCDIR([Makefile.in])
-AC_REVISION($Revision: 1.16 $)
+AC_REVISION($Revision: 1.19 $)
AC_PREREQ(2.59)
if test $cache_file = ./config.cache; then
cache_file=`pwd`/config.cache
fi
+# Tcl:
+#-------------------------------------------
AC_ARG_WITH(
tcl,
[ --with-tcl Path to tcl library ],
@@ -25,6 +27,7 @@ AC_ARG_WITH(
[ --with-tcl-includes Path to tcl include files ],
TCL_INCLUDES=$withval
)
+AC_SUBST(TCL_PATH)
# Make sure we have tcl.h before proceeding:
#-------------------------------------------
AC_MSG_CHECKING([for tcl header file])
@@ -38,25 +41,13 @@ for dir in $TCL_INCLUDES $prefix/include /usr/include ; do
done
if test -z "$TCL_INC_PATH"; then
AC_MSG_RESULT([no])
- AC_MSG_ERROR(Can't find Tcl header. Use --with-tcl-includes to specify the location of tcl.h on your system.)
+ AC_MSG_ERROR(Cannot find Tcl header. Use --with-tcl-includes to specify the location of tcl.h on your system.)
fi
+AC_SUBST(TCL_INC_PATH)
+
+# CFITSIO:
#-------------------------------------------
AC_ARG_WITH(
- tk,
- [ --with-tk Path to tk library ],
- TK_PATH=$withval
-)
-AC_ARG_WITH(
- tk-includes,
- [ --with-tk-includes Path to tk include files ],
- TK_INC_PATH=$withval
-)
-AC_ARG_WITH(
- itcl,
- [ --with-itcl Path to itcl source ],
- ITCL_PATH=$withval
-)
-AC_ARG_WITH(
cfitsio,
[ --with-cfitsio Path to cfitsio source ],
CFITSIO=$withval
@@ -74,8 +65,10 @@ for dir in $CFITSIO ./cfitsio ; do
done
if test -z "$CFITSIODIR"; then
AC_MSG_RESULT([no])
- AC_MSG_ERROR(Can't find cfitsio. Use --with-cfitsio to specify the location of the cfitsio source code.)
+ AC_MSG_ERROR(Cannot find cfitsio. Use --with-cfitsio to specify the location of the cfitsio source code.)
fi
+AC_SUBST(CFITSIODIR)
+
#-------------------------------------------
AC_ARG_ENABLE(
shared,
@@ -89,13 +82,6 @@ AC_ARG_ENABLE(
[ --enable-static Produce static binaries ],
[ if test $enableval = yes; then lhea_shared=no; fi ]
)
-changequote(,)
-TCL_LIB=`echo $TCL_PATH | sed 's:.*tcl8:tcl8:' | sed 's:.[0-9]/unix$::'`
-TK_LIB=`echo $TK_PATH | sed 's:.*tk8:tk8:' | sed 's:.[0-9]/unix$::'`
-changequote([,])
-AC_SUBST(TCL_LIB)
-AC_SUBST(TK_LIB)
-AC_SUBST(CFITSIODIR)
if test $lhea_shared = yes; then
C_LIB_OPTION=shared
@@ -125,37 +111,19 @@ if test "x$BINDIR" = x; then
BINDIR=CYGWIN32_`$UNAME -a 2> /dev/null | awk '{ print $4 }'`
lhea_machine=
BIN_EXT=".exe"
- EXT=lnx
- ;;
- IRIX*)
- AC_MSG_WARN(IRIX support is marginal)
- EXT=sgi
- ;;
- HP-UX*)
- AC_MSG_WARN(HP-UX support is marginal)
- EXT=hpu
- lhea_machine=`$UNAME -m 2> /dev/null | tr '/' ' ' | awk '{ print $2 }'`
+ EXT=win
;;
Linux*)
EXT=lnx
;;
- OSF1*)
- EXT=osf
- ;;
- SunOS_4*)
- AC_MSG_WARN(SunOS 4.x is not supported!)
- AC_MSG_WARN(PROCEED AT YOUR OWN RISK!)
- EXT=sun
- lhea_machine=sparc
+ Darwin*)
+ EXT=darwin
+ lhea_machine=`$UNAME -p`
;;
SunOS_5*)
EXT=sol
lhea_machine=`$UNAME -p`
;;
- Darwin_*)
- EXT=darwin
- lhea_machine=`$UNAME -p`
- ;;
*)
AC_MSG_ERROR(Unable to recognize your system. Please make sure this platform is supported.)
;;
@@ -181,7 +149,7 @@ AC_PROG_CC
if test "$cross_compiling" = yes; then
AC_MSG_WARN(Cannot run a simple C executable on your system:)
AC_MSG_WARN(There may be something wrong with your compiler,)
- AC_MSG_WARN(or perhaps you're trying to cross-compile?)
+ AC_MSG_WARN(or perhaps you are trying to cross-compile?)
AC_MSG_WARN(Cross-compiling is not supported within HEAsoft.)
AC_MSG_WARN(Please make sure your compiler is working.)
AC_MSG_WARN(Contact the FTOOLS help desk for further assistance.)
@@ -195,10 +163,6 @@ AC_PROG_RANLIB
if test $EXT = darwin; then
RANLIB="$RANLIB -cs"
fi
-# RANLIB on IRIX is flaky
-if test $EXT = sgi; then
- RANLIB=:
-fi
#-------------------------------------------------------------------------------
@@ -211,14 +175,21 @@ XLIBPTH=
XINCLUDES=
# socket and nsl libraries -- only if needed
-AC_CHECK_FUNC(gethostbyname, , AC_CHECK_LIB(nsl, gethostbyname))
-AC_CHECK_FUNCS(
- connect accept,
- ,
- AC_CHECK_LIB(socket, main, , , [ $XLIBS ])
-)
+AC_CHECK_FUNC(gethostbyname, [], [AC_CHECK_LIB(nsl, gethostbyname)])
+AC_CHECK_FUNCS(connect accept, [], [AC_CHECK_LIB(socket, main, , , [ $XLIBS ])])
+# Prepend the standard location X11 bin directory (if it exists) to PATH
+# to assist AC_PATH_X in finding headers & libraries:
+if test -d /usr/X11R6/bin; then
+ if test "x$PATH" != x; then
+ PATH=$PATH:/usr/X11R6/bin
+ else
+ PATH=/usr/X11R6/bin
+ fi
+ export PATH
+fi
AC_PATH_X
+
if test "x$no_x" != xyes; then
USE_X=yes
no_x=no
@@ -278,32 +249,12 @@ case $EXT in
;;
lnx)
;;
- osf)
- changequote(,)
- if test $GCC = yes; then
- # Remove optimization on DEC systems
- CFLAGS=`echo $CFLAGS | sed 's:-O[0-9]* *::g'`
- else
- # Standard DEC cc behavior is *STILL* K&R -- force ANSI compliance
- CFLAGS="$CFLAGS -std1 -Dunix"
- fi
- changequote([,])
- ;;
- sgi)
- AC_DEFINE(HAVE_POSIX_SIGNALS)
- ;;
sol)
AC_DEFINE(HAVE_POSIX_SIGNALS)
;;
*)
;;
esac
-# Remove optimization on all systems for all older gcc
-if test $GCC = yes; then
- if test `$CC -v 2> /dev/null | grep -c 'version 2\.[45678]'` -ne 0; then
- CFLAGS=`echo $CFLAGS | sed 's:-O[0-9]* *::g'`
- fi
-fi
#-------------------------------------------------------------------------------
# Shared library section
@@ -321,26 +272,15 @@ if test $lhea_shared = yes; then
lhea_shlib_cflags='-fPIC -fno-common'
lhea_shlib_fflags='-fPIC -fno-common'
;;
- hpu)
- SHLIB_LD="ld -b"
- SHLIB_LD_LIBS='${LIBS}'
- SHLIB_SUFFIX=".sl"
- ;;
lnx)
SHLIB_LD=":"
;;
- osf)
- SHLIB_LD="ld -shared -expect_unresolved '*'"
- ;;
sol)
SHLIB_LD="/usr/ccs/bin/ld -G"
SHLIB_LD_LIBS='${LIBS}'
lhea_shlib_cflags="-KPIC"
lhea_shlib_fflags="-KPIC"
;;
- sgi)
- SHLIB_LD="ld -shared -rdata_shared"
- ;;
win)
SHLIB_LD="$CC -shared"
SHLIB_SUFFIX=".dll"
@@ -375,11 +315,14 @@ AC_FUNC_STRFTIME
AC_CHECK_FUNCS(getcwd socket strcspn strspn strstr strtod strtol)
#-------------------------------------------------------------------------------
-AC_SUBST(TCL_PATH)
-AC_SUBST(TCL_INC_PATH)
-AC_SUBST(ITCL_PATH)
-AC_SUBST(TK_PATH)
-AC_SUBST(TK_INC_PATH)
+# Construct TCL_LIB:
+#-------------------------------------------------------------------------------
+for tclversion in 8 8.5 8.4; do
+ if test -e "$TCL_PATH/libtcl${tclversion}${SHLIB_SUFFIX}"; then
+ TCL_LIB="tcl${tclversion}"
+ fi
+done
+AC_SUBST(TCL_LIB)
AC_CONFIG_FILES([Makefile])
AC_OUTPUT
diff --git a/fitsCmds.c b/fitsCmds.c
index 074a5ca..8c1fb54 100644
--- a/fitsCmds.c
+++ b/fitsCmds.c
@@ -212,7 +212,7 @@ int fitsTcl_move( FitsFD *curFile, int argc, Tcl_Obj *const argv[] )
mSilent = 1;
} else {
Tcl_SetResult(curFile->interp, "fitsTcl Error: "
- "unkown option: -s for load without read header", TCL_STATIC);
+ "unknown option: -s for load without read header", TCL_STATIC);
return TCL_ERROR;
}
}
@@ -360,7 +360,7 @@ int fitsTcl_info( FitsFD *curFile, int argc, char *const argv[] )
} else if( !strcmp("filesize",argv[2]) ) {
- sprintf(result,"%ld",curFile->fptr->Fptr->filesize/2880);
+ sprintf(result,"%lld",curFile->fptr->Fptr->filesize/2880);
Tcl_SetResult(curFile->interp, result, TCL_VOLATILE);
} else if( !strcmp("hdutype",argv[2]) ) {
@@ -708,7 +708,7 @@ int fitsTcl_get( FitsFD *curFile, int argc, char *const argv[] )
" - if no rowList is provided, give all rows\n"
" - if no colList is provided, give all columns\n"
" - use colList = * for all columns\n"
- " - -c means return each column as a seperate list.\n"
+ " - -c means return each column as a separate list.\n"
"get vtable ?-noformat? colname firstelement ?rowList?\n"
" - get the firstelement-th vector element\n"
"\n";
@@ -719,20 +719,18 @@ int fitsTcl_get( FitsFD *curFile, int argc, char *const argv[] )
Tcl_HashEntry *newEntry;
Tcl_HashSearch search;
Tcl_DString concatList, regExpList;
- Tcl_DString ** colDString;
FitsCardList *curCard;
Keyword *newKwd;
char errMsg[256];
int nmove,i,k,l,n;
int bycol,niters,fRow;
int ntodo,felem;
- char ***strValArray;
char *pattern;
int status = 0;
char *header;
int nkeys;
- Tcl_Obj *resObj, **valArray, *listObj, **listArray, *valObj;
+ Tcl_Obj *resObj, **valArray, *listObj, **listArray;
listObj = Tcl_NewObj();
@@ -886,15 +884,22 @@ int fitsTcl_get( FitsFD *curFile, int argc, char *const argv[] )
/* Get WCS from Image extension */
- if( argc < 4 || argc > 5 ) {
+ if( argc < 3 || argc > 5 ) {
Tcl_SetResult(curFile->interp,
"For image extension use, get wcs", TCL_STATIC);
return TCL_ERROR;
}
- if ( argc == 5 && !strcmp("-m", argv[3]) ) {
- if( fitsGetWcsMatrix(curFile, 0, NULL, argv[4][0]) != TCL_OK ) {
- return TCL_ERROR;
+ if ( (argc == 4 || argc == 5) && !strcmp("-m", argv[3]) ) {
+ if (argc == 4) {
+ if( fitsGetWcsMatrix(curFile, 0, NULL, '\0') != TCL_OK ) {
+ return TCL_ERROR;
+ }
+ } else {
+ /* this tells which wcs to use.. wcsA, wcsB.. etcc*/
+ if( fitsGetWcsMatrix(curFile, 0, NULL, argv[4][0]) != TCL_OK ) {
+ return TCL_ERROR;
+ }
}
} else {
if( fitsGetWcsPair(curFile,0,0, '\0') != TCL_OK ) {
@@ -976,8 +981,8 @@ int fitsTcl_get( FitsFD *curFile, int argc, char *const argv[] )
int naxis = 2;
long naxes[2];
int columns[FITS_MAXDIMS];
- int *nkeys;
- char **header;
+ int nkeys;
+ char *header;
int i,j;
/* Pan Chai: there is only 2 columns */
@@ -1032,7 +1037,7 @@ int fitsTcl_get( FitsFD *curFile, int argc, char *const argv[] )
}
status = 0;
- if ( ffhdr2str(dummyptr, 1, (char *)NULL, 0, &header, &nkeys, &status) > 0 ) {
+ if ( ffhdr2str(dummyptr, 1, (char **)NULL, 0, &header, &nkeys, &status) > 0 ) {
Tcl_SetResult(curFile->interp, "Failed to collect all the headers.", TCL_STATIC);
return TCL_ERROR;
}
@@ -1049,16 +1054,33 @@ int fitsTcl_get( FitsFD *curFile, int argc, char *const argv[] )
Tcl_ListObjAppendElement( curFile->interp, listObj, Tcl_NewListObj(5,data) );
Tcl_SetObjResult(curFile->interp, listObj);
- ckfree( (char*) header);
- return TCL_OK;
+ /* Use fits_free_memory here instead of ckfree since header was opened */
+ /* (by cfitsio) using malloc, not ckalloc. */
+ if (fits_free_memory((char*)header, &status) > 0) {
+ ffpmsg("Failed to free header memory");
+ return(status);
+ } else return TCL_OK;
} else if( !strcmp("translatedKeywords", argv[2]) ) {
char outfile[FLEN_FILENAME];
+ char dest[8];
int status = 0;
+ int status2 = 0;
long rownum;
fitsfile *newptr;
- strcpy(outfile, "mem://_1");
+ if (argc != 7) {
+ Tcl_SetResult(curFile->interp,"get translatedKeywords rownum colname", TCL_STATIC);
+ return TCL_ERROR;
+ }
+ if (strcmp(argv[6], "NONE") == 0 ) {
+ /* call by fv, use memory to store the data */
+ strcpy(outfile, "mem://_1");
+ } else {
+ /* call by ds9, argv[6] is a temporary file name exists in fvtemp */
+ status = CREATE_DISK_FILE;
+ strcpy(outfile, argv[6]);
+ }
/* Copy the image into new primary array and open it as the current */
/* fptr. This will close the table that contains the original image. */
@@ -1073,15 +1095,16 @@ int fitsTcl_get( FitsFD *curFile, int argc, char *const argv[] )
rownum = atol(argv[4]);
status = 0;
+ status2 = 0;
if (fits_copy_cell2image(curFile->fptr, newptr, argv[3], rownum, &status) > 0)
{
ffpmsg("Failed to copy table cell to new primary array:");
- ffclos(curFile->fptr, status);
+ ffclos(curFile->fptr, &status2);
curFile->fptr = 0; /* return null file pointer */
return(status);
}
- if ( ffhdr2str(newptr, 1, (char *)NULL, 0, &header, &nkeys, &status) > 0 ) {
+ if ( ffhdr2str(newptr, 1, (char **)NULL, 0, &header, &nkeys, &status) > 0 ) {
Tcl_SetResult(curFile->interp, "Failed to collect all the headers.", TCL_STATIC);
return TCL_ERROR;
}
@@ -1089,7 +1112,16 @@ int fitsTcl_get( FitsFD *curFile, int argc, char *const argv[] )
Tcl_ListObjAppendElement( curFile->interp, listObj, Tcl_NewStringObj(header, -1));
Tcl_ListObjAppendElement( curFile->interp, listObj, Tcl_NewIntObj( nkeys ) );
- if ( fitsGetWcsMatrixAlt(curFile, newptr, listObj, 0, NULL, '\0') > 0 ) {
+ strcpy(dest, argv[5]);
+
+ if (strcmp(dest, "DEFAULT") == 0) {
+ /* set destion to '\0' */
+ dest[0] = '\0';
+ } else {
+ /* else keep the first character and set rest to '\0' */
+ dest[1] = '\0';
+ }
+ if ( fitsGetWcsMatrixAlt(curFile, newptr, listObj, 0, NULL, dest[0]) > 0 ) {
Tcl_SetResult(curFile->interp, "Failed to collect all the headers.", TCL_STATIC);
return TCL_ERROR;
}
@@ -1102,8 +1134,16 @@ int fitsTcl_get( FitsFD *curFile, int argc, char *const argv[] )
Tcl_SetObjResult(curFile->interp, listObj);
*/
- ckfree( (char*) header);
- return TCL_OK;
+ if (strcmp(argv[6], "NONE") != 0 ) {
+ /* called by ds9, close out the temporary file */
+ fits_close_file(newptr, &status);
+ }
+ /* Use fits_free_memory here instead of ckfree since header was opened */
+ /* (by cfitsio) using malloc, not ckalloc. */
+ if (fits_free_memory((char*)header, &status) > 0) {
+ ffpmsg("Failed to free header memory");
+ return(status);
+ } else return TCL_OK;
} else if( !strcmp("header2str", argv[2]) ) {
/* int ffhdr2str( fitsfile *fptr, I - FITS file pointer */
@@ -1114,7 +1154,7 @@ int fitsTcl_get( FitsFD *curFile, int argc, char *const argv[] )
/* int *nkeys, O - returned number of 80-char keywords */
/* int *status) IO - error status */
- if ( ffhdr2str(curFile->fptr, 1, (char *)NULL, 0, &header, &nkeys, &status) > 0 ) {
+ if ( ffhdr2str(curFile->fptr, 1, (char **)NULL, 0, &header, &nkeys, &status) > 0 ) {
Tcl_SetResult(curFile->interp, "Failed to collect all the headers.", TCL_STATIC);
return TCL_ERROR;
}
@@ -1123,8 +1163,12 @@ int fitsTcl_get( FitsFD *curFile, int argc, char *const argv[] )
Tcl_ListObjAppendElement( curFile->interp, listObj, Tcl_NewIntObj( nkeys ) );
Tcl_SetObjResult(curFile->interp, listObj);
- ckfree( (char*) header);
- return TCL_OK;
+ /* Use fits_free_memory here instead of ckfree since header was opened */
+ /* (by cfitsio) using malloc, not ckalloc. */
+ if (fits_free_memory((char*)header, &status) > 0) {
+ ffpmsg("Failed to free header memory");
+ return(status);
+ } else return TCL_OK;
} else if( !strcmp("imgwcs", argv[2]) ) {
@@ -1257,8 +1301,8 @@ int fitsTcl_get( FitsFD *curFile, int argc, char *const argv[] )
if( argc > 9 )
cslice = atol(argv[9]);
- if( imageBlockLoad(curFile, argv[3], atoll(argv[4]), atoll(argv[5]),
- atoll(argv[6]), atoll(argv[7]), slice, cslice )
+ if( imageBlockLoad(curFile, argv[3], fitsTcl_atoll(argv[4]), fitsTcl_atoll(argv[5]),
+ fitsTcl_atoll(argv[6]), fitsTcl_atoll(argv[7]), slice, cslice )
!= TCL_OK ) {
return TCL_ERROR; /* Sets own error message */
}
@@ -1834,7 +1878,7 @@ int fitsTcl_insert( FitsFD *curFile, int argc, char *const argv[] )
" Dn(Double with n format), B(Unsigned) \n"
" C(Complex), M(Double complex) " };
- int index, format, numRows, i;
+ int index, format, numRows;
if( argc == 2 ) {
Tcl_AppendResult(curFile->interp,
@@ -1991,12 +2035,10 @@ int fitsTcl_select( FitsFD *curFile, int argc, char *const argv[] )
static char *selRowList =
"select rows -expr expression firstrow nrow\n ";
- int numCols,colNums[FITS_COLMAX],colTypes[FITS_COLMAX],strSize[FITS_COLMAX];
int fRow, nRows;
char * row_status;
long n_good_rows;
int i;
- char result[32];
Tcl_Obj *valObj, *listObj;
@@ -2206,7 +2248,6 @@ int fitsTcl_load( FitsFD *curFile, int argc, char *const argv[] )
long first, totpix = 0, npix;
double *array, bscale = 1.0, bzero = 0.0, nulval = 0.;
char card[81];
- int i, j;
if( argc == 2 ) {
Tcl_SetResult(curFile->interp, loadList, TCL_STATIC);
@@ -2305,17 +2346,17 @@ int fitsTcl_load( FitsFD *curFile, int argc, char *const argv[] )
}
if( argc > 8 )
- slice = atoll(argv[8]);
+ slice = fitsTcl_atoll(argv[8]);
if( argc > 9 )
- cslice = atoll(argv[9]);
+ cslice = fitsTcl_atoll(argv[9]);
if( strcmp( argv[3], "--" ) )
varName = argv[3];
- if( imageBlockLoad(curFile, varName, atoll(argv[4]),
- atoll(argv[5]), atoll(argv[6]),
- atoll(argv[7]), slice, cslice )
+ if( imageBlockLoad(curFile, varName, fitsTcl_atoll(argv[4]),
+ fitsTcl_atoll(argv[5]), fitsTcl_atoll(argv[6]),
+ fitsTcl_atoll(argv[7]), slice, cslice )
!= TCL_OK ) {
return TCL_ERROR;
}
@@ -2852,11 +2893,8 @@ int fitsTcl_sascii( FitsFD *curFile, int argc, char *const argv[] )
int fCol, nCols, nWdths;
int cellSize, i, baseColNum, ifVariableVec;
int ifCSV, ifPrintRow, ifFixedFormat;
- char *sepString;
char **listWid;
- char *errMsg;
-
if( argc == 2 ) {
Tcl_SetResult(curFile->interp, sasciiList, TCL_STATIC);
return TCL_OK;
@@ -3159,9 +3197,8 @@ int fitsTcl_add( FitsFD *curFile, int argc, char *const argv[] )
static char *addRowList = "add row numRows\n";
char result[16];
int numCols,colNums[FITS_COLMAX],colTypes[FITS_COLMAX],strSize[FITS_COLMAX];
- int numRange,rangeBlock, *range=NULL;
+ int numRange, *range=NULL;
char errMsg[256];
- int i,j;
/* range = (int*) malloc(FITS_MAXRANGE*2*sizeof(int)); */
if( argc == 2 ) {
@@ -3184,6 +3221,7 @@ int fitsTcl_add( FitsFD *curFile, int argc, char *const argv[] )
int isNew;
strToUpper(argv[3], &tmpColName);
+
if( fitsTransColList(curFile,tmpColName,
&numCols,colNums,colTypes,strSize) != TCL_OK ) {
@@ -3641,7 +3679,7 @@ int fitsTcl_checksum( FitsFD *curFile, int argc, Tcl_Obj *const argv[] )
"checksum verify\n"
"checksum update\n";
- char result[16], *opt;
+ char *opt;
int datastatus = 0;
int hdustatus = 0;
int status = 0;
@@ -3724,7 +3762,7 @@ int fitsTcl_smooth( FitsFD *curFile, int argc, Tcl_Obj *const argv[] )
long naxes[999];
int canprimary = 0;
- int hdunum, hdutype;
+ int hdunum;
char strtemp[FLEN_FILENAME];
diff --git a/fitsIO.c b/fitsIO.c
index c0d60b6..4159679 100644
--- a/fitsIO.c
+++ b/fitsIO.c
@@ -25,7 +25,6 @@
*/
#include "fitsTclInt.h"
-#include "wcslib/wcstrig.h"
#include <limits.h>
/* on some systems, e.g. linux, SUNs DBL_MAX is in float.h */
@@ -81,8 +80,8 @@ int fitsLoadHDU( FitsFD *curFile )
{
int i,status=0;
int simple,extend;
- long pcount, gcount, rowlen, varidat;
- LONGLONG tbcol[FITS_COLMAX];
+ long pcount, gcount, rowlen;
+ LONGLONG tbcol[FITS_COLMAX], varidat;
char tmpStr[80];
char tmpKey[FLEN_KEYWORD];
Tcl_HashEntry *thisEntry;
@@ -106,6 +105,7 @@ int fitsLoadHDU( FitsFD *curFile )
curFile->CHDUInfo.image.naxisn,
&pcount, &gcount, &extend, &status);
strcpy(curFile->extname ,"Image");
+
break;
case ASCII_TBL:
@@ -299,16 +299,22 @@ int fitsLoadHDU( FitsFD *curFile )
curFile->CHDUInfo.table.vecSize[i] = -1;
}
} else {
- long tmp=0;
- tmp = atol(curFile->CHDUInfo.table.colType[i]);
- if (tmp < 1) {
- if( curFile->CHDUInfo.table.colType[i][0]=='0' )
- curFile->CHDUInfo.table.vecSize[i] = 0;
- else
- curFile->CHDUInfo.table.vecSize[i] = 1;
- } else {
- curFile->CHDUInfo.table.vecSize[i] = tmp;
- }
+ int status = 0;
+ int typecode = 0;
+ long repeat = 0;
+ long width = 0;
+
+ /* use CFITSIO to get column dimension */
+ fits_get_coltype(curFile->fptr, i+1, &typecode, &repeat, &width, &status);
+
+ curFile->CHDUInfo.table.vecSize[i] = 1;
+ if (repeat > 1) {
+ if (typecode == TSTRING) {
+ curFile->CHDUInfo.table.vecSize[i] = repeat / width;
+ } else {
+ curFile->CHDUInfo.table.vecSize[i] = repeat;
+ }
+ }
}
} else {
curFile->CHDUInfo.table.vecSize[i] = 1;
@@ -404,8 +410,8 @@ int fitsLoadHDU( FitsFD *curFile )
/* find the number after xPA(nnnnnnn) */
n = strpbrk(testChar, "0123456789");
- len = strspn(n, "0123456789");
if ( n != (char *)NULL ) {
+ len = strspn(n, "0123456789");
memset (numChar, '\0', 1024);
strncpy(numChar, n, len);
sscanf (numChar, "%d", &(curFile->CHDUInfo.table.strSize[i]));
@@ -1021,6 +1027,14 @@ int makeNewCHDUInfo( FitsFD *curFile,
return TCL_ERROR;
}
+ curFile->CHDUInfo.table.vecDim =
+ (long *) makeContigArray(FITS_COLMAX,1,'l');
+ if( NULL == curFile->CHDUInfo.table.vecDim) {
+ Tcl_SetResult(curFile->interp,
+ "Error malloc'ing space for vecDim", TCL_STATIC);
+ return TCL_ERROR;
+ }
+
curFile->CHDUInfo.table.colTscale =
(double *) makeContigArray(FITS_COLMAX,1,'d');
if( NULL == curFile->CHDUInfo.table.colTscale ) {
@@ -1088,7 +1102,7 @@ int makeNewCHDUInfo( FitsFD *curFile,
}
curFile->CHDUInfo.image.naxisn =
- (long *) makeContigArray(FITS_MAXDIMS,1,'l');
+ (long long *) makeContigArray(FITS_MAXDIMS,1,'l');
if( NULL == curFile->CHDUInfo.image.naxisn ) {
Tcl_SetResult(curFile->interp,
"Error malloc'ing space for naxisn", TCL_STATIC);
@@ -1157,6 +1171,7 @@ int freeCHDUInfo( FitsFD * curFile )
ckfree((char *) curFile->CHDUInfo.table.colDisp);
ckfree((char *) curFile->CHDUInfo.table.colNull);
ckfree((char *) curFile->CHDUInfo.table.vecSize);
+ ckfree((char *) curFile->CHDUInfo.table.vecDim);
ckfree((char *) curFile->CHDUInfo.table.colFormat);
ckfree((char *) curFile->CHDUInfo.table.colMin);
ckfree((char *) curFile->CHDUInfo.table.colMax);
@@ -1626,7 +1641,6 @@ int imageBlockLoad_1D( FitsFD *curFile,
return TCL_OK;
}
-
/*
* imageBlockLoad
* assign a block of the image data to varName variable or return a pointer
@@ -1648,10 +1662,10 @@ int imageBlockLoad( FitsFD *curFile,
double *dblData;
LONGLONG *longlongData;
char *nullArray;
- double defaultDouble = 0.0;
int ptrFlag, status;
- LONGLONG tmpIndex, i,j;
+ LONGLONG tmpIndex;
+ int i,j;
char tmpStr[80];
char varIndex[80];
int anyNul;
@@ -1661,11 +1675,14 @@ int imageBlockLoad( FitsFD *curFile,
int naxes, flip=0;
LONGLONG xDim, yDim;
char result[80];
- char colFormat[80];
Tcl_Obj *valObj;
+ long naxisn[9];
naxes = curFile->CHDUInfo.image.naxes;
-
+ for (i=0; i< curFile->CHDUInfo.image.naxes; i++) {
+ naxisn[i] = (long) curFile->CHDUInfo.image.naxisn[i];
+ }
+
/*
if( naxes > 3 ) {
for (i = 3; i < naxes; i++) {
@@ -1685,9 +1702,9 @@ int imageBlockLoad( FitsFD *curFile,
return TCL_ERROR;
}
- xDim = curFile->CHDUInfo.image.naxisn[0];
+ xDim = naxisn[0];
if( naxes>1 ) {
- yDim = curFile->CHDUInfo.image.naxisn[1];
+ yDim = naxisn[1];
} else {
yDim = 1;
if( (fCol>1 && fRow>1) || (nRow>1 && nCol>1) ) {
@@ -1774,20 +1791,17 @@ int imageBlockLoad( FitsFD *curFile,
status = 0;
nullArray = (char *) ckalloc(nCol*nRow*sizeof(char));
-/*
-fprintf(stdout, "case: <%d>\n", curFile->CHDUInfo.image.dataType);
-fflush(stdout);
-*/
+
switch ( curFile->CHDUInfo.image.dataType ) {
case TDOUBLE:
dblData = (double *) ckalloc(nCol*nRow*sizeof(double));
- memset (dblData, NULL, nCol*nRow*sizeof(double));
+ memset (dblData, 0, nCol*nRow*sizeof(double));
ffgsfd(curFile->fptr,
1,
curFile->CHDUInfo.image.naxes,
- curFile->CHDUInfo.image.naxisn,
+ naxisn,
blc_l,
trc_l,
incrc,
@@ -1805,13 +1819,21 @@ fflush(stdout);
}
if( ptrFlag ) {
+#ifdef __WIN32__
+ sprintf(result, PTRFORMAT " %d %I64d", dblData, 4, nCol*nRow);
+#else
sprintf(result, PTRFORMAT " %d %lld", dblData, 4, nCol*nRow);
+#endif
Tcl_SetResult(curFile->interp,result,TCL_VOLATILE);
} else {
for ( i=0; i< nCol; i++ ) {
for ( j=0; j< nRow; j++ ) {
tmpIndex = j*nCol + i;
+#ifdef __WIN32__
+ sprintf(varIndex,"%I64d,%I64d", fCol+i-1, fRow+j-1);
+#else
sprintf(varIndex,"%lld,%lld", fCol+i-1, fRow+j-1);
+#endif
if ( nullArray[tmpIndex] ) {
valObj = Tcl_NewStringObj("NULL",-1);
} else {
@@ -1826,12 +1848,12 @@ fflush(stdout);
case TLONGLONG:
longlongData = (LONGLONG *) ckalloc(nCol*nRow*sizeof(LONGLONG));
- memset (longlongData, NULL, nCol*nRow*sizeof(LONGLONG));
+ memset (longlongData, 0, nCol*nRow*sizeof(LONGLONG));
ffgsfjj(curFile->fptr,
1,
curFile->CHDUInfo.image.naxes,
- curFile->CHDUInfo.image.naxisn,
+ naxisn,
blc_l,
trc_l,
incrc,
@@ -1849,13 +1871,21 @@ fflush(stdout);
}
if( ptrFlag ) {
+#ifdef __WIN32__
+ sprintf(result, PTRFORMAT " %d %I64d", longlongData, 4, nCol*nRow);
+#else
sprintf(result, PTRFORMAT " %d %lld", longlongData, 4, nCol*nRow);
+#endif
Tcl_SetResult(curFile->interp,result,TCL_VOLATILE);
} else {
for ( i=0; i< nCol; i++ ) {
for ( j=0; j< nRow; j++ ) {
tmpIndex = j*nCol + i;
+#ifdef __WIN32__
+ sprintf(varIndex,"%I64d,%I64d", fCol+i-1, fRow+j-1);
+#else
sprintf(varIndex,"%lld,%lld", fCol+i-1, fRow+j-1);
+#endif
if ( nullArray[tmpIndex] ) {
valObj = Tcl_NewStringObj("NULL",-1);
} else {
@@ -1875,12 +1905,12 @@ fflush(stdout);
case TFLOAT:
floatData = (float *) ckalloc(nCol*nRow*sizeof(float));
- memset (floatData, NULL, nCol*nRow*sizeof(float));
+ memset (floatData, 0, nCol*nRow*sizeof(float));
ffgsfe(curFile->fptr,
1,
curFile->CHDUInfo.image.naxes,
- curFile->CHDUInfo.image.naxisn,
+ naxisn,
blc_l,
trc_l,
incrc,
@@ -1897,13 +1927,21 @@ fflush(stdout);
}
if( ptrFlag ) {
+#ifdef __WIN32__
+ sprintf(result, PTRFORMAT " %d %I64d", floatData, 3, nCol*nRow);
+#else
sprintf(result, PTRFORMAT " %d %lld", floatData, 3, nCol*nRow);
+#endif
Tcl_SetResult(curFile->interp,result,TCL_VOLATILE);
} else {
for ( i=0; i< nCol; i++ ) {
for ( j=0; j< nRow; j++ ) {
tmpIndex = j*nCol + i;
+#ifdef __WIN32__
+ sprintf(varIndex,"%I64d,%I64d", fCol+i-1, fRow+j-1);
+#else
sprintf(varIndex,"%lld,%lld", fCol+i-1, fRow+j-1);
+#endif
if ( nullArray[tmpIndex] ) {
valObj = Tcl_NewStringObj("NULL",-1);
} else {
@@ -1920,11 +1958,11 @@ fflush(stdout);
case TLONG:
case TINT:
intData = (int *) ckalloc(nRow*nCol*sizeof(int));
- memset (intData, NULL, nCol*nRow*sizeof(int));
+ memset (intData, 0, nCol*nRow*sizeof(int));
ffgsfk(curFile->fptr,
1,
curFile->CHDUInfo.image.naxes,
- curFile->CHDUInfo.image.naxisn,
+ naxisn,
blc_l,
trc_l,
incrc,
@@ -1941,13 +1979,21 @@ fflush(stdout);
}
if( ptrFlag ) {
+#ifdef __WIN32__
+ sprintf(result, PTRFORMAT " %d %I64d", intData, 2, nCol*nRow);
+#else
sprintf(result, PTRFORMAT " %d %lld", intData, 2, nCol*nRow);
+#endif
Tcl_SetResult(curFile->interp,result,TCL_VOLATILE);
} else {
for ( i=0; i< nCol; i++ ) {
for ( j=0; j< nRow; j++ ) {
tmpIndex = j*nCol + i;
+#ifdef __WIN32__
+ sprintf(varIndex,"%I64d,%I64d", fCol+i-1, fRow+j-1);
+#else
sprintf(varIndex,"%lld,%lld", fCol+i-1, fRow+j-1);
+#endif
if ( nullArray[tmpIndex] ) {
valObj = Tcl_NewStringObj("NULL",-1);
} else {
@@ -1963,12 +2009,12 @@ fflush(stdout);
case TSHORT:
shortData = (short *) ckalloc(nCol*nRow*sizeof(short));
- memset (shortData, NULL, nCol*nRow*sizeof(short));
+ memset (shortData, 0, nCol*nRow*sizeof(short));
ffgsfi(curFile->fptr,
1,
curFile->CHDUInfo.image.naxes,
- curFile->CHDUInfo.image.naxisn,
+ naxisn,
blc_l,
trc_l,
incrc,
@@ -1985,13 +2031,21 @@ fflush(stdout);
}
if( ptrFlag ) {
+#ifdef __WIN32__
+ sprintf(result, PTRFORMAT " %d %I64d", shortData, 1, nCol*nRow);
+#else
sprintf(result, PTRFORMAT " %d %lld", shortData, 1, nCol*nRow);
+#endif
Tcl_SetResult(curFile->interp,result,TCL_VOLATILE);
} else {
for ( i=0; i< nCol; i++ ) {
for ( j=0; j< nRow; j++ ) {
tmpIndex = j*nCol + i;
+#ifdef __WIN32__
+ sprintf(varIndex,"%I64d,%I64d", fCol+i-1, fRow+j-1);
+#else
sprintf(varIndex,"%lld,%lld", fCol+i-1, fRow+j-1);
+#endif
if ( nullArray[tmpIndex] ) {
valObj = Tcl_NewStringObj("NULL",-1);
} else {
@@ -2007,12 +2061,12 @@ fflush(stdout);
case TBYTE:
byteData = (unsigned char *) ckalloc(nCol*nRow*sizeof(unsigned char));
- memset (byteData, NULL, nCol*nRow*sizeof(unsigned char));
+ memset (byteData, 0, nCol*nRow*sizeof(unsigned char));
ffgsfb(curFile->fptr,
1,
curFile->CHDUInfo.image.naxes,
- curFile->CHDUInfo.image.naxisn,
+ naxisn,
blc_l,
trc_l,
incrc,
@@ -2029,13 +2083,21 @@ fflush(stdout);
}
if( ptrFlag ) {
+#ifdef __WIN32__
+ sprintf(result, PTRFORMAT " %d %I64d", byteData, 0, nCol*nRow);
+#else
sprintf(result, PTRFORMAT " %d %lld", byteData, 0, nCol*nRow);
+#endif
Tcl_SetResult(curFile->interp,result,TCL_VOLATILE);
} else {
for ( i=0; i< nCol; i++ ) {
for ( j=0; j< nRow; j++ ) {
tmpIndex = j*nCol + i;
+#ifdef __WIN32__
+ sprintf(varIndex,"%I64d,%I64d", fCol+i-1, fRow+j-1);
+#else
sprintf(varIndex,"%lld,%lld", fCol+i-1, fRow+j-1);
+#endif
if ( nullArray[tmpIndex] ) {
valObj = Tcl_NewStringObj("NULL",-1);
} else {
@@ -2537,7 +2599,6 @@ int tableGetToPtr( FitsFD *curFile,
LONGLONG *longlongArray;
double *dblArray;
float *fltArray;
- long *lngArray;
short *shtArray;
int *intArray;
unsigned char *bytArray;
@@ -2550,7 +2611,7 @@ int tableGetToPtr( FitsFD *curFile,
unsigned char bytNul;
char result[80];
- long numRows, vecSize, i;
+ long numRows, vecSize;
int anynul, dataType, colDataType;
int status=0;
@@ -2766,7 +2827,6 @@ int tableRowGetToPtr( FitsFD *curFile,
LONGLONG *longlongArray;
double *dblArray;
float *fltArray;
- long *lngArray;
short *shtArray;
int *intArray;
unsigned char *bytArray;
@@ -2779,7 +2839,7 @@ int tableRowGetToPtr( FitsFD *curFile,
unsigned char bytNul;
char result[80];
- long numRows, i;
+ long numRows;
int anynul, dataType, colDataType;
int status=0;
@@ -3000,23 +3060,16 @@ int tableBlockLoad( FitsFD *curFile,
int k,m;
int anyf;
char **cValue;
- short shtValue[1];
- int intValue[1];
long longValue[1];
double dblValue[2];
- float fValue[1];
char xValue[1];
double dblComplex[2];
- float fltComplex[2];
char nullArray[1];
char strNullVal[]="NULL";
- unsigned char binValue[1];
char lValue[1];
char colFormat[80];
char cplxFormat[80];
char tmpStr[80];
- char checkStr1[80];
- char checkStr2[80];
int tmpInt;
char varIndex[80];
int dataType;
@@ -3025,10 +3078,6 @@ int tableBlockLoad( FitsFD *curFile,
int listFlag=0;
Tcl_Obj *valObj, **colData, *valObj2[2];
Tcl_Obj *cnstObj[5];
- int naxis;
- long naxes[3];
- char result1[80];
- char result2[80];
LONGLONG longlongValue[1];
@@ -3125,8 +3174,10 @@ int tableBlockLoad( FitsFD *curFile,
} else {
if (lValue[0] == 1) {
valObj = cnstObj[ cnstTrueObj ];
- } else {
+ } else if (lValue[0] == 0) {
valObj = cnstObj[ cnstFalseObj ];
+ } else {
+ valObj = cnstObj[ cnstUndefObj ];
}
}
@@ -3451,6 +3502,13 @@ int fitsPutReqKwds( FitsFD *curFile,
"colUnit list doesn't match nCols", TCL_STATIC);
return TCL_ERROR;
}
+ /* Pan Chai (02/10/2015)
+ add to check to see if input is empty.
+ if so, set cUnit to NULL
+ */
+ if (nElement <= 0) {
+ cUnit = NULL;
+ }
} else {
cUnit = NULL;
}
@@ -3920,33 +3978,10 @@ int saveVectorTableToAscii( FitsFD *curFile,
{
FILE *fPtr;
- char outFStr[80];
- LONGLONG k,m;
- int anyf;
- char **cValue;
- short shtValue[1];
- int intValue[1];
- long longValue[1];
- LONGLONG longlongValue[1];
- double dblValue[1];
- float fValue[1];
- char xValue[1];
- double dblComplex[2];
- float fltComplex[2];
- char nullArray[1];
- char strNullVal[]="NULL";
- unsigned char binValue[1];
- char lValue[1];
+ LONGLONG m;
char colFormat[80];
- char cplxFormat[80];
char outputStr[80];
- int tmpInt;
- char varIndex[80];
int dataType;
- int status=0;
- char errMsg[160];
- int naxis;
- long naxes[3];
if ( ifCSV == 1) {
sepString = (char *) ckalloc(4);
@@ -3976,9 +4011,9 @@ int saveVectorTableToAscii( FitsFD *curFile,
if ( ifCSV == 1 )
fprintf(fPtr, "\"");
if ( ifPrintRow == 1 ) {
- sprintf(outputStr, "%d", m);
- fprintf(fPtr, outputStr);
- fprintf(fPtr, sepString);
+ sprintf(outputStr, "%lld", m);
+ fprintf(fPtr,"%s", outputStr);
+ fprintf(fPtr,"%s", sepString);
}
saveVectorTableRowToAscii(curFile, filename, fileStatus, m, 1, fCol, nCols, baseColNum, ifCSV,
@@ -4010,32 +4045,21 @@ int saveVectorTableRowToAscii( FitsFD *curFile,
int ifFixedFormat)
{
- char outFStr[80];
- LONGLONG k,m;
+ LONGLONG k;
int anyf;
char **cValue;
- short shtValue[1];
- int intValue[1];
long longValue[1];
LONGLONG longlongValue[1];
double dblValue[1];
- float fValue[1];
char xValue[1];
- double dblComplex[2];
- float fltComplex[2];
char nullArray[1];
char strNullVal[]="NULL";
- unsigned char binValue[1];
char lValue[1];
- char cplxFormat[80];
char outputStr[80];
int tmpInt;
- char varIndex[80];
int status=0;
char errMsg[160];
- int naxis;
- long naxes[3];
-
+
for ( k = fCol; k <= (fCol+nCols-1); k++ ) {
switch ( dataType ) {
@@ -4059,6 +4083,8 @@ int saveVectorTableRowToAscii( FitsFD *curFile,
strcpy(outputStr," ");
status = 0;
ffcmsg();
+ } else if ( anyf ) {
+ strcpy(outputStr,"NULL");
} else {
sprintf(outputStr, colFormat, cValue[0]);
}
@@ -4082,6 +4108,7 @@ int saveVectorTableRowToAscii( FitsFD *curFile,
status = 0;
ffcmsg();
} else if( anyf ) {
+ strcpy(outputStr,"NULL");
/* valObj = cnstObj[ cnstUndefObj ]; */
} else {
if (lValue[0] == 1) {
@@ -4149,6 +4176,7 @@ int saveVectorTableRowToAscii( FitsFD *curFile,
ffcmsg();
} else if( anyf ) {
/* */
+ strcpy(outputStr,"NULL");
} else {
if( strchr(colFormat,'d') ) {
sprintf(outputStr, "%.0f", dblValue[0]);
@@ -4178,7 +4206,7 @@ int saveVectorTableRowToAscii( FitsFD *curFile,
status = 0;
ffcmsg();
} else if( anyf ) {
- /* */
+ strcpy(outputStr,"NULL");
} else {
strcpy(outputStr,longlongValue[0]);
}
@@ -4191,9 +4219,9 @@ int saveVectorTableRowToAscii( FitsFD *curFile,
return TCL_ERROR;
}
- fprintf(fPtr, outputStr);
+ fprintf(fPtr, "%s", outputStr);
if ( k != (fCol+nCols-1) )
- fprintf(fPtr, sepString);
+ fprintf(fPtr, "%s", sepString);
}
return TCL_OK;
@@ -4250,14 +4278,11 @@ int saveTableToAscii( FitsFD *curFile,
char lValue[1];
char *outputStr;
char errMsg[80];
- long tmplong[1];
int tmpInt;
int anyf;
- int cnt;
int status=0;
/* create a minimum large enough to encompass the row string */
- int maxWidth = 8;
- char colFormat[80];
+ int maxWidth = 99999;
int dataType;
int ifVariableVec;
@@ -4282,7 +4307,6 @@ int saveTableToAscii( FitsFD *curFile,
strcpy(colFStr[k], curFile->CHDUInfo.table.colFormat[colNums[k]-1]);
if( strSize[k] > maxWidth ) maxWidth = strSize[k];
}
- cValue = (char **) makeContigArray(1, maxWidth+1, 'c');
outputStr = (char *) ckalloc( (maxWidth+1) * sizeof(char) );
if( !strcmp(fileStatus,"0") ) { /* Create new file */
@@ -4406,24 +4430,24 @@ int saveTableToAscii( FitsFD *curFile,
fprintf(fPtr, rowFormatStr, outputStr);
} else {
/* don't pad */
- fprintf(fPtr, outputStr);
+ fprintf(fPtr, "%s", outputStr);
}
- fprintf(fPtr, sepString);
+ fprintf(fPtr, "%s", sepString);
}
for (j=0; j< nCols; j++) {
- tmpInt = curFile->CHDUInfo.table.vecSize[ colNums[j]-1 ];
+ tmpInt = (int) curFile->CHDUInfo.table.vecSize[ colNums[j]-1 ];
if ( tmpInt != 1 ) {
dataType = curFile->CHDUInfo.table.colDataType[colNums[j]-1];
ifVariableVec = 0;
if ( ifFixedFormat == 1 ) {
fprintf(fPtr,"%3s"," ");
}
- saveVectorTableRowToAscii(curFile, filename, fileStatus, m+1, 1, 1, tmpInt, colNums[j], ifCSV,
+ saveVectorTableRowToAscii(curFile, filename, fileStatus, fRow+m, 1, 1, tmpInt, colNums[j], ifCSV,
0, sepString, ifVariableVec, colFStr[j], dataType, fPtr, ifFixedFormat);
if ( ifFixedFormat == 0 ) {
if ( j < nCols-1 ) {
- fprintf(fPtr,sepString);
+ fprintf(fPtr,"%s",sepString);
}
}
@@ -4431,6 +4455,7 @@ int saveTableToAscii( FitsFD *curFile,
switch (curFile->CHDUInfo.table.colDataType[colNums[j]-1]) {
case TSTRING:
+ cValue = (char **) makeContigArray(1, maxWidth+1, 'c');
ffgcls(curFile->fptr,
colNums[j],
m+fRow,
@@ -4449,6 +4474,8 @@ int saveTableToAscii( FitsFD *curFile,
} else {
sprintf(outputStr,colFStr[j],cValue[0]);
}
+ ckfree( (char *) cValue[0]);
+ ckfree( (char *) cValue);
break;
case TLOGICAL:
@@ -4706,8 +4733,6 @@ int saveTableToAscii( FitsFD *curFile,
ckfree( (char *) colFStr[0]);
ckfree( (char *) outFStr);
ckfree( (char *) colFStr);
- ckfree( (char *) cValue[0]);
- ckfree( (char *) cValue);
ckfree( (char *) outputStr );
fclose(fPtr);
return TCL_ERROR;
@@ -4716,7 +4741,7 @@ int saveTableToAscii( FitsFD *curFile,
if ( ifFixedFormat == 0 ) {
if ( j != nCols-1 )
/* print sepString if we're not on last column */
- fprintf(fPtr, sepString);
+ fprintf(fPtr, "%s", sepString);
}
}
}
@@ -4731,8 +4756,6 @@ int saveTableToAscii( FitsFD *curFile,
ckfree( (char *) outFStr);
ckfree( (char *) colFStr[0]);
ckfree( (char *) colFStr);
- ckfree( (char *) cValue[0]);
- ckfree( (char *) cValue);
ckfree( (char *) outputStr );
return TCL_OK;
}
@@ -4770,6 +4793,7 @@ int saveImageToAscii( FitsFD *curFile,
int xDim, yDim;
char result[80];
int status=0;
+ long naxisn[9];
naxes = curFile->CHDUInfo.image.naxes;
@@ -4790,9 +4814,13 @@ int saveImageToAscii( FitsFD *curFile,
return TCL_ERROR;
}
- xDim = curFile->CHDUInfo.image.naxisn[0];
+ for (i=0; i< curFile->CHDUInfo.image.naxes; i++) {
+ naxisn[i] = (long) curFile->CHDUInfo.image.naxisn[i];
+ }
+
+ xDim = naxisn[0];
if( naxes>1 ) {
- yDim = curFile->CHDUInfo.image.naxisn[1];
+ yDim = naxisn[1];
} else {
yDim = 1;
if( (fCol>1 && fRow>1) || (nRows>1 && nCols>1) ) {
@@ -4875,12 +4903,12 @@ int saveImageToAscii( FitsFD *curFile,
case TDOUBLE:
dblData = (double *) ckalloc(nCols*nRows*sizeof(double));
- memset (dblData, NULL, nCols*nRows*sizeof(double));
+ memset (dblData, 0, nCols*nRows*sizeof(double));
ffgsfd(curFile->fptr,
0,
curFile->CHDUInfo.image.naxes,
- curFile->CHDUInfo.image.naxisn,
+ naxisn,
blc,
trc,
incrc,
@@ -4905,20 +4933,21 @@ int saveImageToAscii( FitsFD *curFile,
if ( ifPrintRow == 1 ) {
int rowNum = fRow + j;
sprintf(outputStr, "%d", rowNum);
- fprintf(fPtr, outputStr);
- fprintf(fPtr, sepString);
+ fprintf(fPtr, "%s", outputStr);
+ fprintf(fPtr, "%s", sepString);
}
for (i=0; i<nCols ; i++ ) {
tmpIndex = j*nCols + i;
if ( nullArray[tmpIndex] ) {
strcpy(outputStr, "NULL");
} else {
- sprintf(outputStr,"%#.10E", dblData[tmpIndex]);
+ /* sprintf(outputStr,"%#.10E", dblData[tmpIndex]); */
+ sprintf(outputStr,"%g", dblData[tmpIndex]);
/* sprintf(outputStr,"%s", dblData[tmpIndex]); */
}
- fprintf(fPtr, outputStr);
+ fprintf(fPtr, "%s", outputStr);
if ( i != nCols-1 )
- fprintf(fPtr, sepString);
+ fprintf(fPtr, "%s", sepString);
}
if ( ifCSV == 1)
fprintf(fPtr, "\"");
@@ -4929,12 +4958,12 @@ int saveImageToAscii( FitsFD *curFile,
case TLONGLONG:
longlongData = (LONGLONG *) ckalloc(nCols*nRows*sizeof(LONGLONG));
- memset (longlongData, NULL, nCols*nRows*sizeof(LONGLONG));
+ memset (longlongData, 0, nCols*nRows*sizeof(LONGLONG));
ffgsfjj(curFile->fptr,
0,
curFile->CHDUInfo.image.naxes,
- curFile->CHDUInfo.image.naxisn,
+ naxisn,
blc,
trc,
incrc,
@@ -4959,8 +4988,8 @@ int saveImageToAscii( FitsFD *curFile,
if ( ifPrintRow == 1 ) {
int rowNum = fRow + j;
sprintf(outputStr, "%d", rowNum);
- fprintf(fPtr, outputStr);
- fprintf(fPtr, sepString);
+ fprintf(fPtr, "%s", outputStr);
+ fprintf(fPtr, "%s", sepString);
}
for (i=0; i<nCols ; i++ ) {
tmpIndex = j*nCols + i;
@@ -4973,9 +5002,9 @@ int saveImageToAscii( FitsFD *curFile,
sprintf(outputStr,"%lld", longlongData[tmpIndex]);
#endif
}
- fprintf(fPtr, outputStr);
+ fprintf(fPtr, "%s", outputStr);
if ( i != nCols-1 )
- fprintf(fPtr, sepString);
+ fprintf(fPtr, "%s", sepString);
}
if ( ifCSV == 1)
fprintf(fPtr, "\"");
@@ -4986,11 +5015,11 @@ int saveImageToAscii( FitsFD *curFile,
case TFLOAT:
floatData = (float *) ckalloc(nCols*nRows*sizeof(float));
- memset (floatData, NULL, nCols*nRows*sizeof(float));
+ memset (floatData, 0, nCols*nRows*sizeof(float));
ffgsfe(curFile->fptr,
0,
curFile->CHDUInfo.image.naxes,
- curFile->CHDUInfo.image.naxisn,
+ naxisn,
blc,
trc,
incrc,
@@ -5015,19 +5044,20 @@ int saveImageToAscii( FitsFD *curFile,
if ( ifPrintRow == 1) {
int rowNum = fRow + j;
sprintf(outputStr, "%d", rowNum);
- fprintf(fPtr, outputStr);
- fprintf(fPtr, sepString);
+ fprintf(fPtr, "%s", outputStr);
+ fprintf(fPtr, "%s", sepString);
}
for (i=0; i<nCols ; i++ ) {
tmpIndex = j*nCols + i;
if ( nullArray[tmpIndex] ) {
strcpy(outputStr, "NULL");
} else {
- sprintf(outputStr,"%#.5f", floatData[tmpIndex]);
+ /* sprintf(outputStr,"%#.5f", floatData[tmpIndex]); */
+ sprintf(outputStr,"%g", floatData[tmpIndex]);
}
- fprintf(fPtr, outputStr);
+ fprintf(fPtr, "%s", outputStr);
if ( i != nCols-1 )
- fprintf(fPtr, sepString);
+ fprintf(fPtr, "%s", sepString);
}
if ( ifCSV == 1)
fprintf(fPtr, "\"");
@@ -5039,11 +5069,11 @@ int saveImageToAscii( FitsFD *curFile,
case TINT:
intData = (int *) ckalloc(nRows*nCols*sizeof(int));
- memset (intData, NULL, nCols*nRows*sizeof(int));
+ memset (intData, 0, nCols*nRows*sizeof(int));
ffgsfk(curFile->fptr,
0,
curFile->CHDUInfo.image.naxes,
- curFile->CHDUInfo.image.naxisn,
+ naxisn,
blc,
trc,
incrc,
@@ -5068,8 +5098,8 @@ int saveImageToAscii( FitsFD *curFile,
if ( ifPrintRow == 1) {
int rowNum = fRow + j;
sprintf(outputStr, "%d", rowNum);
- fprintf(fPtr, outputStr);
- fprintf(fPtr, sepString);
+ fprintf(fPtr, "%s", outputStr);
+ fprintf(fPtr, "%s", sepString);
}
for (i=0; i<nCols ; i++ ) {
tmpIndex = j*nCols + i;
@@ -5078,9 +5108,9 @@ int saveImageToAscii( FitsFD *curFile,
} else {
sprintf(outputStr,"%d", intData[tmpIndex]);
}
- fprintf(fPtr, outputStr);
+ fprintf(fPtr, "%s", outputStr);
if ( i != nCols-1 )
- fprintf(fPtr, sepString);
+ fprintf(fPtr, "%s", sepString);
}
if ( ifCSV == 1)
fprintf(fPtr, "\"");
@@ -5092,11 +5122,11 @@ int saveImageToAscii( FitsFD *curFile,
case TSHORT:
shortData = (short *) ckalloc(nCols*nRows*sizeof(short));
- memset (shortData, NULL, nCols*nRows*sizeof(short));
+ memset (shortData, 0, nCols*nRows*sizeof(short));
ffgsfi(curFile->fptr,
0,
curFile->CHDUInfo.image.naxes,
- curFile->CHDUInfo.image.naxisn,
+ naxisn,
blc,
trc,
incrc,
@@ -5121,8 +5151,8 @@ int saveImageToAscii( FitsFD *curFile,
if ( ifPrintRow == 1) {
int rowNum = fRow + j;
sprintf(outputStr, "%d", rowNum);
- fprintf(fPtr, outputStr);
- fprintf(fPtr, sepString);
+ fprintf(fPtr, "%s", outputStr);
+ fprintf(fPtr, "%s", sepString);
}
for (i=0; i<nCols ; i++ ) {
tmpIndex = j*nCols + i;
@@ -5131,9 +5161,9 @@ int saveImageToAscii( FitsFD *curFile,
} else {
sprintf(outputStr,"%d", shortData[tmpIndex]);
}
- fprintf(fPtr, outputStr);
+ fprintf(fPtr, "%s", outputStr);
if ( i != nCols-1 )
- fprintf(fPtr, sepString);
+ fprintf(fPtr, "%s", sepString);
}
if ( ifCSV == 1)
fprintf(fPtr, "\"");
@@ -5145,11 +5175,11 @@ int saveImageToAscii( FitsFD *curFile,
case TBYTE:
byteData = (unsigned char *) ckalloc(nCols*nRows*sizeof(unsigned char));
- memset (byteData, NULL, nCols*nRows*sizeof(unsigned char));
+ memset (byteData, 0, nCols*nRows*sizeof(unsigned char));
ffgsfb(curFile->fptr,
0,
curFile->CHDUInfo.image.naxes,
- curFile->CHDUInfo.image.naxisn,
+ naxisn,
blc,
trc,
incrc,
@@ -5174,8 +5204,8 @@ int saveImageToAscii( FitsFD *curFile,
if ( ifPrintRow == 1) {
int rowNum = fRow + j;
sprintf(outputStr, "%d", rowNum);
- fprintf(fPtr, outputStr);
- fprintf(fPtr, sepString);
+ fprintf(fPtr, "%s", outputStr);
+ fprintf(fPtr, "%s", sepString);
}
for (i=0; i<nCols ; i++ ) {
tmpIndex = j*nCols + i;
@@ -5184,9 +5214,9 @@ int saveImageToAscii( FitsFD *curFile,
} else {
sprintf(outputStr,"%u", byteData[tmpIndex]);
}
- fprintf(fPtr, outputStr);
+ fprintf(fPtr, "%s", outputStr);
if ( i != nCols-1 )
- fprintf(fPtr, sepString);
+ fprintf(fPtr, "%s", sepString);
}
if ( ifCSV == 1)
fprintf(fPtr, "\"");
@@ -5226,7 +5256,6 @@ int varSaveToTable( FitsFD *curFile,
long *lngArray;
double *dblArray;
LONGLONG *longlongArray;
- char *tokenPtr;
char *strPtr;
char *nulFlag;
int iVal;
@@ -5541,7 +5570,6 @@ int varSaveToImage( FitsFD *curFile,
float *fltArray;
double *dblArray;
LONGLONG *longlongArray;
- char *strPtr;
char *nulFlag;
char *objStr;
long longVal;
@@ -5818,7 +5846,7 @@ int fitsFileGetWcsMatrix( FitsFD *curFile, fitsfile *dummyFile, int naxis, int a
int i = 0;
double refVal[FITS_MAXDIMS], refPix[FITS_MAXDIMS];
- double delt[FITS_MAXDIMS], rot, tmp;
+ double delt[FITS_MAXDIMS], rot;
double matrix[FITS_MAXDIMS][FITS_MAXDIMS];
int row, col, axisNum[FITS_MAXDIMS];
char keyword[FLEN_VALUE];
@@ -5915,9 +5943,9 @@ int fitsFileGetWcsMatrix( FitsFD *curFile, fitsfile *dummyFile, int naxis, int a
if( row<2 ) {
/* Do 2-D rotation */
if( row==col ) {
- matrix[row][col] = delt[col] * cosd( rot );
+ matrix[row][col] = delt[col] * cos( rot );
} else {
- matrix[row][col] = delt[col] * sind( rot );
+ matrix[row][col] = delt[col] * sin( rot );
if( row==0 )
matrix[row][col] = - matrix[row][col];
}
@@ -5994,7 +6022,7 @@ int fitsGetWcsMatrix( FitsFD *curFile, int naxis, int axes[], char dest )
int endBK= 0;
int i = 0;
double refVal[FITS_MAXDIMS], refPix[FITS_MAXDIMS];
- double delt[FITS_MAXDIMS], rot, tmp;
+ double delt[FITS_MAXDIMS], rot;
double matrix[FITS_MAXDIMS][FITS_MAXDIMS];
int row, col, axisNum[FITS_MAXDIMS];
char keyword[FLEN_VALUE];
@@ -6096,9 +6124,9 @@ int fitsGetWcsMatrix( FitsFD *curFile, int naxis, int axes[], char dest )
if( row<2 ) {
/* Do 2-D rotation */
if( row==col ) {
- matrix[row][col] = delt[col] * cosd( rot );
+ matrix[row][col] = delt[col] * cos( rot );
} else {
- matrix[row][col] = delt[col] * sind( rot );
+ matrix[row][col] = delt[col] * sin( rot );
if( row==0 )
matrix[row][col] = - matrix[row][col];
}
@@ -6176,7 +6204,7 @@ int fitsGetWcsMatrixAlt( FitsFD *curFile, fitsfile *fptr, Tcl_Obj *listObj, int
int endBK= 0;
int i = 0;
double refVal[FITS_MAXDIMS], refPix[FITS_MAXDIMS];
- double delt[FITS_MAXDIMS], rot, tmp;
+ double delt[FITS_MAXDIMS], rot;
double matrix[FITS_MAXDIMS][FITS_MAXDIMS];
int row, col, axisNum[FITS_MAXDIMS];
char keyword[FLEN_VALUE];
@@ -6278,9 +6306,9 @@ int fitsGetWcsMatrixAlt( FitsFD *curFile, fitsfile *fptr, Tcl_Obj *listObj, int
if( row<2 ) {
/* Do 2-D rotation */
if( row==col ) {
- matrix[row][col] = delt[col] * cosd( rot );
+ matrix[row][col] = delt[col] * cos( rot );
} else {
- matrix[row][col] = delt[col] * sind( rot );
+ matrix[row][col] = delt[col] * sin( rot );
if( row==0 )
matrix[row][col] = - matrix[row][col];
}
@@ -6457,8 +6485,8 @@ int fitsGetWcsPairAlt( FitsFD *curFile, fitsfile *fptr, Tcl_Obj *listObj, int Co
double pi = 3.1415926535897932;
/* there are 2 ways to compute the angle: */
- phia = atan2d( matrix[1][0], matrix[0][0]);
- phib = atan2d(-matrix[0][1], matrix[1][1]);
+ phia = atan2( matrix[1][0], matrix[0][0]);
+ phib = atan2(-matrix[0][1], matrix[1][1]);
/* ensure that phia <= phib */
temp = minvalue(phia, phib);
@@ -6482,9 +6510,9 @@ int fitsGetWcsPairAlt( FitsFD *curFile, fitsfile *fptr, Tcl_Obj *listObj, int Co
}
phia = (phia + phib) * 0.5; /* use the average of the 2 values */
- temp = cosd(phia);
+ temp = cos(phia);
if( fabs(temp)<0.1 ) {
- temp = sind(phia);
+ temp = sin(phia);
xinc = matrix[1][0] / temp;
yinc =-matrix[0][1] / temp;
} else {
@@ -6535,10 +6563,6 @@ int fitsGetWcsPairAlt( FitsFD *curFile, fitsfile *fptr, Tcl_Obj *listObj, int Co
data[6] = Tcl_NewDoubleObj(rot);
data[7] = Tcl_NewStringObj(ctype,-1);
-/*
-fprintf(stdout, "xrval: %20.15f, yrval: %20.15f, xrpix: %20.15f, yrpix: %20.15f, xinc: %20.15f, yinc: %20.15f, rot: %20.15f: %20.15f\n", xrval, yrval, xrpix, yrpix, xinc, yinc, rot);
-fflush(stdout);
-*/
if( userOptions.wcsSwap ) {
data[8] = Tcl_NewBooleanObj( swap );
Tcl_ListObjAppendElement(curFile->interp, listObj, Tcl_NewListObj(9,data) );
@@ -6665,8 +6689,8 @@ int fitsGetWcsPair( FitsFD *curFile, int Col1, int Col2, char dest )
double pi = 3.1415926535897932;
/* there are 2 ways to compute the angle: */
- phia = atan2d( matrix[1][0], matrix[0][0]);
- phib = atan2d(-matrix[0][1], matrix[1][1]);
+ phia = atan2( matrix[1][0], matrix[0][0]);
+ phib = atan2(-matrix[0][1], matrix[1][1]);
/* ensure that phia <= phib */
temp = minvalue(phia, phib);
@@ -6690,9 +6714,9 @@ int fitsGetWcsPair( FitsFD *curFile, int Col1, int Col2, char dest )
}
phia = (phia + phib) * 0.5; /* use the average of the 2 values */
- temp = cosd(phia);
+ temp = cos(phia);
if( fabs(temp)<0.1 ) {
- temp = sind(phia);
+ temp = sin(phia);
xinc = matrix[1][0] / temp;
yinc =-matrix[0][1] / temp;
} else {
@@ -7120,13 +7144,13 @@ int fitsSortTable( FitsFD *curFile,
uniqueNum = 0;
if (isMerge == 0 ) {
for (i=0; i<numRows; i++) {
- sprintf(rowlist[i],"%d",columndata[i].rowindex);
+ sprintf(rowlist[i],"%ld",columndata[i].rowindex);
}
} else {
for (i=0; i<numRows; i++) {
if ( columndata[i].flag == 0 ) {
- sprintf(rowlist[uniqueNum],"%d",columndata[i].rowindex);
+ sprintf(rowlist[uniqueNum],"%ld",columndata[i].rowindex);
uniqueNum++;
}
}
@@ -7679,7 +7703,6 @@ int fitsSelectRowsExpr (FitsFD *curFile,
{
int status=0;
- int i;
fffrow( curFile->fptr, expr, firstrow, nrows,
n_good_rows, row_status,&status );
diff --git a/fitsInit.c b/fitsInit.c
index 0a5add9..5db0673 100644
--- a/fitsInit.c
+++ b/fitsInit.c
@@ -6,6 +6,8 @@
*/
#include "fitsTclInt.h"
+static Tcl_HashTable interpTokenMap;
+static int interpTokenMapInitialised = 0;
FitsFD FitsOpenFiles[FITS_MAX_OPEN_FILES];
Tcl_HashTable *FitsDataStore;
@@ -14,6 +16,140 @@ int FitsDS_curAccess = 0;
fitsTclOptions userOptions;
+Tcl_Command *
+FitsTclInterpToTokens(
+ Tcl_Interp *interp)
+{
+ int newEntry;
+ Tcl_Command *cmdTokens;
+ Tcl_HashEntry *entryPtr =
+ Tcl_CreateHashEntry(&interpTokenMap, (char *) interp, &newEntry);
+
+ if (newEntry) {
+ cmdTokens = (Tcl_Command *)
+ Tcl_Alloc(sizeof(Tcl_Command) * (MAX_REGISTERED_COMMANDS+1));
+ for (newEntry=0 ; newEntry<MAX_REGISTERED_COMMANDS+1 ; ++newEntry) {
+ cmdTokens[newEntry] = NULL;
+ }
+ Tcl_SetHashValue(entryPtr, (ClientData) cmdTokens);
+ } else {
+ cmdTokens = (Tcl_Command *) Tcl_GetHashValue(entryPtr);
+ }
+ return cmdTokens;
+}
+
+void
+FitsTclFreeTokensHashTable(void)
+{
+ Tcl_HashSearch search;
+ Tcl_HashEntry *entryPtr;
+
+ for (entryPtr = Tcl_FirstHashEntry(&interpTokenMap, &search);
+ entryPtr != NULL; entryPtr = Tcl_NextHashEntry(&search)) {
+ Tcl_Free((char *) Tcl_GetHashValue(entryPtr));
+ }
+ interpTokenMapInitialised = 0;
+}
+
+int
+Fits_SafeInit (interp)
+ Tcl_Interp *interp; /* The Tcl Interpreter to initialize */
+{
+ return Fits_Init(interp);
+}
+
+void
+FitsTclDeleteTokens(
+ Tcl_Interp *interp)
+{
+ Tcl_HashEntry *entryPtr =
+ Tcl_FindHashEntry(&interpTokenMap, (char *) interp);
+
+ if (entryPtr) {
+ Tcl_Free((char *) Tcl_GetHashValue(entryPtr));
+ Tcl_DeleteHashEntry(entryPtr);
+ }
+}
+
+/*
+ *----------------------------------------------------------------------
+ *
+ * FitsTcl_Unload --
+ *
+ * This is a package unloading initialization procedure, which is called
+ * by Tcl when this package is to be unloaded from an interpreter.
+ *
+ * Results:
+ * None.
+ *
+ * Side effects:
+ * None.
+ *
+ *----------------------------------------------------------------------
+ */
+
+int
+FitsTcl_Unload(
+ Tcl_Interp *interp, /* Interpreter from which the package is to be
+ * unloaded. */
+ int flags) /* Flags passed by the unloading mechanism */
+{
+ int code, cmdIndex;
+ Tcl_Command *cmdTokens = FitsTclInterpToTokens(interp);
+
+ for (cmdIndex=0 ; cmdIndex<MAX_REGISTERED_COMMANDS ; cmdIndex++) {
+ if (cmdTokens[cmdIndex] == NULL) {
+ continue;
+ }
+ code = Tcl_DeleteCommandFromToken(interp, cmdTokens[cmdIndex]);
+ if (code != TCL_OK) {
+ return code;
+ }
+ }
+
+ FitsTclDeleteTokens(interp);
+
+ Tcl_SetVar(interp, "::FitsTcl_detached", ".", TCL_APPEND_VALUE);
+
+ if (flags == TCL_UNLOAD_DETACH_FROM_PROCESS) {
+ /*
+ * Tcl is ready to detach this library from the running application.
+ * We should free all the memory that is not related to any
+ * interpreter.
+ */
+
+ FitsTclFreeTokensHashTable();
+ Tcl_SetVar(interp, "::FitsTcl_unloaded", ".", TCL_APPEND_VALUE);
+ }
+ return TCL_OK;
+}
+
+/*
+ *----------------------------------------------------------------------
+ *
+ * FitsTcl_SafeUnload --
+ *
+ * This is a package unloading initialization procedure, which is called
+ * by Tcl when this package is to be unloaded from an interpreter.
+ *
+ * Results:
+ * None.
+ *
+ * Side effects:
+ * None.
+ *
+ *----------------------------------------------------------------------
+ */
+
+int
+FitsTcl_SafeUnload(
+ Tcl_Interp *interp, /* Interpreter from which the package is to be
+ * unloaded. */
+ int flags) /* Flags passed by the unloading mechanism */
+{
+ return FitsTcl_Unload(interp, flags);
+}
+
int
Fits_Init (interp)
Tcl_Interp *interp; /* The Tcl Interpreter to initialize */
diff --git a/fitsTcl.c b/fitsTcl.c
index 46afa5a..0ca0b12 100644
--- a/fitsTcl.c
+++ b/fitsTcl.c
@@ -94,7 +94,6 @@ int Fits_MainCommand( ClientData clientData,
* ******************* OPTION *****************
*/
- int val;
char *optStr;
Tcl_Obj *opt[2],*res;
@@ -221,7 +220,7 @@ int FitsCreateObject( Tcl_Interp *interp,
FitsFD *newFile;
int status,rwmode,i;
int isConflict;
- char *objName,tmpStr[16],varHandle[255], *filename;
+ char *objName,tmpStr[16], *filename;
fitsfile *fptr;
static char *argList = "fits open filename ?rwmode? ?objName? ";
@@ -1351,5 +1350,3 @@ static Tcl_Obj *fitsGetTclData( char *dataName )
Tcl_ListObjAppendElement(interp, res, Tcl_NewIntObj(nelem));
return res;
}
-
-
diff --git a/fitsTcl.h b/fitsTcl.h
index 0def55d..76f1cb9 100644
--- a/fitsTcl.h
+++ b/fitsTcl.h
@@ -9,9 +9,10 @@
#ifndef FITSTCL
#define FITSTCL
-#define FITSTCL_VERSION "2.3"
+#define FITSTCL_VERSION "2.4"
+#define MAX_REGISTERED_COMMANDS 2
#define FITSTCL_MAJOR_VERSION 2
-#define FITSTCL_MINOR_VERSION 3
+#define FITSTCL_MINOR_VERSION 4
#define FITSTCL_SERIAL 0
#include <tcl.h>
@@ -24,7 +25,13 @@
#define PTRFORMAT "%p"
#endif
+EXTERN void FitsTclDeleteTokens(Tcl_Interp *interp);
+EXTERN void FitsTclFreeTokensHashTable(void);
+EXTERN Tcl_Command * FitsTclInterpToTokens( Tcl_Interp *interp);
EXTERN int Fits_Init (Tcl_Interp *interp);
+EXTERN int Fits_SafeInit (Tcl_Interp *interp);
+EXTERN int FitsTcl_SafeUnload(Tcl_Interp *interp, int flags);
+EXTERN int FitsTcl_Unload(Tcl_Interp *interp, int flags);
EXTERN int Fits_MainCommand (ClientData clientData,
Tcl_Interp *interp, int argc,
diff --git a/fitsTcl.html b/fitsTcl.html
index 006259d..e3515bc 100644
--- a/fitsTcl.html
+++ b/fitsTcl.html
@@ -1,11 +1,11 @@
<html>
<head>
- <title>fitsTcl 2.1.1 User's Guide</title>
-<!--#include virtual="/docs/swheader.html"-->
+ <title>fitsTcl User's Guide</title>
+ <!--#include virtual="fv_header.html"-->
-<p align=center><font size="7" face="sans-serif"><b>
- fitsTcl 2.1.1 User's Guide
+<p align=center><font size="5" face="sans-serif"><b>
+ fitsTcl User's Guide
</b></font></p>
<p>
@@ -28,7 +28,7 @@ user needs.
<p>
To provide general users with a simple interface to read/write FITS
file, we developed fitsTcl, an extension to the simple but powerful
-script language <a href="http://www.tclconsortium.org/">TCL/TK</a>,
+script language <a href="http://tcl.sourceforge.net/">TCL/TK</a>,
which uses the CFITSIO library. fitsTcl was developed for the
<i>fv</i> project and is distributed as part of <i>fv</i>, which can
be obtained by visiting <a
@@ -41,14 +41,17 @@ web page</a>. fitsTcl runs under Unix, Windows, and Mac OS.
<p>
fitsTcl is compiled as a dynamic library which can be loaded as a TCL
extension. To load fitsTcl, type the following command in a Tcl shell
-(running on UNIX)
+(i.e. tclsh):
<pre>
-% load libfitstcl.so
+% load libfitstcl.so (Linux)
+
+% load libfitstcl.dylib (Mac OS X)
+
+% load libfitstcl (Cygwin)
</pre>
-(Under Mac OS and Windows, the library is instead named
-<tt>fitstcl.dll</tt>.) If the library is not found you may need to
+If the library is not found you may need to
set the environment variable <tt>LD_LIBRARY_PATH</tt> (Unix only) to the
directory containing libfitstcl.so or include an explicit path to the
file.
@@ -116,9 +119,11 @@ the methods in a <b>FitsFile</b> object.
<dd>Return ``Primary array'', ``Image extension'', ``Binary Table'',
or ``ASCII Table''.
+<!--
<dt><i>objName</i> <b>info imgType</b>
<dd>Return the type of the image if the CHDU is an image extension.
+-->
<dt><i>objName</i> <b>info imgdim</b>
<dd>Return the dimensions of the image if the CHDU is an image extension.
@@ -254,7 +259,8 @@ the methods in a <b>FitsFile</b> object.
scale, skew, NxN transformation matrix given as {<i>cd11 .. cd1N
cd21 .. cd2N .. cdNN</i>}. The <B>wcsSwap</B> option has no effect
on this command; one must check the <i>types</i> values to see if the RA
- and Dec transforms are backwards.
+ and Dec transforms are associated with the first and second axes, respectively,
+ of the image (as is usually the case) or are reversed.
<dt><i>objName</i> <b>get image</b> <i>?firstElem? ?numElem?</i>
<dd>Read data elements from the current IMAGE extension and return
@@ -372,6 +378,7 @@ the methods in a <b>FitsFile</b> object.
or absent. If <i>colName</i> is a vector column, read the
<i>firstElement</i>-th element. One can only load numerical columns.
+<!--
<dt><i>objName</i> <b>load arrayRow</b> <i>colName rowNumber numberElement
?defaultNull? ?firstElement?</i>
<dd>Load a row of a table into memory and return <i>address dataType
@@ -382,6 +389,7 @@ the methods in a <b>FitsFile</b> object.
<i>numberElement</i> is the number of elements in a row to extract (use the
length of a row as the default value). One can only load numerical columns.
+-->
<dt><i>objName</i> <b>load vtable</b> <i>colName</i>
<dd>Load all elements of the vector column <i>colName</i> and return
<i>address dataType numElements</i>.
@@ -787,17 +795,6 @@ the methods in a <b>FitsFile</b> object.
</dl>
-<hr>
-
-<address><a href="mailto:elwin at lheamail.gsfc.nasa.gov">Lawrence
-Brown</a> and <a href="mailto:pwilson at lheamail.gsfc.nasa.gov">Peter
-Wilson</a></address>
-<!-- Created: Thu Apr 8 14:39:58 EDT 1999 -->
-<!-- hhmts start -->
-Last modified: Thu Jul 22 09:42:41 EDT 1999
-<!-- hhmts end -->
-<!--#include virtual="/docs/lhea/lhea_footer.html"-->
-<!--#include virtual="/docs/corpfooter.html"-->
+ <!--#include file="fv_footer.html"-->
</body>
-
</html>
diff --git a/fitsTcl.sit.hqx b/fitsTcl.sit.hqx
deleted file mode 100644
index e83a8de..0000000
--- a/fitsTcl.sit.hqx
+++ /dev/null
@@ -1,268 +0,0 @@
-(This file must be converted with BinHex 4.0)
-:#fCTG(08Bf`ZFfPd!&0*9%46593K!*!%-LF!N!58B&0*9#%!!3!!-LGb6'&e!SF
-!N!- at rrmJ)!GQDA4c9'0X!*!B1'8*KJ'5!3%#E!+9!*!$!3#3$iB!!!%1rj!%!q#
-dAbiHY*C6G`#3"3'5%J#3"M'Krr(rr!!!`d!!!,BT!!d*CQPdFe4ME#kj!*!@"d)
-*KJ#3$aB!!$'h!*!$&J#3!`&069"b3eG*43%!VhJcrE542$d!N!8"NK)!N!B``3!
-!N!$8!*!'Xhd'q+TEp-U,IahKK%GZ)3YCqA+F,1afI$RD9X)@ci846Rl6eUjZjDI
-T`Maq(PR),B3ZH1V*2$`6haR"Ib`hfppaXT!!a8%[@3J[XMaC"Q6a*,XRQpa#IV%
-MYj!!@dk,,dmQR%b@)i[N0PR)mT,Pb#,C(IQ&,-FAb8)@[T!!@miN#aFV[%"XlFV
-IPbRC%AjZGJZHc$CCb'fbN!$EC#',NB8XI#@h!UaR%jDGRAQpParPRYHCSlbfH9%
-qLAe[6[*kVl14 at qffANrlc3EP0mp"ANjFG$'fNfbEa'rKc6*l'r!kVc-R6Ic-(*!
-!jFLf"MD`Nb`6XTbG!&J!!H0lVl2139kY$IV1&Phdb#B,ZBAXcXX(B![qJ22cr+j
-qRQG4&1f*SYDqU2AfMd at YGmj&dGIH5XbYVEN at 4rGEPJq5%h&4T(R4lKAjkD4I6 at 0
-Y+Cpk2rB$8A6JEk2SS2f4a5Ldb%UI,m5q"k[cT*q,SPFT4[[[2h,qr2HYV2keh2F
-[bDFG+H`FTG9fIh4M&2h!HF8A6kQjU%8+TFpi5'N#b#`"jNXTRLcQ6T')a*&[r%*
-"Mkf6U1M9Tp+UA1YR$b6a)#RqVI4$-I&`691$5(4$&0hbB(`QlQ4a at 5EPr1Ri-aH
-jZYYV,jriRTj[C-SNkFr'2K%)!SEk#EJ+ZejCBNTb*jkTf,G56lice5[k1bZd9q5
-lSPI at jcl(RqhiRlErR1KVk[1j9*c[2-F[mhQ`Kj2eqD+k3b24rFjcXHqcSMl("Bj
-5a["cmc6!**HfN!#0`-HVGGd1m@*!k+!CGFZCe230"DC)&)kLTE%da6&BQS6#(iH
-GJJAD6h",RBLGKTf123Pl-[B8l!cX61bT@!"NGY6DV4+ZD&0NVp4CQ2$Kj0ABef"
-IKEfREYG)p$2BPf"IKVdAqc2BYrR'#l&0f2QZ,I8$Khm5Z`Vl1Q`2GM'f&pZ0lF3
-#(kr!rMMfVKSq)Y'Gf!@Z"Me!lh4J,kYK"-J!,L,4+KBJfS"pHpfA`*!!#eKAB+r
-%EX4H*Ac6pKVXYGMVX0GM0f'I9%18 at r8hB'r!VXEHMAdc&KUa(rX6f$8e$%@LGf2
-IK,d%fej$9L4k(lB0ZaREMpf#hBTp-[C'l$EXGZa0f*Zad,S"l!lX6Z`Zim&6X1p
-dAjq2"DM"%($JTl#[ajjKR*KYh0KM['NePS!0i-TFBm52'PYDX20%Dl4Y0XkFCR`
-#Bm!RF1D*f#A'+E$Q(GLABqr$[K+lY)ER526k'Qk"D*GDA at 5-@Sk&Iql$hSTp+[B
-fl1hB1l"2`ciGq`cX-m at MY(dfpMRBGf'IDjbm'2YZl21`Em&feE3L%Vd$qb)X01h
-(X*!!PKGLAibp&2Yml!Z-PIrp*HZHbh1V%XdDM!5VkTNX+TpZJI4b8Q`QlCA*IdX
-4jr-YkI at 1eK6&@6akrmRqGMU3!,Taj at U[mhRH$4 at CG'cPf-,bd[c55@(5d!Hm'Ec
-N)1F0VFGE0mm*Q$)9c(DapN!C4[Pk1QVGX9S0fTef*aq9HCDd1dH at hh$[GR[aU2M
-%YbSHD6ef%ShLKarhb6J(+daPJ9dAVb"[0S"[4#F*e!qlJ,VK1Si,cK,KVpf+[*V
-m"0V)(DQS at 2#KMDaFH%58b08H,'rIQYAZdQhG8C88Sk4U,jdGChRaHHLUIbZ5N!#
-f+cNVNF$+pN&!$2F-Jq`[hkEeG*4 at DCbPjli#MC[@bbSZ[MVqX'NGC"p)4h(e2mJ
--"pf2[40l2IDef2AB+GJ0XMU(d at F4YE3bHSL#2JB5$NPLGD+M#!6#kX`%B+G4C(9
-h'ZL(RmL)mAJqIdPIINMVP6[ehh9BS`f-RhMM-qLRXA,V*SdB-#VLl%Nrq4(1M#c
-%AlN`d*J(BaQ*AMV5H-VlXFQiPf[8ir2Be(+hjT(rM%eAaa0'0C4',5BY*b2')j4
-'1BkT8)be$eSi'CHZTp*Sb,&jQ6"QS65qF9bDCI)aLM0PG5YRT%)pMHri"p)"pe0
-rMZq%jI`-[UKU0rAqT#*I91-H*q,5YBPU6'2DZD6$Z%P8Bbl6Xe5eL at UmiL6RBic
-Pj+Uc4[fL[iR[P#TlK&c42m3h)aeeU%hd at A`c1eA'Z%T-)b5RCT1%8C'BaRYQC6H
-[FUHB4Q0QVb8Pq@)DHCQc at -5-`F3dTR(D at K%c)K261&(6U`M82[T'paekG1b2m6'
-kSQPal&1Fjhh`l"+M1Sl'14KES3dCp@'F"4pM3)`Gi at 2N4%D(()fU-"+$Ma%@4T6
-`r6B(4RA`r3d(4RKSCheI-fD%MhXbRS32hCI4%hbk$QCd#4mM,Bc!i'0%L2VMqf8
-1M$MKq`)(4Tl`r3X(4U)S,A-%p$iq4PUS*cl'9aL"`XGS%,(i'$PL6!NIBeH-3H(
-l+!I'RI$p'3G'Si!JaPFBNF+(XXq)%Ml'GQ3Q)+Na*B12fXG)$AA'akJA1)M[`ac
-)LHp21B!K`"SS,Z-9+I8BScri'2h"iJ-$'H(""iBa+S32eB-a+Rbr`B(a-(c-AmU
-S4&TM6)aEiD2(`"0mM2aJm6(fj-iV4Qj at Vp-lq"K*!i[aIB`$q)$[,cN`,JEm-QS
-&hZ)$#aJA`dGG'"[$"fic2SB2h'+-$"mMCSb6iIX3"mE+m(f*!q0P3$Vp`F`)2V#
-$F60mh"N-`FFS&*`#(f0GB$+qAq2!'"Qq[q"!Rd)0U"Pm!aph%L)q at 69Pc!`IGf,
-F$"mMDibGi316k%GmAqB!*N-a'"0M(!dI1-9B'Mlk!3k#Ma%YX!JI)h+-Uq'lRi-
-)9FGqJJ1MDe!9F&6NKH28 at r3T2RT9Z0TaLJ'Vm6(kajJB2MJ(if,i2XF"M-A("!R
-MBp!IaYHS-cl`5*MF&0 at GX6*mM#JbASD2%6*UL1p6jQlirT'$QAr40)Ua0FE2m)'
-cM+$KScrK4rL)Cl3-(q0rM*MKqbd1i#Fq2AeX4Y(dGi)`J$%eI(!*aY2`J9q-8H+
-M6m"'I)a"J[2ik!0UL1q,("Kcdpp889K'mI$"HFL*$k`%!r(4UiaYiZ-qM(,LJ`-
-aESR[pcM3GrMqRJ1MR[Sl8H0qM'(LJeH!)IM!0IJD2RU*X8jmM%M#II$"&4Mca%F
-I`)[e0ddF%Ac$"rq"Bq)$Bm!6I23U)jIib-AB*6kQS1JeI1!@ppAIG2@@88qe$li
-(*Z-$[q%[q-!bq$)qHSD49Ab-LX+Km-&V'@[%pkmFi!lk1dND!(R``ArS(AcJ*Z1
-Cq1KEaKAaF6G`"KqFJbPcI2$,R`fqNp8(ll82[[GcpX%ahQFI'2IcpY&Ai!!qX2B
-AlD-2i-[k1dAMKVpN(c`@R-G(Erf+IH$@VpT(IEN,[NpbN!!TXe08HhL(rQD)9rq
-kI@$f"qfMRq!lq-!qZ"XqqKBY!Kqe!!I`JE9J)lkrjI#4i*XTEJG[aFGGk4GmF-k
-2f`IRqB4pB$fF(4qipM[fdCpS-ILi*jL'$pl`qrEp(3IUV,p603*,6I#K"G$lq1#
-PIf!I(1`cpR&[Y!Kmi10RlD1(rmJqkX9pmF(9d(cd0d[i"2I("jD!iIMJr'Jeq-$
-X2lB2r[BRpX&2i&2i`&Pi*6i`j3(lU#NiJ!rmKT[VElBi)MS!2V5I2lF2ENppm)(
-PCYH"pP&MH$%qD[aApS&PB$JqqJdF`mIjUm%h4b1kp$8q-*KH``F'ImdqqKLp#"m
-B6kh`8GGrX!qmJi[KSjrqb6jUM at kQ[p2%Hp##m+&RS+AJ!c2!,Rc8pH[f`5(rc6j
-iMYlfB(aJVTP*e$jG9dr52)fkHT1$6H#d0drI"(p9(J9Z3LY4(YPTJ[qVX(FJdTD
-1jqi`L,6KBmSM&dhJN`Sl#L*Y-&&TR"UIlMeP&I4dX&#TCr&T2UI#cS6)REUVZ`m
-KFLGkJG+B0cl0GC9`$*rZ)D8aF(bkKj6i"6k0$8VMprKd(bU0d1Y[,M&+Bq6i0"m
-e1L3qM80+Bpri0)GAiX,i0,p4(U'H#lp5iSEi0!G3'M((Th&+DF3FRqj9jIRBHHS
-KaY2aD5e-LE2MdpaADH3FRqDqbP1Rmq#k5ML*6h-T*Id2RmCe*4c$Tr&, at IpVTJq
-9pEpQBT6e[fEd*QApVaN04 at p0FAfD9bRVIme`B'ApVaRqTUcr0B-pb[TIXhT8p,m
- at qPaCrf[K$XVkAi[k4[5r&V3(CIf["He!@IpVd9B5dIpDi&h+qPm,(-"S[rJd6LR
-VIr2T+fApEciDRl,q0aq059RrQbrY9r5rqI"cCIe[2Ra2 at IqE$fp4e[rQJlR+qYm
-#X%"CreZJ[K6pE`%F5&Rr@`"Q+qYr#q"jb[VI!RLiX[kh3(JQqYm#q)QbrNHl+HY
-rVI5fX[lAbRf8pEp at Y$"PrDm9VU1XrlA#lCAe[eEeLZKrVI!aCIf[&5kKV2mY"2Z
-8pEq&`M24raCb"fApEb(kPl,qYe!B)rVI3VL8dG[aDCkTV2mY&-D)rYFQE"EpVih
-q9pErfVLEX[lA*UeHp,mfH)DbrYF'9eI at rpVJIXVkAaXm4&RrD`IAP2 at rGY9-p,p
-fp$KPrDpG'#ckAcXDK,,qe`lA9GErfZ&Xb[TI"la#@IrV!*Z8pEm1e8cd[`iiRl,
-qeb%1)ITI"paG at IrV%$k*rYFTr"2pVa2-9GEr1ZPKCIf[8h-0S[pe`Y'9pEp1e8c
-d[dii[,,qe`Q(90ErZY6(S[peJCA+qPmAIDZXrh at KkbRVIehS2XVkAjHiL1KrAI"
-&CId2L&E at rlVK,FVkAcHBUkcrGBZ,L2lA,C`3rDmEM8pCrqY'fe$@rlV9dk,rGD-
-A+1YrhI"9CIe[%6a0 at IpE*$iRqYmLX&9CreX%4LMVIi[S*62IJ3qX&Ie[NE"@p,p
-&`RA4raDK+5MVIi[JcmVkAirZ,ITIMcLVk(mpiN1Lrr@!0FVkA`qpSDcrpD#h+HY
-r2I"MCIf["le'@IrV3CY3e[pki0l+qPq[q)6SIlh#50(rHZ%$b[TIVlL4k(qpp)1
-brYI, at 9Rrka9r&If[&dh(E'qb+hh`%2L(Yli'(J02mGIB`(2J-I!,Ikh,iG8fF!2
-i%,`!2Z#YKr&@bAJVC1#Tm&$i*$`5rJL2KDI#(lee2r!e1#6F%Fi)9i3M`JhKK("
-"1#$F$liEVJ*#Zd'cm9BbHH2BrQSQ2V5IlkaS3N2+VfPbjjI3,G!Vd#R32p!h)-l
-S%qJ5k#2S(qJ5k"(S%1J2N!!Dp!Cd"[3&G!Ad"(3%p!0d!r3#G"5d!M3#Y!'Y#F"
-Ri$(`&hJ,I!@Z""H#Vm"6i#G`+AJ3[!M1"%q"Rm",i#2`%2J([!1q!Fq!Am!Vi"2
-`#2J$[!'q!,l$`q!,m!6i!E`!2J!2J#2$MH(%F'%i-2`EIJd(K[[#HH(RF'Zi0M`
-FlJ[RKH[#FH'fF&Ui,"`@lJTRKD[#8H'QF&+i+"`8AJrrK(I#0q'Cm%Yi*CS, at JX
-D#pS+QJTk$RS0QJTD#KS+HJpD$GS0ZJjD#KS+fJQD#9S*'JRD#*S)@JJD#0S(QJG
-D"aS(fJDD"[`(V3K0!bd$$32Y!Xd#V3)G$rd1h3kp$Td1M4!0%*d1I3jG$Jd4r3m
-p%+d3I3jG$Md1(3lp$Gd0[3fG$Ad0A3dp$4d0r3cG$,d-R3cY%Bd-E3a0$#d-$Fa
-SAfMkD2PSq'LhD2E-#c!2J'D2GSa'cc`"'Mfc!F`0S0 at MdD0MSmQMaD2"SlfMZD1
-eSl'MVD1TSk at MSD1GSjNcKi"HMNk12Sj at M"k1$ZjTe'M6D0*SdHMJk0aSd at M3D-r
-Sj'MFD0lSi at M3D-pScQM0D-aSbfM+D-PSb&SlPY8c4L0''dB60PS`fT(Q&1Lrk,l
-S[HLm4Yq&rm*lQFq!mm*eiG"`C,JZ-bl-YX#aQG9JlJ-ZcF`(Fbl-E+#6-kr"V!X
-c,Xbf-!ILV@*MMSAj$ZBLQ2eJCS9C&@C8d21C(i#V-ir#$!1c'XamS)NcIi*'kkh
-K3[p!pd"R36Y"5r(@DU&eS- at JYD#PS(HJFk"[S'ZJCk"MS&qJ at k"AS&1J6k",S%H
-J3k$ES%'J2D!jL0CJBrL@(&[Y6VFfkC90N50T89EYe at 4cQ$#0faH'M&HR'qhZF*`
-A&6P at 4FZp%aIG5q-Xbr04qi%N'dI,*pUGrCfll`k*VQchiV)IClAhXZ4Fe&XkFM&
-ehjAlQq[ULpb5RmL,E$$ICi4rGEXc6l+Q)r'qJqRk[B2Ac9-20klplXp&hP"YFFi
-%GPp-HGPN9+A$K'$*eEqb1Tmjq2,ZbX-RG5-6Qbr1ZPkR,NiBj$F(lN`$L&-D!+q
-f5mTKG,+cFQ6D"5BZfa3QU95@'fFURI'DE3C2M[[*EURpb[TChATk%9,2S(K$)GR
-VXVkVF$-[j(*G at q,#hY*jG2A)0(4MXa1X'XBGPSc(&km9hL#h@'aj2'5JH`Xa1dG
-RNS+ZL"c*NV-XJGdk,[*q8TCj%4e15j!!+3MTZl5Uc,Ym*DU3!#ahIFR3p(b#b+(
-RXDZ2%Zk1Lc3T$lQShTN,p[eVEah+'(E)dR48aq9k&P!c*9bGMVETLf at 6XXU(lBH
-50cqD&i-b at ZLV&c3dlGdUSl at BAA9!rYiU(@f at -!"Gk$AaH&alPdl5E-$QM,e&A%D
-,bFCNFc-TfL&R*!$GXR`i*UHqTR(VCE`l`NA at plMLML5,ZXIE+f-UT[IDl)i-L*Q
-XiXqNT at ldpI*N&*TXHkRG-!-EGE*X8A&Tj(62X[MA49LjYHBEZ9[U,-ZcI)1ECNX
-K'pLk"PN@(EVSa,H#A6bkKld`el1K5V-5hpjq4Kp+#ZfmI#XZ%VAmhZfGZ-f68kH
-53ZRk6e'%lENmfj,qGMNCbU9VXjXqe+iYaCP#+F3eN!!S(SpH at b+H25&Skb#YqVR
-+J at IEB#,2VA'fIZU#`m6LZ&de1r10kim at mILHA9q[DpQ[T5Ep%BhXAXKeE*jk++I
-VbDEC2[AF02AF229NEd&4AFqqRC6lGR,ZFp+E%eATaL+IM1[cVVJSN`,AYK6)dZI
-Y4Aa+aG+ZJA`3dZfDZ'+ZJiUj(LVQHULBkq(kVSIEZaiZlhUbYq#'VSH@%NmfZDQ
-GZ#5p at icGb@DDMh#!BMXQpBfHfLr,LFUL(IY!$1h4%0)TI)CUVYrHFI9RpmkrIVl
-FbK5 at FI8GkSlBjA4,&PGF,S!QS2k#)JGMI"EJCG$Ci359p1iYql-TaqMk8$3Hphm
-Tq'q2$PdX%S(DEiLH[P$q4RlC0#(+h`!DEkU3!-qbD[FkEU4K8kY#[05SUCG00Y2
-4#aA-&+FBi+A2&#+SZFi`N!"AqB9ceb!(!@rG3I9P`i(Dhk$qfKh-EeTmmbJHTRh
-GbSYaYc9fMIYE1ePJMcXR46pTVa8*Hdib0%Nk9&FcB"U$j3`kchM2QMm3DNFIAPj
-00UD9l42Gd!%QPmFK0KNMGf9TVKL3!(0JPf!mC4*6LMX%Ll[6IZ)8PVM2Qr-`jrH
-qjcjdrPl2AZD6 at 1#qT"Il4lkkTp#X+2cZRN+cSM$b[hX+5p[aXa[rr at Ab",T66me
-qES+1$h!`F`9j&F#F*Jm6A#pYmM#apI+G2*@GpMUFUE4,Gr)%LmVmqc"eF+pf)qB
-Mc5I6RbD-+BcA0r9KQZ+q'qYHdV at UhiG*MlFhHCL1Z,ZT)a-8EjaGQdGr%)@h6*r
-R`1GZ,lcRearr000mThXlMkAYHphdU4CCA,Jhi-+PXpc%`(LdjjBVJR6Kic8&`BX
-+l!QIfVheYalhSBH3!+dbNU at mZH@4rXNPpTjb`Sk!F(H!MH!j*qiX,RX!f!r!2$r
-l!0J6%1i2m2F'I'GI3'&AJ,Fhe"6m41`dl(6X$1a-l+RB at GMCf$RBdl&cXI1`cGJ
- at E#Yf)EB0filY`(CLZl$Gf%AB(Q`[GM(fFGJcX)r(RSNp#rX%E"rfE1`jf(1ajf(
-2ar)HQ5ABTGKPf!Z`&f)[`Ll(ASaGJ9f*AB9GMEd'Hbhf1Zcef#GKEm"Za[D(U2p
-k+8hUFaLE0*H`[F#YpH!&)*D-,K!9ff!%3r"Qm53EPE`-D,lhiGh2ScBb3GiBIcD
-6 at 6"RA,*fcLEh!4X$-I1#PU,24V(h2XU')c1RBi0j,mDd[Cf9aD at plEf,#fX,(0G
-e1fXAASjN4rPX##5lp")L#C!!jDE)@jkJKQ39fbacLDG)92Uj"2eL[8K1m&XZ`DS
-[@CGUeR4j,p4JL-YEaB9`NRjY@'V,qM!0RTXejXDkQ at -'5rAp@"dcH4#UcJSG at CG
-U9Z,)ZP5c at QM+Faq[ejLakZIiMG0bQ9UH%,e@@iM-+PCCPfV at PjiBR6q[06p)CY2
-b1U&CJ5RV8XeU59QADPBjDKR2j'2Pf5R41e8EXqC`aVLZM9N6+1Y5cISp at CHUY1j
-R9XB1%qeM)%A,IZGUR4 at VIZEF(YfUq4A@*Cd at GV!UV80UiU+XH@*PN6bA`,5HV%Z
-05Q+8GDP4iL0hIDKHN!!FPHcA8Y9b9&4Ve1E[HFm2XdSSUTjE-#`VZ'08+pfdR"K
-M68p8UhX at 4[Z'V-Z+DPf4V%Z0DQ93Hrk at R08p8DehkSLHH!YVZk*DbD4PabKbShN
-H![+MPMTMkLeCPaU6P#RV8Q15'f9GDNa#QUa,MDNHXLie*Yb3!(@T-Df2NR at T-Df
-+NR at T-5'%V%Z0DAf6M1`k`LaCPqUS*f4GUU1HN!"eUBjU*1Y5(DfG%pR6d5Sj at CI
-UD!fH51q19Z$*ZP5([[#H5q"S6C+X5h8dS#6#P+0e6l)ZeG%+*PQAkUL(C&fUSe9
-CXLl9dDSX at CIUD1@9V%YeY,CCeU8k at N%Pke,MkLeCPaUAP#cV8Z2#!PQA'TFF,1Y
-5iqS0 at CFD9beNA@Vm`USmI+cSNh at TFDhjNh@TFDh[Nh at TFDepNR@TFDeqNR at TF3P
-CXLieVY99XLie[[YFJVM at 8-Qke,Mk30DPaV8560DPaS8VXLieVR9JXLie,Sb4GDP
-aiCqX5ieVACF-Db68pc,%Nj!!&#rV8K2#DaQ663L(C&eU3VJQke)6`KTCPjT3rmZ
-ke)4k8YDP*Y3RXLieSGU*`*[3(@4GDN+#X at Ja#Dh0NR at T#Dh0NR at T#Dh&NR at T#3f
-ELXLFd&S`@CHDN!!'+*`ZS49GXLieSI9JXLieSC9UXLieSA9UXLie)Ib3!(@T#@'
-NV%Y0D#@DV%Y0D,fCV%Y0DUa"eU8QaCeNA at T5e%2 at T5E&+f4GDP,B+B1VbGhR%L5
-&Jl)Z05QFNR at T5H'&V%Y0UTpPA at T525EV8T1UVka,6HUHXLieU99LXLieU69KXLi
-e+FiNke+6kJ0CPjV8'MPCPjV8kMGCPkVI(j9j,N&+A&(@TDE%c at 4GDNVDJDa,63R
-(C9eU5KJUke*6kRYCPfUH1#(V8P2U59PKPP,YC&eU5M'b,M at P&@kb,M at PQXQke*4
- at hXQke*6k9GDPTV6+6YDPTY5[XLie,G)Rke,08bPNA at TD1#I2*8J,fq5j"'Ra((N
-Z39Ti*XmP5![6jEN%D@'L2*FJ,Gb4ja+NeD[bA)+dqN'H5j!!eThPZ34TpD)mPb#
-Y&AAbA)+df+FmPb#Y9AlbA)+de[(*F`R5iSZfMB&-QH5f[haa9K[Q9VVN&SCP2X3
-PXm$&[[$j-h19!'+bVR!&AppRYS@&#B,eBFASF*pB-8&q`9Ja20Ji9SaQUjqh(D`
-F(+`,+fH3!2eKj9K[NGKJ8q4AR9AM-d[-"Z20VU2"Z'!e at M'DH5cd6EeYUKTF+jL
-*[Q,jXi(ZGMKA1R8AT496K#[DKK28bqd[F5X(MlCTEXeE1CDpEjA!iAB)0X-9Si0
-9FFAS+hRJ$Z8FMVrYhMImHl%*(LiPX9l&j0a8Sq0UYTm90df1!M-*kX"-G!1B56!
-#c)6AJCRS'M"l`I at 1pc+8fX5,,6HfDBS4B-l'9j!!bX32!60aG@!QZJE-QH"D`FV
-!61!B-*1L!Fbj"29bei$C#ajYdf&JpQ+,`*`*('k(1M!6A3GQSJm!-r%eB2D#Kd[
-T!r2JXY)U%)p$m5%`RS$MF8!HJq6$S$`+bf2!I"#D$i*c(Cl(!IT"1$d%U)FJG3a
-8$m2U+,#131XBZ)l$kcM!MK'GFDSc3RB1J[FBI)m#q#-3MPCh#-C0QM%S0cN1`VP
-*-`lT*XNBV*XFSp#H56''1TNmY6E+C"K[TA'Scf8C39)hbc$NQqJaf$Fj$N1r5A3
-3r[ddii8ET3'C&)HEXN%(-KNUP#!E2YUcBp6!j"LM"bE("*!!QbbMB*j*-9Vd3k!
-q5PLb+3jI3a1AmPV`)R1SC!Q)3b9&b"XU at I+dSC)MB!h9&1ibG02[eBZD"HSM#Ac
-H8Fm3)&`pMI4k2B(ASp8Qc(11!dNbb&e0iM+15R"!1#STI-`Cb6"DcP(%'D3dP6`
-KSfPN'@X,Rmr8-aaUpKbEU5H!c)a%0hSRS$+9&!'6UD3S%*P+%Tr(e$-dUKh)rU9
-R""6j459,`#mU+8*q8FQ5jaH9(!'rU+6`b8%p3h'IIb90EXYr*F&B"qA*`B%N`FX
-$KT+ij+!5R(rC3$Q&6`j'-Sb at db-(PHK"FP$*8hak`B%XBfe4I+C"1F1KCLmmkD#
-5`([S36 at kd6X"1DLN+$i9B6"&J4a8N[MNS*kK8Hf$j-"J`HTiY$Q*0j-AFS3[GDM
-LIZD&$[@EAT!!plpB$bTfiGPq!JlUL-D&`1hL+acUIAdN9A(IrNMIk!BHL%F$p@!
-MM`ZTBlb*bKpi9%54arQa!A[c!d21jXIQQCSI'I!c2c#%JR+XecPqX%rR`VJ!em2
-J4N[NZ&dBjX&-d%&j(MFBQU%T3DM,fB,1b@#G(c@)#FAS$0)@)`XB8B`AdPH-+p8
-jK&SrGT!!h[R42K%,ifTY1[iF$Tq9K@&`X@,-80N#hZ8("Qc,$ba`,$r8CeCKA*&
-mK!NDPFiaXM!XV+TjA880e0hS-UblSF2!lNCAS0f0,B1l'cS-liAS%1$Gm",%Cb2
-,k*%0Vh990N at KVl+"eFkUJ,dIA)4l#Fi$[R48%I,GZ$VSjq+,X*q,V3*r,N-"qR1
-4PFS2`lmEA5F!ERb*!Q3M4pUi331b+FTY(&+"A&5jL'8ki)D@#B%E at U8%ER#*&'3
-MDl3JQf+XpN28)"YBU,+mA'5B(AMK*AVJa9EjJ4GH*JKHF)NKH,&9LP!-,h!%,hk
-)*2LK*AMaiiGlc-q4Ec)rFVM,bN`K(ae5K8ad`"8bh4 at 5"5q`aKD#"#&G#))VI#&
-)N5F-3 at Le"DU8`3Z[F3B[`4"Tm%-2Y28"fZ$RU,4eJ6J%BC9DPUL$&e[L$PjXK6a
-id82X`3mGTJpqM[%Q'#33IQ4BEARL5ie#H2&P$Z%&$j-),ll#)VcS-Sh`JSGj4$%
-q*"*HJK+6m'2,Q1-RU2 at ERk63F(jSVH-UG#)IAZ36QI!mSFKd at T&4H*&e5K&N+(+
-+),T++S)F"9B4a!lh`M#[m1,Va-,,8')@IQbMc4[F`Np5EI13!&d%FG at 5P[Q&&e`
-Q'&j`P@&ii5 at +iFI@1)DIC+)EKPL'(aT at 2IHUS4V9m(18kBDIB*Kbq$NUY-228+B
-HIS*KqP(1%9)32dQ*KS6aCB`+Np3k-da8k-i`[0'K&@SbQ+*)6i)8HBS5G'D4T[M
-4GDT5c&+N+m8-9FT5c&1J,FAi!rdb6&rm((8+ifFTdCJ`IJ)Q'R3Q6$3#%b'Y+FD
-1P,Y-Er`%CBVM*kM5($p&LHU%m6 at k%bCkX'1'D%mBAZb+SGPp2lC#GBEQp2hB+V8
-*Cr,p`"U9m at 1,&+B`Iar'9E")JZXGP4r'$m2+(95P*)2MpN&SJB,31B28`aZ%Ve!
-1,hU3!'TiNF-8Sc#PAi`VeEP'*FVcq(jdQ6U8jZA$i%DEPLK#ERLq'$08YJS9#-I
-MrF"Kk#q-`SGaGDLA")e+Pk#p-$M[a`@[,`XPN!!Jf%lc6 at BED#`ml83[q6i1VrI
-'BJ[FajTBr55!Ep6,hm%&Da``H,LJMc`53q1#pkBpfaY!j(!Kc[-FP"kQf4FpQK6
-E*DX6Y*jc3b&*4`C*p%X at pFXmHBZJPKDfm(j8RPCS+313!"b2R"4``CATpShekP@
-E'fI)i8+XaJ@,'a,N[a`Z('0p3Epk8lq*Xfmc'5 at mB02D"K3jA%#ecZ(#3$bl$4-
-+Z(#XAXa6I!'aGI8,Rm0VBIQXFV-UjR[dfB1fXXp`JZ"CdCHR`c'cfqZhfr[+VHr
-JTFfm*p'5pKh9R-bm"Up`Y+YmpVQC9r[YZlQ6G!(`Z'Np(D99'QHXSAhX#T[@Q5D
-1k,$l+fq3!0kdAL9&I4K)4h(ejHZlm*ik[V,Le`UlArcqi`rlZF14QelcfA%MmPl
-82DT(ieqrQbVfLV!UPbfj5FG2mrP%Rkreq6UITrYmMFkk'2jpR&IdaFQhkaA!Mh1
-H'6l2p2P8RfIj20[R16kIl[0FRqIjh1acLmqY2LrdZFhRGTmlI1ldZF[RETmAqGc
-MFkr2LhhfkRH'cirhq8bIcr,j#6lhqAbfcqIiI+l2jrPm[Xp2p(Q*cdYpAZEc"6j
-Ik20&2Lrhq at +I9rLmdZG92YrJmfDIqheqNXqVGrY@[4ST85E at YYGSi,LlTrLm`HI
-e2Vpf0h[m9N5BENEUr3[%R'LMcrYp[R0IeqpDMVcTKYFpq8`derVHk1[RRTil&l9
-Zf(GIliCp$rdGMql9lkR at llrqaR1$Lr%kCUSI%bhChlYeZek,l),2`MIjaF!MRhe
-q+d3kDYeakFPfjY%#0hp*8mkm+9kr8(fMhJ2pJbpiZr''eZ1YQqImLQh[ibAXS[2
-a[QmE`-H,Z2-hY-*!`hG&)XRr2b+4j2pIN5M6aUN,,pVh[k3(*k``6CljGTH&hp*
-Hrr5,'4VaRV$4eFpild-pcjS6E6mdB[5qAHG5[k(pZrH``d#j,HqE2SA+D0565Q4
-qkmXhE at pRCA&TEh[[iX,D!XGehFkD(Sj[8IQdBQc6T9!fZ at p)GV5hI)Bq(K`mUV2
--SmF%rKQ0EMU at mcLX!epXHENh!f!4$SYJebqGA*[riSL-qhMZhFQib2 at +X*eA,Xk
-FPVR(f$jqHDChl5,F`hd&emLHRj2#%0Vh2dCBPSc(-`"'JlM(XT9hEer,)b-XM4c
-,XKH(DEjjMj at RLe2cf1r9pIMkVXX@C`2daf at VacZc!HjK%'EceP@%dE1Z1m'BLj2
-X#b0&jKihATe*@Ki2%cd!M((*@j1##E9mI!BjYeA$Pd(%h11QUeepZ1mY!dJqm(r
-`NDh('%FC(cA,h--+`#bZl[DZMj'1paPpIh8kRNlRIkpIYq6pbFXp"LiH(ZNlI!q
-q)b0p%rI4H2Crl*3q-rGiD$4`Y"I0qVMF5r$#VfRf"+0FXhcdm,8mHJP&8hHSKEZ
-8YPVjG8H[)p@$pl!'--'eKarm$`4HGq*k2GBGc6GQ!p6$8X&-al"F)jll&-&DGhM
-hD,pl9X!p4J[bcAXdJ2`rlc(1#"kkapDc9`Ybk,-0+!RIlhX8'mZ!!M$@(ESHmTc
-kHU1jpp![K,3%h+2rT3iClipXAIZhAN6'EpjMed[XIEbZQA[B!a552FRQM!!mX`)
-S,IB*C8-rEAU#,qTh4Nl`cMh9C%E!2ILkD*,[eGAE5YAerdeLp)EXNbmV55E0RP"
-),#HDXMf!`9NPY&Hl!T)IrLC at 5XqCqD%*kY*@+rqS*PLrKpeN1Z4K$Dl@(BpTF"2
-h1+,"6GcML!Chm"i2DA$Mpl"hD($9ZYSF0,KkScfU`BhIiiJ'9lh'Yc at iLAXmV-&
-9,Q)Md1"'FlK[e$ed$bX!iplB at ER1mmL48DZU[@Epd2*UJ2DBPMI#C'`"@YkDDkp
-EQ0Sjq[$Ubad%dl&26"IC!kD#E#I6-lGFCA"kX5H6HpRR,1Hr$01a6dcKE%PQ!!b
-DZ[Ii2J*RQ2ZB![!IpE$I6-rXR3A`BQRpIZ[&"pUl$kS1[fRrb3Md44SGr6!MQ,M
-(%8B`FBmM5(l`(JmKqIJpl!&)EPr3mUTeY6PSHI9'Hj34M0rM##1SAZ2EM'$L(Jp
-VHC@,C1ia*M2THjL(RdrJd1kVMbVR%PY,La)(lQ%&d2,i,!,cBVHN,qPH1F9Q"2(
-e2ACZR(la(QXh6Pqr4hDaEjA#6Il5ETA'HZ"(GUXdlR&i at ZA`qQ6,`,6+$hD3!'5
-BcN-l5"VpB3p3darCe9'Vaf1l1KTeYCLXc6lk6&MlHY5C`)Gi)*%qVTN,T%Jr&#&
-J4aQRcX06GLjTmNcRZ,E*-i2Mj8fHQ4cA0hP1jELKb61,ia90RYNFVfcbc1'iXFP
-c1XGVQMac19lEj*R(mESQ6c2(kjXm,4`h0APD1 at jZm[$fR2iQ6a[(,8dHCP#f0RN
-k1$kjbG2*mFBQ6aI(E8fHESlEQcb,10l8j1RKH(16TjIM,8fHa4`(QMb2ilLMbA-
-'aje0(QC$GM9jcZ6iP#E2 at 4ah0hQH`(&2NiH(aqeYmTc0F9q6jab1YcCjcZAie#E
-2H4a[Dr,`f*lEQcb-6Gc4j&R#m at P0(QE0RplNBDlQ'8dHYXimXmPc)FGR0AQB$hP
-fNfFjaqFdH5lQq0`Qc`U1cf[bV16ir#B2mlB[D2+`eHK(QMcAF(a$NqGDMRFhHDl
-Mq-BQcr8FhpcNBCcQR8dH4TVHeH4K+ZlG64kQDGjc,Bpf20KRpS%m0T[2%[,-*6[
-[)iH1(K2'H6)m+2hJiA`b'V#BY*,)2-b1T3#Tm!cIEj`rd6ff1*TN-fBHdQCeqp"
-H&8mUY-"pDeDl5lGe4`Ll1j+U[A4fR1A&PjmR[B)GZ+69Zh#h4[q9hK,flAZ`qr`
-cCbeYAl5P6f3DQ)Ap$4#f9GAid2lpfXV998j'mlaeZ*XPF9XQrDVFIhU`[IqHqA[
-fXa9ZcrjiR'Ukf$lbf at XHp4Q2pYcL,ZKN,h9TSamDE[$!9R[#ThC[ECGlAU3c%`!
-$S[#"56-#UN%Yp+DR5FG at MLdX,md[RAb"E*YR+*PAiqU$R!HIUQZA`cRjMQSKpZC
-FcE&P*dmJXIYjVZ,iQKZ*d,k0Pj at Yjq`Qj%dL,lPf(qeJ!Ifk'5TlFil'-DDYMjU
--ATemP0M`kZ4)2p9#p)'bZYbe*m2QTbZZ!#dGa#89Yq05R0, at r&ELp(hmEc(j*[Y
-qXErDLG[iNfcNPI[jFFkMq19qIYc5(b,fAF1URUE,E3Z1IC!!`fh%d9'j128a$Nh
-$UVbF6iN)5Chmqje2RD,I2KbAPq1 at XbhH16LX0LrA5Cd9G1Tl8qrFr8li$3kcKP@
- at AiVl"+m2L,'jBJpNm51r6m"Tc[GPYI+Z![9%2I6Mq0MDVlqTE#GhZR9FG%ieCNX
-rr8'GRC!!lh22i*-0D&2ebSAQ%2F!ZFh at Gq,B1MmTa(eDY at I,Zrj1qK%1V`TaAp#
-QE,DkdrHm(Q&PL2YVeC!!,Hlk1dDX8HS8qb5q$BjlaE41kT%E#EJLa%hjNjdkEAd
-I[L[GVhGa5)@kI[9hm$h,FH5B(1)qS"S*mBfGQFCGN[`&[VFklVlTr5jj8N6UAYH
-$eaDF&H,fkq8+j#(IFcNF'q)Q+HjYMRZjkM%!emVM9[3A1G`jM+p-Eelkfaa@$FX
-VICp at 2hPiNefpVEk*Hdk+M&[CZ-MbpbZpi&BZ,USkHEL5LlZ%I*&RM#Zj128Z$M0
-$hecd+rKj,B(qlL,rm4m*FC[qNMKH4k#rHhJe31)E3YaG(b#1ea$Slb[`VEBXa'h
-q2H*irB$qNVq',aRL,[d%2Z(bPl%(10B1F9rMVNSiSlph,01 at ac[ZEZ*ic3"eHL-
-(ZIHjlm#[kf$LhMI&TpK"m%`CYp6[lZ$",6q"Ah",8C[)ei at ier`FIX'Yp#rM5i5
-i$rmM2X%YpFmFcJ[hDck*RpF'd'I84HkaK-hZbQpPQI*RiJjZh&DiS`UVL05h8CI
-B`4$h*AT3#@2eX41H%MHH[IqY"-KXcCI83fiIa,lP$r#jZS%k!*l&HL(I9q!FbP1
-dDmAPHN2Fep(19GL$UElcDIT9mYh2LbK8i,2U[YZjap33ppD2%m"fIk$X&cKX$R%
-I!qH8Y[N$'G6ElErBhVF6arCqqJ!HirCIp,e`*U9Yr8!VM`9aqbpfi1q*%cerL6M
-+Kd+q6kUZ-L at pP[j at Gi5i6h`V2Sd$I+Z%cIH%Z&IS6FqAq(lJNFXRSKqiMELe)Hi
-+AZ%4GGr[J#XC[UDr"rk8`p`3pbCk5AfhH53Em!9Ap[-5$(AFqIjp"aH[SNH9CkI
-kkA829`E!E"8fd+V$rc$P3p&h+FlP0kS$9JNILLiV6[K0p'I90jT(dVFj(M$T9kI
-hGTjkPP#0#Ac[iGk#amiF2D$H&Z)q#0m62(Bq,$`'jrAafTqDiV'cK3DQc*0ZJ$F
-,(MY[r4Ym`T-q!Ki*(MZEe&6jC3#r#rXA2(CZim8"5[`#[169)A,[&kPIRqHq4!*
-bmF"j#QkNi0dQ(q+'fcI1A@#5!N0-[6mka9(R#ILa8VrSle2`'X&MjjZ&Zbpd[Mq
-FiV(64M-`r!AHT[(-ZmFc9EmAKlK2Sjm+(MZ[B6f&%Xr5hfIT6m(Mf%IKK1T(3pb
-AljMLXA2k&iKlDBKE$Bi,(MYhrMbqPi8q@`Xh%MafjZ#ekXIFhq#XLmI1Bm)KH#)
-`S[Q5i,&c$UkXi,r%A8 at I#"l(R[d`!Dm-peMhj"52RDGiZ)`5IZT[UA"%qZm&kUG
-A1`j99IV[0rq&1-ep6"`LXr6IiNm4Th'!lq2U9aH2R3H%$4Shq$i$hJNH1ir"5C4
-i0k9ih452RIFMrDQIGRpSRq"al*mq6GaV3pcRk82"BkIl at m5"Hr!*F02&BqHJq*2
-QBSB[D[h'UqYFY!fPqa*(I`SZRJb(9[5JLA[,$Xpi!1e%[6I%E4"1ZAJFqkM`!(d
-!(1*e)5iH1cr)h)&k)X4pNGV(hGm2U(kDHp+AdqKrLBZr$8jVH+Mq6[JMiFe!INQ
-[qRmK)3GQDA4c9'0X!*!D#BB"NJ%"!Q`#P3#3!`%!N!1'!*!(&J#3!iB!!!%1rj!
-%!q#dAbiHY*C6G`#3"3'5%J#3"M%arr(rr!!!`d!!!#)X#5B!!!:
diff --git a/fitsTclHeader.pch b/fitsTclHeader.pch
deleted file mode 100755
index f287858..0000000
--- a/fitsTclHeader.pch
+++ /dev/null
@@ -1,7 +0,0 @@
-#pragma precompile_target "fitsTclHeader"
-
-#define MAC_TCL
-
-#pragma export on
-#include "fitsTcl.h"
-#pragma export reset
diff --git a/fitsTclInt.h b/fitsTclInt.h
index 382da6c..baaf43e 100644
--- a/fitsTclInt.h
+++ b/fitsTclInt.h
@@ -59,6 +59,7 @@ typedef struct {
char **colDisp;
char **colNull;
long *vecSize;
+ long *vecDim;
double *colTzero;
double *colTscale;
int *colTzflag;
diff --git a/fitsUtils.c b/fitsUtils.c
index 8f724dc..952de06 100644
--- a/fitsUtils.c
+++ b/fitsUtils.c
@@ -1144,8 +1144,6 @@ int fitsSplit(colData a[], int dataType, int strSize,
{
colData tmpData;
- int nullset = 0;
-
int l_hold = left;
int r_hold = right;
@@ -1710,4 +1708,3 @@ LONGLONG fitsTcl_atoll (char *inputStr) {
return (ig * (LONGLONG)sign);
}
-
diff --git a/fitstcl.def b/fitstcl.def
deleted file mode 100644
index 1ee7d12..0000000
--- a/fitstcl.def
+++ /dev/null
@@ -1,922 +0,0 @@
-LIBRARY fitstcl.dll
-EXETYPE WINDOWS
-
-EXPORTS
- fitsDispatch
- fitsTcl_close
- fitsTcl_move
- fitsTcl_dump
- fitsTcl_info
- fitsTcl_get
- fitsTcl_put
- fitsTcl_insert
- fitsTcl_delete
- fitsTcl_load
- fitsTcl_free
- fitsTcl_flush
- fitsTcl_copy
- fitsTcl_sascii
- fitsTcl_sort
- fitsTcl_add
- fitsTcl_append
- fitsTcl_histo
- fitsTcl_create
- fitsTcl_checksum
- fitsTcl_smooth
- Fits_Init
- fitsMoveHDU
- fitsLoadHDU
- fitsJustMoveHDU
- fitsUpdateCHDU
- fitsLoadKwds
- deleteFitsCardList
- fitsDumpHeader
- fitsDumpHeaderToKV
- fitsDumpKwdsToList
- fitsDumpHeaderToCard
- makeNewCHDUInfo
- freeCHDUInfo
- imageRowsMeanToPtr
- imageColsMeanToPtr
- imageBlockLoad_1D
- imageBlockLoad
- imageGetToPtr
- vtableGetToPtr
- tableGetToPtr
- tableBlockLoad
- fitsFlushKeywords
- fitsPutReqKwds
- fitsDeleteKwds
- fitsPutKwds
- fitsInsertKwds
- fitsDeleteCols
- fitsDeleteRows
- fitsDeleteCHdu
- saveTableToAscii
- saveImageToAscii
- varSaveToTable
- addColToTable
- addRowToTable
- varSaveToImage
- fitsCopyCHduToFile
- fitsAppendCHduToFile
- fitsPutHisKwd
- fitsGetWcsMatrix
- fitsGetWcsPair
- fitsTableGetWcsOld
- fitsReadColData
- fitsReadRawColData
- fitsSortTable
- fitsWriteRowsToFile
- fitsGetSortRangeNum
- fitsGetSortRange
- fitsUpdateFile
- fitsColumnStatistics
- fitsColumnMinMax
- fitsColumnMinMaxToPtr
- fitsColumnStatToPtr
- fitsColumnGetToArray
- fitsCalculateColumn
- fitsDeleteRowsExpr
- exprGetToPtr
- exprGetInfo
- Fits_MainCommand
- FitsCreateObject
- fitsCloseFile
- FitsInfo
- fitsPtr2Lst
- fitsLst2Ptr
- fitsRange
- fitsExpr
- dumpFitsErrStack
- dumpFitsErrStackToDString
- fitsMakeRegExp
- fitsParseRange
- makeContigArray
- fitsTransColList
- strToUpper
- tdispGetFormat
- fitsSwap
- fitsQuickSort
- fitsSplit
- fitsFreeRawColData
- fitsRandomizeColData
- fitsTcl_Ptr2Lst
- fitsTcl_Lst2Ptr
- fitsTcl_SetDims
- fitsTcl_GetDims
- fitsTcl_ReadPtrStr
- isFitsCmd
- getMaxCmd
- getMinCmd
- setArray
- searchArray
- updateFirst
- Table_calAbsXPos
- Table_updateCell
- fits_comp_img
- imcomp_init_table
- imcomp_calc_max_elem
- imcomp_compress_image
- imcomp_compress_tile
- fits_decomp_img
- fits_read_compressed_img
- fits_read_compressed_pixels
- fits_read_compressed_img_plane
- imcomp_get_compressed_image_par
- imcomp_copy_imheader
- imcomp_decompress_tile
- imcomp_copy_overlap
- fits_rcomp
- fits_rdecomp
- fits_quantize_float
- fits_quantize_double
- pl_p2li
- pl_l2pi
- ffgics
- ffgtcs
- ffwldp
- ffxypx
- ffomem
- ffopen
- ffreopen
- fits_already_open
- fits_is_this_a_copy
- ffedit_columns
- fits_select_image_section
- fits_get_section_range
- ffselect_table
- ffinit
- ffimem
- fits_init_cfitsio
- fits_register_driver
- ffiurl
- ffrtnm
- ffourl
- ffexts
- ffextn
- ffurlt
- ffimport_file
- fits_get_token
- urltype2driver
- ffclos
- ffdelt
- fftrun
- ffflushx
- ffseek
- ffwrite
- ffread
- fftplt
- ffoptplt
- ffrprt
- ffcsum
- ffesum
- ffdsum
- ffpcks
- ffupck
- ffvcks
- ffgcks
- uncompress2mem
- uncompress2mem_from_mem
- uncompress2file
- compress2mem_from_mem
- longest_match
- file_init
- file_setoptions
- file_getoptions
- file_getversion
- file_shutdown
- file_open
- file_openfile
- file_create
- file_truncate
- file_size
- file_close
- file_remove
- file_flush
- file_seek
- file_read
- file_write
- file_compress_open
- file_is_compressed
- file_checkfile
- mem_init
- mem_setoptions
- mem_getoptions
- mem_getversion
- mem_shutdown
- mem_create
- mem_openmem
- mem_createmem
- mem_truncate
- stdin_checkfile
- stdin_open
- stdin2mem
- stdin2file
- stdout_close
- mem_compress_open
- mem_iraf_open
- mem_rawfile_open
- mem_uncompress2mem
- mem_size
- mem_close_free
- mem_close_keep
- mem_seek
- mem_read
- mem_write
- ffrsim
- ffirow
- ffdrow
- ffdrws
- fficol
- fficls
- ffmvec
- ffcpcl
- ffcpky
- ffdcol
- ffcins
- ffcdel
- ffkshf
- ffshft
- ffcopy
- ffcphd
- ffcpdt
- ffiimg
- ffitab
- ffibin
- ffdhdu
- fffrow
- ffsrow
- ffcrow
- ffcalc
- ffcalc_rng
- fftexp
- ffiprs
- ffcprs
- parse_data
- ffcvtn
- fffrwc
- uncompress_hkdata
- ffffrw
- ffffrw_work
- fflex
- ffrestart
- ff_switch_to_buffer
- ff_load_buffer_state
- ff_create_buffer
- ff_delete_buffer
- ff_init_buffer
- ff_flush_buffer
- ff_scan_buffer
- ff_scan_string
- ff_scan_bytes
- ffwrap
- ffGetVariable
- strcasecmp
- strncasecmp
- ffparse
- Evaluate_Parser
- ffvers
- ffflnm
- ffflmd
- ffgerr
- ffpmsg
- ffgmsg
- ffcmsg
- ffxmsg
- ffpxsz
- fftkey
- fftrec
- ffupch
- ffmkky
- ffmkey
- ffkeyn
- ffnkey
- ffpsvc
- ffgthd
- ffasfm
- ffbnfm
- ffcfmt
- ffcdsp
- ffgcno
- ffgcnn
- ffcmps
- ffgtcl
- ffgncl
- ffgnrw
- ffgacl
- ffgbcl
- ffghdn
- ffghof
- ffghad
- ffrhdu
- ffpinit
- ffainit
- ffbinit
- ffgabc
- ffgtbc
- ffgtbp
- ffgcprll
- ffgdes
- ffgdess
- ffpdes
- ffchdu
- ffuptf
- ffrdef
- ffhdef
- ffwend
- ffpdfl
- ffchfl
- ffcdfl
- ffcrhd
- ffdblk
- ffghdt
- fits_is_compressed_image
- ffgipr
- ffgidt
- ffgidm
- ffgisz
- ffmahd
- ffmrhd
- ffmnhd
- ffthdu
- ffgext
- ffiblk
- ffgkcl
- ffdtyp
- ffc2x
- ffc2i
- ffc2l
- ffc2r
- ffc2d
- ffc2ii
- ffc2ll
- ffc2s
- ffc2rr
- ffc2dd
- ffgpxv
- ffgpxf
- ffgsv
- ffgpv
- ffgpf
- ffgcv
- ffgcf
- ffgpvb
- ffgpfb
- ffg2db
- ffg3db
- ffgsvb
- ffgsfb
- ffggpb
- ffgcvb
- ffgcfb
- ffgclb
- fffi1i1
- fffi2i1
- fffi4i1
- fffr4i1
- fffr8i1
- fffstri1
- ffgpvd
- ffgpfd
- ffg2dd
- ffg3dd
- ffgsvd
- ffgsfd
- ffggpd
- ffgcvd
- ffgcvm
- ffgcfd
- ffgcfm
- ffgcld
- fffi1r8
- fffi2r8
- fffi4r8
- fffr4r8
- fffr8r8
- fffstrr8
- ffgpve
- ffgpfe
- ffg2de
- ffg3de
- ffgsve
- ffgsfe
- ffggpe
- ffgcve
- ffgcvc
- ffgcfe
- ffgcfc
- ffgcle
- fffi1r4
- fffi2r4
- fffi4r4
- fffr4r4
- fffr8r4
- fffstrr4
- ffgpvi
- ffgpfi
- ffg2di
- ffg3di
- ffgsvi
- ffgsfi
- ffggpi
- ffgcvi
- ffgcfi
- ffgcli
- fffi1i2
- fffi2i2
- fffi4i2
- fffr4i2
- fffr8i2
- fffstri2
- ffgpvj
- ffgpfj
- ffg2dj
- ffg3dj
- ffgsvj
- ffgsfj
- ffggpj
- ffgcvj
- ffgcfj
- ffgclj
- fffi1i4
- fffi2i4
- fffi4i4
- fffr4i4
- fffr8i4
- fffstri4
- ffgpvk
- ffgpfk
- ffg2dk
- ffg3dk
- ffgsvk
- ffgsfk
- ffggpk
- ffgcvk
- ffgcfk
- ffgclk
- fffi1int
- fffi2int
- fffi4int
- fffr4int
- fffr8int
- fffstrint
- ffgcvl
- ffgcl
- ffgcfl
- ffgcll
- ffgcx
- ffgcxui
- ffgcxuk
- ffgcvs
- ffgcfs
- ffgcls
- ffgcdw
- ffgcls2
- ffgpvui
- ffgpfui
- ffg2dui
- ffg3dui
- ffgsvui
- ffgsfui
- ffggpui
- ffgcvui
- ffgcfui
- ffgclui
- fffi1u2
- fffi2u2
- fffi4u2
- fffr4u2
- fffr8u2
- fffstru2
- ffgpvuj
- ffgpfuj
- ffg2duj
- ffg3duj
- ffgsvuj
- ffgsfuj
- ffggpuj
- ffgcvuj
- ffgcfuj
- ffgcluj
- fffi1u4
- fffi2u4
- fffi4u4
- fffr4u4
- fffr8u4
- fffstru4
- ffgpvuk
- ffgpfuk
- ffg2duk
- ffg3duk
- ffgsvuk
- ffgsfuk
- ffggpuk
- ffgcvuk
- ffgcfuk
- ffgcluk
- fffi1uint
- fffi2uint
- fffi4uint
- fffr4uint
- fffr8uint
- fffstruint
- ffghsp
- ffghps
- ffnchk
- ffmaky
- ffmrky
- ffgnky
- ffgnxk
- ffgky
- ffgkey
- ffgrec
- ffgcrd
- ffgknm
- ffgunt
- ffgkys
- ffgkls
- ffgcnt
- ffgkyl
- ffgkyj
- ffgkye
- ffgkyd
- ffgkyc
- ffgkym
- ffgkyt
- ffgkyn
- ffgkns
- ffgknl
- ffgknj
- ffgkne
- ffgknd
- ffgtdm
- ffdtdm
- ffghpr
- ffghtb
- ffghbn
- ffgphd
- ffgttb
- ffgtkn
- fftkyn
- ffh2st
- ffgtcr
- ffgtis
- ffgtch
- ffgtrm
- ffgtcp
- ffgtmg
- ffgtcm
- ffgtvf
- ffgtop
- ffgtam
- ffgtnm
- ffgmng
- ffgmop
- ffgmcp
- ffgmtf
- ffgmrm
- ffgtgc
- ffgtdc
- ffgmul
- ffgmf
- ffgtrmr
- ffgtcpr
- fftsad
- fftsud
- prepare_keyvalue
- fits_path2url
- fits_url2path
- fits_get_cwd
- fits_get_url
- fits_clean_url
- fits_url2relurl
- fits_relurl2url
- fits_encode_url
- fits_unencode_url
- fits_is_url_absolute
- ngp_get_extver
- ngp_set_extver
- ngp_delete_extver_tab
- ngp_strcasecmp
- ngp_line_from_file
- ngp_free_line
- ngp_free_prevline
- ngp_read_line_buffered
- ngp_unread_line
- ngp_extract_tokens
- ngp_include_file
- ngp_read_line
- ngp_keyword_is_write
- ngp_keyword_all_write
- ngp_hdu_init
- ngp_hdu_clear
- ngp_hdu_insert_token
- ngp_append_columns
- ngp_read_xtension
- ngp_read_group
- fits_execute_template
- ffbins
- ffbinr
- ffhist
- fits_get_col_minmax
- ffwritehisto
- ffcalchist
- iraf2mem
- main
- ffuky
- ffukyu
- ffukys
- ffukls
- ffukyl
- ffukyj
- ffukyf
- ffukye
- ffukyg
- ffukyd
- ffukfc
- ffukyc
- ffukfm
- ffukym
- ffucrd
- ffmrec
- ffmcrd
- ffmnam
- ffmcom
- ffpunt
- ffmkyu
- ffmkys
- ffmkls
- ffmkyl
- ffmkyj
- ffmkyf
- ffmkye
- ffmkyg
- ffmkyd
- ffmkfc
- ffmkyc
- ffmkfm
- ffmkym
- ffikyu
- ffikys
- ffikls
- ffikyl
- ffikyj
- ffikyf
- ffikye
- ffikyg
- ffikyd
- ffikfc
- ffikyc
- ffikfm
- ffikym
- ffirec
- ffikey
- ffdkey
- ffdrec
- ffppx
- ffppxn
- ffppr
- ffppn
- ffpcl
- ffpcn
- fits_iter_set_by_name
- fits_iter_set_by_num
- fits_iter_set_file
- fits_iter_set_colname
- fits_iter_set_colnum
- fits_iter_set_datatype
- fits_iter_set_iotype
- fits_iter_get_file
- fits_iter_get_colname
- fits_iter_get_colnum
- fits_iter_get_datatype
- fits_iter_get_iotype
- fits_iter_get_array
- fits_iter_get_tlmin
- fits_iter_get_tlmax
- fits_iter_get_repeat
- fits_iter_get_tunit
- fits_iter_get_tdisp
- ffiter
- ffpprb
- ffppnb
- ffp2db
- ffp3db
- ffpssb
- ffpgpb
- ffpclb
- ffpcnb
- ffi1fi1
- ffi1fi2
- ffi1fi4
- ffi1fr4
- ffi1fr8
- ffi1fstr
- ffpprd
- ffppnd
- ffp2dd
- ffp3dd
- ffpssd
- ffpgpd
- ffpcld
- ffpclm
- ffpcnd
- ffr8fi1
- ffr8fi2
- ffr8fi4
- ffr8fr4
- ffr8fr8
- ffr8fstr
- ffppre
- ffppne
- ffp2de
- ffp3de
- ffpsse
- ffpgpe
- ffpcle
- ffpclc
- ffpcne
- ffr4fi1
- ffr4fi2
- ffr4fi4
- ffr4fr4
- ffr4fr8
- ffr4fstr
- ffppri
- ffppni
- ffp2di
- ffp3di
- ffpssi
- ffpgpi
- ffpcli
- ffpcni
- ffi2fi1
- ffi2fi2
- ffi2fi4
- ffi2fr4
- ffi2fr8
- ffi2fstr
- ffpprj
- ffppnj
- ffp2dj
- ffp3dj
- ffpssj
- ffpgpj
- ffpclj
- ffpcnj
- ffi4fi1
- ffi4fi2
- ffi4fi4
- ffi4fr4
- ffi4fr8
- ffi4fstr
- ffpprk
- ffppnk
- ffp2dk
- ffp3dk
- ffpssk
- ffpgpk
- ffpclk
- ffpcnk
- ffintfi1
- ffintfi2
- ffintfi4
- ffintfr4
- ffintfr8
- ffintfstr
- ffpcll
- ffpcnl
- ffpclx
- ffpcls
- ffpcns
- ffppru
- ffpprn
- ffpclu
- ffpprui
- ffppnui
- ffp2dui
- ffp3dui
- ffpssui
- ffpgpui
- ffpclui
- ffpcnui
- ffu2fi1
- ffu2fi2
- ffu2fi4
- ffu2fr4
- ffu2fr8
- ffu2fstr
- ffppruj
- ffppnuj
- ffp2duj
- ffp3duj
- ffpssuj
- ffpgpuj
- ffpcluj
- ffpcnuj
- ffu4fi1
- ffu4fi2
- ffu4fi4
- ffu4fr4
- ffu4fr8
- ffu4fstr
- ffppruk
- ffppnuk
- ffp2duk
- ffp3duk
- ffpssuk
- ffpgpuk
- ffpcluk
- ffpcnuk
- ffuintfi1
- ffuintfi2
- ffuintfi4
- ffuintfr4
- ffuintfr8
- ffuintfstr
- ffcrim
- ffcrtb
- ffpktp
- ffpky
- ffprec
- ffpkyu
- ffpkys
- ffpkls
- ffplsw
- ffpkyl
- ffpkyj
- ffpkyf
- ffpkye
- ffpkyg
- ffpkyd
- ffpkyc
- ffpkym
- ffpkfc
- ffpkfm
- ffpkyt
- ffpcom
- ffphis
- ffpdat
- ffgstm
- ffdt2s
- ffs2dt
- fftm2s
- ffs2tm
- ffgsdt
- ffpkns
- ffpknl
- ffpknj
- ffpknf
- ffpkne
- ffpkng
- ffpknd
- ffptdm
- ffphps
- ffphpr
- ffphtb
- ffphbn
- ffi2c
- ffl2c
- ffs2c
- ffr2f
- ffr2e
- ffd2f
- ffd2e
- ffrrgn
- fftrgn
- fffrgn
- ffpthp
- ffpscl
- ffpnul
- fftscl
- fftnul
- ffsnul
- ffswap2
- ffswap4
- ffswap8
- ffmbyt
- ffpbyt
- ffpbytoff
- ffgbyt
- ffgbytoff
- ffldrc
- ffwhbf
- ffflus
- ffflsh
- ffbfeof
- ffbfwt
- ffgrsz
- fits_get_num_files
- ffgtbb
- ffgi1b
- ffgi2b
- ffgi4b
- ffgr4b
- ffgr8b
- ffptbb
- ffpi1b
- ffpi2b
- ffpi4b
- ffpr4b
- ffpr8b
diff --git a/fitstcl.dsp b/fitstcl.dsp
deleted file mode 100644
index 838c9a9..0000000
--- a/fitstcl.dsp
+++ /dev/null
@@ -1,417 +0,0 @@
-# Microsoft Developer Studio Project File - Name="fitstcl" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
-
-CFG=fitstcl - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE
-!MESSAGE NMAKE /f "fitstcl.mak".
-!MESSAGE
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE
-!MESSAGE NMAKE /f "fitstcl.mak" CFG="fitstcl - Win32 Debug"
-!MESSAGE
-!MESSAGE Possible choices for configuration are:
-!MESSAGE
-!MESSAGE "fitstcl - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "fitstcl - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-MTL=midl.exe
-RSC=rc.exe
-
-!IF "$(CFG)" == "fitstcl - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-F90=df.exe
-# ADD BASE F90 /compile_only /include:"Release/" /dll /nologo /warn:nofileopt
-# ADD F90 /compile_only /include:"Release/" /dll /nologo /warn:nofileopt
-# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "FITSTCL_EXPORTS" /YX /FD /c
-# ADD CPP /nologo /MT /W3 /GX /O2 /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "FITSTCL_EXPORTS" /D "__WIN32__" /YX /FD /c
-# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
-# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib tcl83.lib /nologo /dll /machine:I386 /out:"fitstcl.dll"
-
-!ELSEIF "$(CFG)" == "fitstcl - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "Debug"
-# PROP Intermediate_Dir "Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-F90=df.exe
-# ADD BASE F90 /check:bounds /compile_only /debug:full /include:"Debug/" /dll /nologo /traceback /warn:argument_checking /warn:nofileopt
-# ADD F90 /browser /check:bounds /compile_only /debug:full /include:"Debug/" /dll /nologo /traceback /warn:argument_checking /warn:nofileopt
-# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "FITSTCL_EXPORTS" /YX /FD /GZ /c
-# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "FITSTCL_EXPORTS" /D "__WIN32__" /FR /YX /FD /GZ /c
-# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
-# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo /o"fitstcl.bsc"
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib tcl83d.lib /nologo /dll /debug /machine:I386 /out:"fitstcl.dll" /pdbtype:sept
-
-!ENDIF
-
-# Begin Target
-
-# Name "fitstcl - Win32 Release"
-# Name "fitstcl - Win32 Debug"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat;f90;for;f;fpp"
-# Begin Source File
-
-SOURCE=.\cfitsio\buffers.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\cfitsio\cfileio.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\cfitsio\checksum.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\cfitsio\compress.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\cfitsio\drvrfile.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\cfitsio\drvrmem.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\cfitsio\editcol.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\cfitsio\edithdu.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\cfitsio\eval_f.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\cfitsio\eval_l.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\cfitsio\eval_y.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\fitsCmds.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\cfitsio\fitscore.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\fitsInit.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\fitsIO.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\fitsTcl.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\fitstcl.def
-# End Source File
-# Begin Source File
-
-SOURCE=.\fitsUtils.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\fvTcl.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\cfitsio\getcol.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\cfitsio\getcolb.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\cfitsio\getcold.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\cfitsio\getcole.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\cfitsio\getcoli.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\cfitsio\getcolj.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\cfitsio\getcolk.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\cfitsio\getcoll.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\cfitsio\getcols.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\cfitsio\getcolui.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\cfitsio\getcoluj.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\cfitsio\getcoluk.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\cfitsio\getkey.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\cfitsio\group.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\cfitsio\grparser.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\cfitsio\histo.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\cfitsio\imcompress.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\cfitsio\iraffits.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\cfitsio\listhead.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\cfitsio\modkey.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\cfitsio\pliocomp.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\cfitsio\putcol.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\cfitsio\putcolb.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\cfitsio\putcold.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\cfitsio\putcole.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\cfitsio\putcoli.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\cfitsio\putcolj.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\cfitsio\putcolk.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\cfitsio\putcoll.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\cfitsio\putcols.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\cfitsio\putcolu.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\cfitsio\putcolui.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\cfitsio\putcoluj.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\cfitsio\putcoluk.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\cfitsio\putkey.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\cfitsio\quantize.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\cfitsio\region.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\cfitsio\ricecomp.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\cfitsio\scalnull.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\cfitsio\swapproc.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\cfitsio\wcsutil.c
-# End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter "h;hpp;hxx;hm;inl;fi;fd"
-# Begin Source File
-
-SOURCE=.\cfitsio\cfortran.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\cfitsio\compress.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\cfitsio\drvrsmem.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\cfitsio\eval_defs.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\cfitsio\eval_tab.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\cfitsio\f77_wrap.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\cfitsio\fitsio.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\cfitsio\fitsio2.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\fitsTcl.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\fitsTclInt.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\cfitsio\group.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\cfitsio\grparser.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\cfitsio\imcompress.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\cfitsio\longnam.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\cfitsio\pctype.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\cfitsio\region.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\cfitsio\ricecomp.h
-# End Source File
-# End Group
-# Begin Group "Resource Files"
-
-# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
-# End Group
-# End Target
-# End Project
diff --git a/fitstcl.dsw b/fitstcl.dsw
deleted file mode 100644
index 3345d8f..0000000
--- a/fitstcl.dsw
+++ /dev/null
@@ -1,29 +0,0 @@
-Microsoft Developer Studio Workspace File, Format Version 6.00
-# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
-
-###############################################################################
-
-Project: "fitstcl"=.\fitstcl.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Global:
-
-Package=<5>
-{{{
-}}}
-
-Package=<3>
-{{{
-}}}
-
-###############################################################################
-
diff --git a/fvTcl.c b/fvTcl.c
index a29172f..5110f58 100644
--- a/fvTcl.c
+++ b/fvTcl.c
@@ -448,12 +448,11 @@ int Table_updateCell( ClientData clientData,
Tcl_Obj *const argv[] )
{
int showCols, showRows, firstCol, firstRow, numRows, i, j;
- char *tmpStr;
char index1[80];
char index2[80];
char index3[80];
int tmpWidth, imageTable;
- Tcl_Obj *idxObj, *valObj, *overflowObj;
+ Tcl_Obj *valObj, *overflowObj;
valObj = Tcl_GetVar2Ex(interp, "_firstCol", NULL, 0);
if (valObj == NULL) {
diff --git a/makefile.bc5 b/makefile.bc5
deleted file mode 100644
index 8023ad9..0000000
--- a/makefile.bc5
+++ /dev/null
@@ -1,496 +0,0 @@
-#
-# Borland C++ IDE generated makefile
-# Generated 10/15/98 at 10:52:55 AM
-#
-.AUTODEPEND
-
-
-#
-# Borland C++ tools
-#
-IMPLIB = Implib
-BCC32 = Bcc32 +BccW32.cfg
-BCC32I = Bcc32i +BccW32.cfg
-TLINK32 = TLink32
-TLIB = TLib
-BRC32 = Brc32
-TASM32 = Tasm32
-#
-# IDE macros
-#
-
-
-#
-# Options
-#
-IDE_LinkFLAGS32 = -LD:\BC5\LIB
-LinkerLocalOptsAtC32_fitstcldlib = -Tpd -ap -c /w-inq
-ResLocalOptsAtC32_fitstcldlib =
-BLocalOptsAtC32_fitstcldlib =
-CompInheritOptsAt_fitstcldlib = -ID:\BC5\INCLUDE;C:\FV_SRC\TCL8.0.4\GENERIC;C:\FV_SRC\FITSTCL\CFITSIO -D_RTLDLL;_BIDSDLL; -w-sig -w-stu -w-par -w-use -w-aus
-LinkerInheritOptsAt_fitstcldlib = -x
-LinkerOptsAt_fitstcldlib = $(LinkerLocalOptsAtC32_fitstcldlib)
-ResOptsAt_fitstcldlib = $(ResLocalOptsAtC32_fitstcldlib)
-BOptsAt_fitstcldlib = $(BLocalOptsAtC32_fitstcldlib)
-CompLocalOptsAtC32_cfitsiodlib = -w-sig -w-stu -w-par -w-use -w-aus
-LinkerLocalOptsAtC32_cfitsiodlib = -Tpd -aa -V4.0 -c
-ResLocalOptsAtC32_cfitsiodlib =
-BLocalOptsAtC32_cfitsiodlib = /P32
-CompOptsAt_cfitsiodlib = $(CompOptsAt_fitstcldlib) $(CompLocalOptsAtC32_cfitsiodlib)
-CompInheritOptsAt_cfitsiodlib = -ID:\BC5\INCLUDE;C:\FV_SRC\TCL8.0.4\GENERIC;C:\FV_SRC\FITSTCL\CFITSIO -D_RTLDLL;_RTLDLL;_BIDSDLL;
-LinkerInheritOptsAt_cfitsiodlib = -x
-LinkerOptsAt_cfitsiodlib = $(LinkerOptsAt_fitstcldlib) $(LinkerLocalOptsAtC32_cfitsiodlib)
-ResOptsAt_cfitsiodlib = $(ResOptsAt_fitstcldlib) $(ResLocalOptsAtC32_cfitsiodlib)
-BOptsAt_cfitsiodlib = $(BOptsAt_fitstcldlib) $(BLocalOptsAtC32_cfitsiodlib)
-
-#
-# Dependency List
-#
-Dep_fitstcl = \
- fitstcl.lib
-
-fitstcl : BccW32.cfg $(Dep_fitstcl)
- echo MakeNode
-
-fitstcl.lib : fitstcl.dll
- $(IMPLIB) $@ fitstcl.dll
-
-
-Dep_fitstclddll = \
- cfitsio.lib\
- ..\tcl8.0.4\win\tcl80.lib\
- tclshared.obj\
- fitsinit.obj\
- fitsutils.obj\
- fitstcl.obj\
- fitscmds.obj\
- fitsio.obj\
- fvtcl.obj
-
-fitstcl.dll : $(Dep_fitstclddll) fitstcl.def
- $(TLINK32) @&&|
- /v $(IDE_LinkFLAGS32) $(LinkerOptsAt_fitstcldlib) $(LinkerInheritOptsAt_fitstcldlib) +
-D:\BC5\LIB\c0d32.obj+
-tclshared.obj+
-fitsinit.obj+
-fitsutils.obj+
-fitstcl.obj+
-fitscmds.obj+
-fitsio.obj+
-fvtcl.obj
-$<,$*
-cfitsio.lib+
-..\tcl8.0.4\win\tcl80.lib+
-D:\BC5\LIB\bidsfi.lib+
-D:\BC5\LIB\import32.lib+
-D:\BC5\LIB\cw32i.lib, fitstcl.def
-
-
-
-|
-Dep_cfitsiodlib = \
- putcols.obj\
- putcolui.obj\
- putcoluj.obj\
- putcoluk.obj\
- putcolu.obj\
- putkey.obj\
- region.obj\
- swapproc.obj\
- scalnull.obj\
- wcsutil.obj\
- putcolk.obj\
- putcolj.obj\
- putcoli.obj\
- putcole.obj\
- putcold.obj\
- putcolb.obj\
- putcol.obj\
- modkey.obj\
- listhead.obj\
- putcoll.obj\
- getcolj.obj\
- iraffits.obj\
- histo.obj\
- group.obj\
- grparser.obj\
- getkey.obj\
- getcoluk.obj\
- getcoluj.obj\
- getcolui.obj\
- getcols.obj\
- getcoll.obj\
- getcolk.obj\
- eval_f.obj\
- getcole.obj\
- getcold.obj\
- getcolb.obj\
- getcol.obj\
- fitscore.obj\
- eval_y.obj\
- eval_l.obj\
- getcoli.obj\
- buffers.obj\
- editcol.obj\
- drvrmem.obj\
- drvrfile.obj\
- compress.obj\
- checksum.obj\
- cfileio.obj\
- edithdu.obj
-
-cfitsio.lib : $(Dep_cfitsiodlib)
- $(TLIB) $< $(IDE_BFLAGS) $(BOptsAt_cfitsiodlib) @&&|
- -+putcols.obj &
--+putcolui.obj &
--+putcoluj.obj &
--+putcoluk.obj &
--+putcolu.obj &
--+putkey.obj &
--+region.obj &
--+swapproc.obj &
--+scalnull.obj &
--+wcsutil.obj &
--+putcolk.obj &
--+putcolj.obj &
--+putcoli.obj &
--+putcole.obj &
--+putcold.obj &
--+putcolb.obj &
--+putcol.obj &
--+modkey.obj &
--+listhead.obj &
--+putcoll.obj &
--+getcolj.obj &
--+iraffits.obj &
--+histo.obj &
--+group.obj &
--+grparser.obj &
--+getkey.obj &
--+getcoluk.obj &
--+getcoluj.obj &
--+getcolui.obj &
--+getcols.obj &
--+getcoll.obj &
--+getcolk.obj &
--+eval_f.obj &
--+getcole.obj &
--+getcold.obj &
--+getcolb.obj &
--+getcol.obj &
--+fitscore.obj &
--+eval_y.obj &
--+eval_l.obj &
--+getcoli.obj &
--+buffers.obj &
--+editcol.obj &
--+drvrmem.obj &
--+drvrfile.obj &
--+compress.obj &
--+checksum.obj &
--+cfileio.obj &
--+edithdu.obj
-|
-
-putcols.obj : cfitsio\putcols.c
- $(BCC32) -P- -c @&&|
- $(CompOptsAt_cfitsiodlib) $(CompInheritOptsAt_cfitsiodlib) -o$@ cfitsio\putcols.c
-|
-
-putcolui.obj : cfitsio\putcolui.c
- $(BCC32) -P- -c @&&|
- $(CompOptsAt_cfitsiodlib) $(CompInheritOptsAt_cfitsiodlib) -o$@ cfitsio\putcolui.c
-|
-
-putcoluj.obj : cfitsio\putcoluj.c
- $(BCC32) -P- -c @&&|
- $(CompOptsAt_cfitsiodlib) $(CompInheritOptsAt_cfitsiodlib) -o$@ cfitsio\putcoluj.c
-|
-
-putcoluk.obj : cfitsio\putcoluk.c
- $(BCC32) -P- -c @&&|
- $(CompOptsAt_cfitsiodlib) $(CompInheritOptsAt_cfitsiodlib) -o$@ cfitsio\putcoluk.c
-|
-
-putcolu.obj : cfitsio\putcolu.c
- $(BCC32) -P- -c @&&|
- $(CompOptsAt_cfitsiodlib) $(CompInheritOptsAt_cfitsiodlib) -o$@ cfitsio\putcolu.c
-|
-
-putkey.obj : cfitsio\putkey.c
- $(BCC32) -P- -c @&&|
- $(CompOptsAt_cfitsiodlib) $(CompInheritOptsAt_cfitsiodlib) -o$@ cfitsio\putkey.c
-|
-
-region.obj : cfitsio\region.c
- $(BCC32) -P- -c @&&|
- $(CompOptsAt_cfitsiodlib) $(CompInheritOptsAt_cfitsiodlib) -o$@ cfitsio\region.c
-|
-
-swapproc.obj : cfitsio\swapproc.c
- $(BCC32) -P- -c @&&|
- $(CompOptsAt_cfitsiodlib) $(CompInheritOptsAt_cfitsiodlib) -o$@ cfitsio\swapproc.c
-|
-
-scalnull.obj : cfitsio\scalnull.c
- $(BCC32) -P- -c @&&|
- $(CompOptsAt_cfitsiodlib) $(CompInheritOptsAt_cfitsiodlib) -o$@ cfitsio\scalnull.c
-|
-
-wcsutil.obj : cfitsio\wcsutil.c
- $(BCC32) -P- -c @&&|
- $(CompOptsAt_cfitsiodlib) $(CompInheritOptsAt_cfitsiodlib) -o$@ cfitsio\wcsutil.c
-|
-
-putcolk.obj : cfitsio\putcolk.c
- $(BCC32) -P- -c @&&|
- $(CompOptsAt_cfitsiodlib) $(CompInheritOptsAt_cfitsiodlib) -o$@ cfitsio\putcolk.c
-|
-
-putcolj.obj : cfitsio\putcolj.c
- $(BCC32) -P- -c @&&|
- $(CompOptsAt_cfitsiodlib) $(CompInheritOptsAt_cfitsiodlib) -o$@ cfitsio\putcolj.c
-|
-
-putcoli.obj : cfitsio\putcoli.c
- $(BCC32) -P- -c @&&|
- $(CompOptsAt_cfitsiodlib) $(CompInheritOptsAt_cfitsiodlib) -o$@ cfitsio\putcoli.c
-|
-
-putcole.obj : cfitsio\putcole.c
- $(BCC32) -P- -c @&&|
- $(CompOptsAt_cfitsiodlib) $(CompInheritOptsAt_cfitsiodlib) -o$@ cfitsio\putcole.c
-|
-
-putcold.obj : cfitsio\putcold.c
- $(BCC32) -P- -c @&&|
- $(CompOptsAt_cfitsiodlib) $(CompInheritOptsAt_cfitsiodlib) -o$@ cfitsio\putcold.c
-|
-
-putcolb.obj : cfitsio\putcolb.c
- $(BCC32) -P- -c @&&|
- $(CompOptsAt_cfitsiodlib) $(CompInheritOptsAt_cfitsiodlib) -o$@ cfitsio\putcolb.c
-|
-
-putcol.obj : cfitsio\putcol.c
- $(BCC32) -P- -c @&&|
- $(CompOptsAt_cfitsiodlib) $(CompInheritOptsAt_cfitsiodlib) -o$@ cfitsio\putcol.c
-|
-
-modkey.obj : cfitsio\modkey.c
- $(BCC32) -P- -c @&&|
- $(CompOptsAt_cfitsiodlib) $(CompInheritOptsAt_cfitsiodlib) -o$@ cfitsio\modkey.c
-|
-
-listhead.obj : cfitsio\listhead.c
- $(BCC32) -P- -c @&&|
- $(CompOptsAt_cfitsiodlib) $(CompInheritOptsAt_cfitsiodlib) -o$@ cfitsio\listhead.c
-|
-
-putcoll.obj : cfitsio\putcoll.c
- $(BCC32) -P- -c @&&|
- $(CompOptsAt_cfitsiodlib) $(CompInheritOptsAt_cfitsiodlib) -o$@ cfitsio\putcoll.c
-|
-
-getcolj.obj : cfitsio\getcolj.c
- $(BCC32) -P- -c @&&|
- $(CompOptsAt_cfitsiodlib) $(CompInheritOptsAt_cfitsiodlib) -o$@ cfitsio\getcolj.c
-|
-
-iraffits.obj : cfitsio\iraffits.c
- $(BCC32) -P- -c @&&|
- $(CompOptsAt_cfitsiodlib) $(CompInheritOptsAt_cfitsiodlib) -o$@ cfitsio\iraffits.c
-|
-
-histo.obj : cfitsio\histo.c
- $(BCC32) -P- -c @&&|
- $(CompOptsAt_cfitsiodlib) $(CompInheritOptsAt_cfitsiodlib) -o$@ cfitsio\histo.c
-|
-
-group.obj : cfitsio\group.c
- $(BCC32) -P- -c @&&|
- $(CompOptsAt_cfitsiodlib) $(CompInheritOptsAt_cfitsiodlib) -o$@ cfitsio\group.c
-|
-
-grparser.obj : cfitsio\grparser.c
- $(BCC32) -P- -c @&&|
- $(CompOptsAt_cfitsiodlib) $(CompInheritOptsAt_cfitsiodlib) -o$@ cfitsio\grparser.c
-|
-
-getkey.obj : cfitsio\getkey.c
- $(BCC32) -P- -c @&&|
- $(CompOptsAt_cfitsiodlib) $(CompInheritOptsAt_cfitsiodlib) -o$@ cfitsio\getkey.c
-|
-
-getcoluk.obj : cfitsio\getcoluk.c
- $(BCC32) -P- -c @&&|
- $(CompOptsAt_cfitsiodlib) $(CompInheritOptsAt_cfitsiodlib) -o$@ cfitsio\getcoluk.c
-|
-
-getcoluj.obj : cfitsio\getcoluj.c
- $(BCC32) -P- -c @&&|
- $(CompOptsAt_cfitsiodlib) $(CompInheritOptsAt_cfitsiodlib) -o$@ cfitsio\getcoluj.c
-|
-
-getcolui.obj : cfitsio\getcolui.c
- $(BCC32) -P- -c @&&|
- $(CompOptsAt_cfitsiodlib) $(CompInheritOptsAt_cfitsiodlib) -o$@ cfitsio\getcolui.c
-|
-
-getcols.obj : cfitsio\getcols.c
- $(BCC32) -P- -c @&&|
- $(CompOptsAt_cfitsiodlib) $(CompInheritOptsAt_cfitsiodlib) -o$@ cfitsio\getcols.c
-|
-
-getcoll.obj : cfitsio\getcoll.c
- $(BCC32) -P- -c @&&|
- $(CompOptsAt_cfitsiodlib) $(CompInheritOptsAt_cfitsiodlib) -o$@ cfitsio\getcoll.c
-|
-
-getcolk.obj : cfitsio\getcolk.c
- $(BCC32) -P- -c @&&|
- $(CompOptsAt_cfitsiodlib) $(CompInheritOptsAt_cfitsiodlib) -o$@ cfitsio\getcolk.c
-|
-
-eval_f.obj : cfitsio\eval_f.c
- $(BCC32) -P- -c @&&|
- $(CompOptsAt_cfitsiodlib) $(CompInheritOptsAt_cfitsiodlib) -o$@ cfitsio\eval_f.c
-|
-
-getcole.obj : cfitsio\getcole.c
- $(BCC32) -P- -c @&&|
- $(CompOptsAt_cfitsiodlib) $(CompInheritOptsAt_cfitsiodlib) -o$@ cfitsio\getcole.c
-|
-
-getcold.obj : cfitsio\getcold.c
- $(BCC32) -P- -c @&&|
- $(CompOptsAt_cfitsiodlib) $(CompInheritOptsAt_cfitsiodlib) -o$@ cfitsio\getcold.c
-|
-
-getcolb.obj : cfitsio\getcolb.c
- $(BCC32) -P- -c @&&|
- $(CompOptsAt_cfitsiodlib) $(CompInheritOptsAt_cfitsiodlib) -o$@ cfitsio\getcolb.c
-|
-
-getcol.obj : cfitsio\getcol.c
- $(BCC32) -P- -c @&&|
- $(CompOptsAt_cfitsiodlib) $(CompInheritOptsAt_cfitsiodlib) -o$@ cfitsio\getcol.c
-|
-
-fitscore.obj : cfitsio\fitscore.c
- $(BCC32) -P- -c @&&|
- $(CompOptsAt_cfitsiodlib) $(CompInheritOptsAt_cfitsiodlib) -o$@ cfitsio\fitscore.c
-|
-
-eval_y.obj : cfitsio\eval_y.c
- $(BCC32) -P- -c @&&|
- $(CompOptsAt_cfitsiodlib) $(CompInheritOptsAt_cfitsiodlib) -o$@ cfitsio\eval_y.c
-|
-
-eval_l.obj : cfitsio\eval_l.c
- $(BCC32) -P- -c @&&|
- $(CompOptsAt_cfitsiodlib) $(CompInheritOptsAt_cfitsiodlib) -o$@ cfitsio\eval_l.c
-|
-
-getcoli.obj : cfitsio\getcoli.c
- $(BCC32) -P- -c @&&|
- $(CompOptsAt_cfitsiodlib) $(CompInheritOptsAt_cfitsiodlib) -o$@ cfitsio\getcoli.c
-|
-
-buffers.obj : cfitsio\buffers.c
- $(BCC32) -P- -c @&&|
- $(CompOptsAt_cfitsiodlib) $(CompInheritOptsAt_cfitsiodlib) -o$@ cfitsio\buffers.c
-|
-
-editcol.obj : cfitsio\editcol.c
- $(BCC32) -P- -c @&&|
- $(CompOptsAt_cfitsiodlib) $(CompInheritOptsAt_cfitsiodlib) -o$@ cfitsio\editcol.c
-|
-
-drvrmem.obj : cfitsio\drvrmem.c
- $(BCC32) -P- -c @&&|
- $(CompOptsAt_cfitsiodlib) $(CompInheritOptsAt_cfitsiodlib) -o$@ cfitsio\drvrmem.c
-|
-
-drvrfile.obj : cfitsio\drvrfile.c
- $(BCC32) -P- -c @&&|
- $(CompOptsAt_cfitsiodlib) $(CompInheritOptsAt_cfitsiodlib) -o$@ cfitsio\drvrfile.c
-|
-
-compress.obj : cfitsio\compress.c
- $(BCC32) -P- -c @&&|
- $(CompOptsAt_cfitsiodlib) $(CompInheritOptsAt_cfitsiodlib) -o$@ cfitsio\compress.c
-|
-
-checksum.obj : cfitsio\checksum.c
- $(BCC32) -P- -c @&&|
- $(CompOptsAt_cfitsiodlib) $(CompInheritOptsAt_cfitsiodlib) -o$@ cfitsio\checksum.c
-|
-
-cfileio.obj : cfitsio\cfileio.c
- $(BCC32) -P- -c @&&|
- $(CompOptsAt_cfitsiodlib) $(CompInheritOptsAt_cfitsiodlib) -o$@ cfitsio\cfileio.c
-|
-
-edithdu.obj : cfitsio\edithdu.c
- $(BCC32) -P- -c @&&|
- $(CompOptsAt_cfitsiodlib) $(CompInheritOptsAt_cfitsiodlib) -o$@ cfitsio\edithdu.c
-|
-
-tclshared.obj : tclshared.c
- $(BCC32) -P- -c @&&|
- $(CompOptsAt_fitstcldlib) $(CompInheritOptsAt_fitstcldlib) -o$@ tclshared.c
-|
-
-fitscmds.obj : fitscmds.c
- $(BCC32) -P- -c @&&|
- $(CompOptsAt_fitstcldlib) $(CompInheritOptsAt_fitstcldlib) -o$@ fitscmds.c
-|
-
-fitsio.obj : fitsio.c
- $(BCC32) -P- -c @&&|
- $(CompOptsAt_fitstcldlib) $(CompInheritOptsAt_fitstcldlib) -o$@ fitsio.c
-|
-
-fvtcl.obj : fvtcl.c
- $(BCC32) -P- -c @&&|
- $(CompOptsAt_fitstcldlib) $(CompInheritOptsAt_fitstcldlib) -o$@ fvtcl.c
-|
-
-fitsutils.obj : fitsutils.c
- $(BCC32) -P- -c @&&|
- $(CompOptsAt_fitstcldlib) $(CompInheritOptsAt_fitstcldlib) -o$@ fitsutils.c
-|
-
-fitstcl.obj : fitstcl.c
- $(BCC32) -P- -c @&&|
- $(CompOptsAt_fitstcldlib) $(CompInheritOptsAt_fitstcldlib) -o$@ fitstcl.c
-|
-
-fitsinit.obj : fitsinit.c
- $(BCC32) -P- -c @&&|
- $(CompOptsAt_fitstcldlib) $(CompInheritOptsAt_fitstcldlib) -o$@ fitsinit.c
-|
-vcclib: fitstcl.def
- lib/def:fitstcl.def
-
-
-fitstcl.def:
- ..\tcl8.0.4\win\DUMPEXTS -o fitstcl.def fitstcl.dll @&&|
- $(Dep_fitstclddll)
-|
-
-
-# Compiler configuration file
-BccW32.cfg :
- Copy &&|
--w
--R
--v
--vi
--H
--H=fitstcl.csm
--g255
--WCD
-| $@
-
diff --git a/makefile.vc b/makefile.vc
deleted file mode 100644
index a24c416..0000000
--- a/makefile.vc
+++ /dev/null
@@ -1,806 +0,0 @@
-# Microsoft Developer Studio Generated NMAKE File, Based on fitstcl.dsp
-!IF "$(CFG)" == ""
-CFG=fitstcl - Win32 Debug
-!MESSAGE No configuration specified. Defaulting to fitstcl - Win32 Debug.
-!ENDIF
-
-!IF "$(CFG)" != "fitstcl - Win32 Release" && "$(CFG)" != "fitstcl - Win32 Debug"
-!MESSAGE Invalid configuration "$(CFG)" specified.
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE
-!MESSAGE NMAKE /f "fitstcl.mak" CFG="fitstcl - Win32 Debug"
-!MESSAGE
-!MESSAGE Possible choices for configuration are:
-!MESSAGE
-!MESSAGE "fitstcl - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "fitstcl - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE
-!ERROR An invalid configuration is specified.
-!ENDIF
-
-!IF "$(OS)" == "Windows_NT"
-NULL=
-!ELSE
-NULL=nul
-!ENDIF
-
-CPP=cl.exe
-MTL=midl.exe
-RSC=rc.exe
-
-!IF "$(CFG)" == "fitstcl - Win32 Release"
-
-OUTDIR=.
-INTDIR=.
-# Begin Custom Macros
-OutDir=.
-# End Custom Macros
-
-ALL : "$(OUTDIR)\fitstcl.dll"
-
-
-CLEAN :
- - at erase "$(INTDIR)\buffers.obj"
- - at erase "$(INTDIR)\cfileio.obj"
- - at erase "$(INTDIR)\checksum.obj"
- - at erase "$(INTDIR)\compress.obj"
- - at erase "$(INTDIR)\drvrfile.obj"
- - at erase "$(INTDIR)\drvrmem.obj"
- - at erase "$(INTDIR)\editcol.obj"
- - at erase "$(INTDIR)\edithdu.obj"
- - at erase "$(INTDIR)\eval_f.obj"
- - at erase "$(INTDIR)\eval_l.obj"
- - at erase "$(INTDIR)\eval_y.obj"
- - at erase "$(INTDIR)\fitsCmds.obj"
- - at erase "$(INTDIR)\fitscore.obj"
- - at erase "$(INTDIR)\fitsInit.obj"
- - at erase "$(INTDIR)\fitsIO.obj"
- - at erase "$(INTDIR)\fitsTcl.obj"
- - at erase "$(INTDIR)\fitsUtils.obj"
- - at erase "$(INTDIR)\fvTcl.obj"
- - at erase "$(INTDIR)\getcol.obj"
- - at erase "$(INTDIR)\getcolb.obj"
- - at erase "$(INTDIR)\getcold.obj"
- - at erase "$(INTDIR)\getcole.obj"
- - at erase "$(INTDIR)\getcoli.obj"
- - at erase "$(INTDIR)\getcolj.obj"
- - at erase "$(INTDIR)\getcolk.obj"
- - at erase "$(INTDIR)\getcoll.obj"
- - at erase "$(INTDIR)\getcols.obj"
- - at erase "$(INTDIR)\getcolui.obj"
- - at erase "$(INTDIR)\getcoluj.obj"
- - at erase "$(INTDIR)\getcoluk.obj"
- - at erase "$(INTDIR)\getkey.obj"
- - at erase "$(INTDIR)\group.obj"
- - at erase "$(INTDIR)\grparser.obj"
- - at erase "$(INTDIR)\histo.obj"
- - at erase "$(INTDIR)\iraffits.obj"
- - at erase "$(INTDIR)\listhead.obj"
- - at erase "$(INTDIR)\modkey.obj"
- - at erase "$(INTDIR)\putcol.obj"
- - at erase "$(INTDIR)\putcolb.obj"
- - at erase "$(INTDIR)\putcold.obj"
- - at erase "$(INTDIR)\putcole.obj"
- - at erase "$(INTDIR)\putcoli.obj"
- - at erase "$(INTDIR)\putcolj.obj"
- - at erase "$(INTDIR)\putcolk.obj"
- - at erase "$(INTDIR)\putcoll.obj"
- - at erase "$(INTDIR)\putcols.obj"
- - at erase "$(INTDIR)\putcolu.obj"
- - at erase "$(INTDIR)\putcolui.obj"
- - at erase "$(INTDIR)\putcoluj.obj"
- - at erase "$(INTDIR)\putcoluk.obj"
- - at erase "$(INTDIR)\putkey.obj"
- - at erase "$(INTDIR)\region.obj"
- - at erase "$(INTDIR)\scalnull.obj"
- - at erase "$(INTDIR)\swapproc.obj"
- - at erase "$(INTDIR)\tclShared.obj"
- - at erase "$(INTDIR)\imcompress.obj"
- - at erase "$(INTDIR)\ricecomp.obj"
- - at erase "$(INTDIR)\quantize.obj"
- - at erase "$(INTDIR)\pliocomp.obj"
- - at erase "$(INTDIR)\drvrnet.obj"
- - at erase "$(INTDIR)\drvrsmem.obj"
- - at erase "$(INTDIR)\getcolsb.obj"
- - at erase "$(INTDIR)\putcolsb.obj"
- - at erase "$(INTDIR)\wcssub.obj"
- - at erase "$(INTDIR)\wcsutil.obj"
- - at erase "$(INTDIR)\vc60.idb"
- - at erase "$(INTDIR)\wcsutil.obj"
- - at erase "$(OUTDIR)\fitstcl.dll"
- - at erase "$(OUTDIR)\fitstcl.exp"
- - at erase "$(OUTDIR)\fitstcl.lib"
-
-"$(OUTDIR)" :
- if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
-
-CPP_PROJ=/nologo /MT /W3 /GX /O2 /D "__WIN32__" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "FITSTCL_EXPORTS" /Fp"$(INTDIR)\fitstcl.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c
-MTL_PROJ=/nologo /D "NDEBUG" /mktyplib203 /win32
-BSC32=bscmake.exe
-BSC32_FLAGS=/nologo /o"$(OUTDIR)\fitstcl.bsc"
-BSC32_SBRS= \
-
-LINK32=link.exe
-LINK32_FLAGS=kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /incremental:no /pdb:"$(OUTDIR)\fitstcl.pdb" /machine:I386 /def:"fitstcl.def" /out:"$(OUTDIR)\fitstcl.dll" /implib:"$(OUTDIR)\fitstcl.lib"
-DEF_FILE= \
- "fitstcl.def"
-LINK32_OBJS= \
- "$(INTDIR)\fitsCmds.obj" \
- "$(INTDIR)\fitsInit.obj" \
- "$(INTDIR)\fitsIO.obj" \
- "$(INTDIR)\fitsTcl.obj" \
- "$(INTDIR)\fitsUtils.obj" \
- "$(INTDIR)\fvTcl.obj" \
- "$(INTDIR)\tclShared.obj" \
- "$(INTDIR)\imcompress.obj" \
- "$(INTDIR)\ricecomp.obj" \
- "$(INTDIR)\quantize.obj" \
- "$(INTDIR)\pliocomp.obj" \
- "$(INTDIR)\wcsutil.obj" \
- "$(INTDIR)\cfileio.obj" \
- "$(INTDIR)\checksum.obj" \
- "$(INTDIR)\compress.obj" \
- "$(INTDIR)\drvrfile.obj" \
- "$(INTDIR)\drvrmem.obj" \
- "$(INTDIR)\editcol.obj" \
- "$(INTDIR)\edithdu.obj" \
- "$(INTDIR)\eval_f.obj" \
- "$(INTDIR)\eval_l.obj" \
- "$(INTDIR)\eval_y.obj" \
- "$(INTDIR)\fitscore.obj" \
- "$(INTDIR)\getcol.obj" \
- "$(INTDIR)\getcolb.obj" \
- "$(INTDIR)\getcold.obj" \
- "$(INTDIR)\getcole.obj" \
- "$(INTDIR)\getcoli.obj" \
- "$(INTDIR)\getcolj.obj" \
- "$(INTDIR)\getcolk.obj" \
- "$(INTDIR)\getcoll.obj" \
- "$(INTDIR)\getcols.obj" \
- "$(INTDIR)\getcolui.obj" \
- "$(INTDIR)\getcoluj.obj" \
- "$(INTDIR)\getcoluk.obj" \
- "$(INTDIR)\getkey.obj" \
- "$(INTDIR)\group.obj" \
- "$(INTDIR)\grparser.obj" \
- "$(INTDIR)\histo.obj" \
- "$(INTDIR)\iraffits.obj" \
- "$(INTDIR)\listhead.obj" \
- "$(INTDIR)\modkey.obj" \
- "$(INTDIR)\putcol.obj" \
- "$(INTDIR)\putcolb.obj" \
- "$(INTDIR)\putcold.obj" \
- "$(INTDIR)\putcole.obj" \
- "$(INTDIR)\putcoli.obj" \
- "$(INTDIR)\putcolj.obj" \
- "$(INTDIR)\putcolk.obj" \
- "$(INTDIR)\putcoll.obj" \
- "$(INTDIR)\putcols.obj" \
- "$(INTDIR)\putcolu.obj" \
- "$(INTDIR)\putcolui.obj" \
- "$(INTDIR)\putcoluj.obj" \
- "$(INTDIR)\putcoluk.obj" \
- "$(INTDIR)\putkey.obj" \
- "$(INTDIR)\region.obj" \
- "$(INTDIR)\scalnull.obj" \
- "$(INTDIR)\swapproc.obj" \
- "$(INTDIR)\drvrnet.obj" \
- "$(INTDIR)\drvrsmem.obj" \
- "$(INTDIR)\getcolsb.obj" \
- "$(INTDIR)\putcolsb.obj" \
- "$(INTDIR)\wcssub.obj" \
- "$(INTDIR)\wcsutil.obj" \
- "$(INTDIR)\buffers.obj"
-
-
-"$(OUTDIR)\fitstcl.dll" : "$(OUTDIR)" $(LINK32_OBJS) $(DEF_FILE)
- $(LINK32) @<<
- $(LINK32_FLAGS) $(LINK32_OBJS)
-<<
-
-$(DEF_FILE):
- ..\tcl8.2.2\win\Release\DUMPEXTS -o $(DEF_FILE) fitstcl.dll $(LINK32_OBJS)
-
-
-!ELSEIF "$(CFG)" == "fitstcl - Win32 Debug"
-
-OUTDIR=.
-INTDIR=.
-# Begin Custom Macros
-OutDir=.
-# End Custom Macros
-
-ALL : "$(OUTDIR)\fitstcl.dll"
-
-
-CLEAN :
- - at erase "$(INTDIR)\buffers.obj"
- - at erase "$(INTDIR)\cfileio.obj"
- - at erase "$(INTDIR)\checksum.obj"
- - at erase "$(INTDIR)\compress.obj"
- - at erase "$(INTDIR)\drvrfile.obj"
- - at erase "$(INTDIR)\drvrmem.obj"
- - at erase "$(INTDIR)\editcol.obj"
- - at erase "$(INTDIR)\edithdu.obj"
- - at erase "$(INTDIR)\eval_f.obj"
- - at erase "$(INTDIR)\eval_l.obj"
- - at erase "$(INTDIR)\eval_y.obj"
- - at erase "$(INTDIR)\fitsCmds.obj"
- - at erase "$(INTDIR)\fitscore.obj"
- - at erase "$(INTDIR)\fitsInit.obj"
- - at erase "$(INTDIR)\fitsIO.obj"
- - at erase "$(INTDIR)\fitsTcl.obj"
- - at erase "$(INTDIR)\fitsUtils.obj"
- - at erase "$(INTDIR)\fvTcl.obj"
- - at erase "$(INTDIR)\getcol.obj"
- - at erase "$(INTDIR)\getcolb.obj"
- - at erase "$(INTDIR)\getcold.obj"
- - at erase "$(INTDIR)\getcole.obj"
- - at erase "$(INTDIR)\getcoli.obj"
- - at erase "$(INTDIR)\getcolj.obj"
- - at erase "$(INTDIR)\getcolk.obj"
- - at erase "$(INTDIR)\getcoll.obj"
- - at erase "$(INTDIR)\getcols.obj"
- - at erase "$(INTDIR)\getcolui.obj"
- - at erase "$(INTDIR)\getcoluj.obj"
- - at erase "$(INTDIR)\getcoluk.obj"
- - at erase "$(INTDIR)\getkey.obj"
- - at erase "$(INTDIR)\group.obj"
- - at erase "$(INTDIR)\grparser.obj"
- - at erase "$(INTDIR)\histo.obj"
- - at erase "$(INTDIR)\iraffits.obj"
- - at erase "$(INTDIR)\listhead.obj"
- - at erase "$(INTDIR)\modkey.obj"
- - at erase "$(INTDIR)\putcol.obj"
- - at erase "$(INTDIR)\putcolb.obj"
- - at erase "$(INTDIR)\putcold.obj"
- - at erase "$(INTDIR)\putcole.obj"
- - at erase "$(INTDIR)\putcoli.obj"
- - at erase "$(INTDIR)\putcolj.obj"
- - at erase "$(INTDIR)\putcolk.obj"
- - at erase "$(INTDIR)\putcoll.obj"
- - at erase "$(INTDIR)\putcols.obj"
- - at erase "$(INTDIR)\putcolu.obj"
- - at erase "$(INTDIR)\putcolui.obj"
- - at erase "$(INTDIR)\putcoluj.obj"
- - at erase "$(INTDIR)\putcoluk.obj"
- - at erase "$(INTDIR)\putkey.obj"
- - at erase "$(INTDIR)\region.obj"
- - at erase "$(INTDIR)\scalnull.obj"
- - at erase "$(INTDIR)\swapproc.obj"
- - at erase "$(INTDIR)\tclShared.obj"
- - at erase "$(INTDIR)\imcompress.obj"
- - at erase "$(INTDIR)\ricecomp.obj"
- - at erase "$(INTDIR)\quantize.obj"
- - at erase "$(INTDIR)\pliocomp.obj"
- - at erase "$(INTDIR)\drvrnet.obj"
- - at erase "$(INTDIR)\drvrsmem.obj"
- - at erase "$(INTDIR)\getcolsb.obj"
- - at erase "$(INTDIR)\putcolsb.obj"
- - at erase "$(INTDIR)\wcssub.obj"
- - at erase "$(INTDIR)\wcsutil.obj"
- - at erase "$(INTDIR)\vc60.idb"
- - at erase "$(INTDIR)\vc60.pdb"
- - at erase "$(INTDIR)\wcsutil.obj"
- - at erase "$(OUTDIR)\fitstcl.dll"
- - at erase "$(OUTDIR)\fitstcl.exp"
- - at erase "$(OUTDIR)\fitstcl.ilk"
- - at erase "$(OUTDIR)\fitstcl.lib"
- - at erase "$(OUTDIR)\fitstcl.pdb"
-
-"$(OUTDIR)" :
- if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
-
-CPP_PROJ=/nologo /MTd /W3 /Gm /GX /ZI /Od /I "d:\fv_src\tcl8.2.2\generic" /I "d:\fv_src\tk8.2.2\generic" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "FITSTCL_EXPORTS" /Fp"$(INTDIR)\fitstcl.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c
-MTL_PROJ=/nologo /D "_DEBUG" /mktyplib203 /win32
-BSC32=bscmake.exe
-BSC32_FLAGS=/nologo /o"$(OUTDIR)\fitstcl.bsc"
-BSC32_SBRS= \
-
-LINK32=link.exe
-LINK32_FLAGS=kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib d:\fv_src\tk8.2.2\win\Release\tk82.lib d:\fv_src\tcl8.2.2\win\Release\tcl82.lib /nologo /dll /incremental:yes /pdb:"$(OUTDIR)\fitstcl.pdb" /debug /machine:I386 /def:"fitstcl.def" /out:"$(OUTDIR)\fitstcl.dll" /implib:"$(OUTDIR)\fitstcl.lib" /pdbtype:sept
-DEF_FILE= \
- "fitstcl.def"
-LINK32_OBJS= \
- "$(INTDIR)\fitsCmds.obj" \
- "$(INTDIR)\fitsInit.obj" \
- "$(INTDIR)\fitsIO.obj" \
- "$(INTDIR)\fitsTcl.obj" \
- "$(INTDIR)\fitsUtils.obj" \
- "$(INTDIR)\fvTcl.obj" \
- "$(INTDIR)\tclShared.obj" \
- "$(INTDIR)\imcompress.obj" \
- "$(INTDIR)\ricecomp.obj" \
- "$(INTDIR)\quantize.obj" \
- "$(INTDIR)\pliocomp.obj" \
- "$(INTDIR)\wcsutil.obj" \
- "$(INTDIR)\cfileio.obj" \
- "$(INTDIR)\checksum.obj" \
- "$(INTDIR)\compress.obj" \
- "$(INTDIR)\drvrfile.obj" \
- "$(INTDIR)\drvrmem.obj" \
- "$(INTDIR)\editcol.obj" \
- "$(INTDIR)\edithdu.obj" \
- "$(INTDIR)\eval_f.obj" \
- "$(INTDIR)\eval_l.obj" \
- "$(INTDIR)\eval_y.obj" \
- "$(INTDIR)\fitscore.obj" \
- "$(INTDIR)\getcol.obj" \
- "$(INTDIR)\getcolb.obj" \
- "$(INTDIR)\getcold.obj" \
- "$(INTDIR)\getcole.obj" \
- "$(INTDIR)\getcoli.obj" \
- "$(INTDIR)\getcolj.obj" \
- "$(INTDIR)\getcolk.obj" \
- "$(INTDIR)\getcoll.obj" \
- "$(INTDIR)\getcols.obj" \
- "$(INTDIR)\getcolui.obj" \
- "$(INTDIR)\getcoluj.obj" \
- "$(INTDIR)\getcoluk.obj" \
- "$(INTDIR)\getkey.obj" \
- "$(INTDIR)\group.obj" \
- "$(INTDIR)\grparser.obj" \
- "$(INTDIR)\histo.obj" \
- "$(INTDIR)\iraffits.obj" \
- "$(INTDIR)\listhead.obj" \
- "$(INTDIR)\modkey.obj" \
- "$(INTDIR)\putcol.obj" \
- "$(INTDIR)\putcolb.obj" \
- "$(INTDIR)\putcold.obj" \
- "$(INTDIR)\putcole.obj" \
- "$(INTDIR)\putcoli.obj" \
- "$(INTDIR)\putcolj.obj" \
- "$(INTDIR)\putcolk.obj" \
- "$(INTDIR)\putcoll.obj" \
- "$(INTDIR)\putcols.obj" \
- "$(INTDIR)\putcolu.obj" \
- "$(INTDIR)\putcolui.obj" \
- "$(INTDIR)\putcoluj.obj" \
- "$(INTDIR)\putcoluk.obj" \
- "$(INTDIR)\putkey.obj" \
- "$(INTDIR)\region.obj" \
- "$(INTDIR)\drvrnet.obj" \
- "$(INTDIR)\drvrsmem.obj" \
- "$(INTDIR)\getcolsb.obj" \
- "$(INTDIR)\putcolsb.obj" \
- "$(INTDIR)\wcssub.obj" \
- "$(INTDIR)\wcsutil.obj" \
- "$(INTDIR)\scalnull.obj" \
- "$(INTDIR)\swapproc.obj" \
- "$(INTDIR)\buffers.obj"
-
-"$(OUTDIR)\fitstcl.dll" : "$(OUTDIR)" $(LINK32_OBJS) $(DEF_FILE)
- $(LINK32) @<<
- $(LINK32_FLAGS) $(LINK32_OBJS)
-<<
-
-$(DEF_FILE):
- ..\tcl8.2.2\win\Release\DUMPEXTS -o $(DEF_FILE) fitstcl.dll $(LINK32_OBJS)
-
-
-!ENDIF
-
-.c{$(INTDIR)}.obj::
- $(CPP) @<<
- $(CPP_PROJ) $<
-<<
-
-.cpp{$(INTDIR)}.obj::
- $(CPP) @<<
- $(CPP_PROJ) $<
-<<
-
-.cxx{$(INTDIR)}.obj::
- $(CPP) @<<
- $(CPP_PROJ) $<
-<<
-
-.c{$(INTDIR)}.sbr::
- $(CPP) @<<
- $(CPP_PROJ) $<
-<<
-
-.cpp{$(INTDIR)}.sbr::
- $(CPP) @<<
- $(CPP_PROJ) $<
-<<
-
-.cxx{$(INTDIR)}.sbr::
- $(CPP) @<<
- $(CPP_PROJ) $<
-<<
-
-
-!IF "$(NO_EXTERNAL_DEPS)" != "1"
-!IF EXISTS("fitstcl.dep")
-!INCLUDE "fitstcl.dep"
-!ELSE
-!MESSAGE Warning: cannot find "fitstcl.dep"
-!ENDIF
-!ENDIF
-
-
-!IF "$(CFG)" == "fitstcl - Win32 Release" || "$(CFG)" == "fitstcl - Win32 Debug"
-SOURCE=cfitsio\buffers.c
-
-"$(INTDIR)\buffers.obj" : $(SOURCE) "$(INTDIR)"
- $(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-SOURCE=cfitsio\cfileio.c
-
-"$(INTDIR)\cfileio.obj" : $(SOURCE) "$(INTDIR)"
- $(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-SOURCE=cfitsio\checksum.c
-
-"$(INTDIR)\checksum.obj" : $(SOURCE) "$(INTDIR)"
- $(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-SOURCE=cfitsio\compress.c
-
-"$(INTDIR)\compress.obj" : $(SOURCE) "$(INTDIR)"
- $(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-SOURCE=cfitsio\drvrfile.c
-
-"$(INTDIR)\drvrfile.obj" : $(SOURCE) "$(INTDIR)"
- $(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-SOURCE=cfitsio\drvrmem.c
-
-"$(INTDIR)\drvrmem.obj" : $(SOURCE) "$(INTDIR)"
- $(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-SOURCE=cfitsio\editcol.c
-
-"$(INTDIR)\editcol.obj" : $(SOURCE) "$(INTDIR)"
- $(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-SOURCE=cfitsio\edithdu.c
-
-"$(INTDIR)\edithdu.obj" : $(SOURCE) "$(INTDIR)"
- $(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-SOURCE=cfitsio\eval_f.c
-
-"$(INTDIR)\eval_f.obj" : $(SOURCE) "$(INTDIR)"
- $(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-SOURCE=cfitsio\eval_l.c
-
-"$(INTDIR)\eval_l.obj" : $(SOURCE) "$(INTDIR)"
- $(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-SOURCE=cfitsio\eval_y.c
-
-"$(INTDIR)\eval_y.obj" : $(SOURCE) "$(INTDIR)"
- $(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-SOURCE=fitsCmds.c
-
-"$(INTDIR)\fitsCmds.obj" : $(SOURCE) "$(INTDIR)"
- $(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-SOURCE=cfitsio\fitscore.c
-
-"$(INTDIR)\fitscore.obj" : $(SOURCE) "$(INTDIR)"
- $(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-SOURCE=fitsInit.c
-
-"$(INTDIR)\fitsInit.obj" : $(SOURCE) "$(INTDIR)"
- $(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-SOURCE=fitsIO.c
-
-"$(INTDIR)\fitsIO.obj" : $(SOURCE) "$(INTDIR)"
- $(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-SOURCE=fitsTcl.c
-
-"$(INTDIR)\fitsTcl.obj" : $(SOURCE) "$(INTDIR)"
- $(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-SOURCE=fitsUtils.c
-
-"$(INTDIR)\fitsUtils.obj" : $(SOURCE) "$(INTDIR)"
- $(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-SOURCE=fvTcl.c
-
-"$(INTDIR)\fvTcl.obj" : $(SOURCE) "$(INTDIR)"
- $(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-SOURCE=cfitsio\getcol.c
-
-"$(INTDIR)\getcol.obj" : $(SOURCE) "$(INTDIR)"
- $(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-SOURCE=cfitsio\getcolb.c
-
-"$(INTDIR)\getcolb.obj" : $(SOURCE) "$(INTDIR)"
- $(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-SOURCE=cfitsio\getcold.c
-
-"$(INTDIR)\getcold.obj" : $(SOURCE) "$(INTDIR)"
- $(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-SOURCE=cfitsio\getcole.c
-
-"$(INTDIR)\getcole.obj" : $(SOURCE) "$(INTDIR)"
- $(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-SOURCE=cfitsio\getcoli.c
-
-"$(INTDIR)\getcoli.obj" : $(SOURCE) "$(INTDIR)"
- $(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-SOURCE=cfitsio\getcolj.c
-
-"$(INTDIR)\getcolj.obj" : $(SOURCE) "$(INTDIR)"
- $(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-SOURCE=cfitsio\getcolk.c
-
-"$(INTDIR)\getcolk.obj" : $(SOURCE) "$(INTDIR)"
- $(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-SOURCE=cfitsio\getcoll.c
-
-"$(INTDIR)\getcoll.obj" : $(SOURCE) "$(INTDIR)"
- $(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-SOURCE=cfitsio\getcols.c
-
-"$(INTDIR)\getcols.obj" : $(SOURCE) "$(INTDIR)"
- $(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-SOURCE=cfitsio\getcolui.c
-
-"$(INTDIR)\getcolui.obj" : $(SOURCE) "$(INTDIR)"
- $(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-SOURCE=cfitsio\getcoluj.c
-
-"$(INTDIR)\getcoluj.obj" : $(SOURCE) "$(INTDIR)"
- $(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-SOURCE=cfitsio\getcoluk.c
-
-"$(INTDIR)\getcoluk.obj" : $(SOURCE) "$(INTDIR)"
- $(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-SOURCE=cfitsio\getkey.c
-
-"$(INTDIR)\getkey.obj" : $(SOURCE) "$(INTDIR)"
- $(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-SOURCE=cfitsio\group.c
-
-"$(INTDIR)\group.obj" : $(SOURCE) "$(INTDIR)"
- $(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-SOURCE=cfitsio\grparser.c
-
-"$(INTDIR)\grparser.obj" : $(SOURCE) "$(INTDIR)"
- $(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-SOURCE=cfitsio\histo.c
-
-"$(INTDIR)\histo.obj" : $(SOURCE) "$(INTDIR)"
- $(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-SOURCE=cfitsio\iraffits.c
-
-"$(INTDIR)\iraffits.obj" : $(SOURCE) "$(INTDIR)"
- $(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-SOURCE=cfitsio\listhead.c
-
-"$(INTDIR)\listhead.obj" : $(SOURCE) "$(INTDIR)"
- $(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-SOURCE=cfitsio\modkey.c
-
-"$(INTDIR)\modkey.obj" : $(SOURCE) "$(INTDIR)"
- $(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-SOURCE=cfitsio\putcol.c
-
-"$(INTDIR)\putcol.obj" : $(SOURCE) "$(INTDIR)"
- $(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-SOURCE=cfitsio\putcolb.c
-
-"$(INTDIR)\putcolb.obj" : $(SOURCE) "$(INTDIR)"
- $(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-SOURCE=cfitsio\putcold.c
-
-"$(INTDIR)\putcold.obj" : $(SOURCE) "$(INTDIR)"
- $(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-SOURCE=cfitsio\putcole.c
-
-"$(INTDIR)\putcole.obj" : $(SOURCE) "$(INTDIR)"
- $(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-SOURCE=cfitsio\putcoli.c
-
-"$(INTDIR)\putcoli.obj" : $(SOURCE) "$(INTDIR)"
- $(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-SOURCE=cfitsio\putcolj.c
-
-"$(INTDIR)\putcolj.obj" : $(SOURCE) "$(INTDIR)"
- $(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-SOURCE=cfitsio\putcolk.c
-
-"$(INTDIR)\putcolk.obj" : $(SOURCE) "$(INTDIR)"
- $(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-SOURCE=cfitsio\putcoll.c
-
-"$(INTDIR)\putcoll.obj" : $(SOURCE) "$(INTDIR)"
- $(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-SOURCE=cfitsio\putcols.c
-
-"$(INTDIR)\putcols.obj" : $(SOURCE) "$(INTDIR)"
- $(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-SOURCE=cfitsio\putcolu.c
-
-"$(INTDIR)\putcolu.obj" : $(SOURCE) "$(INTDIR)"
- $(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-SOURCE=cfitsio\putcolui.c
-
-"$(INTDIR)\putcolui.obj" : $(SOURCE) "$(INTDIR)"
- $(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-SOURCE=cfitsio\putcoluj.c
-
-"$(INTDIR)\putcoluj.obj" : $(SOURCE) "$(INTDIR)"
- $(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-SOURCE=cfitsio\putcoluk.c
-
-"$(INTDIR)\putcoluk.obj" : $(SOURCE) "$(INTDIR)"
- $(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-SOURCE=cfitsio\putkey.c
-
-"$(INTDIR)\putkey.obj" : $(SOURCE) "$(INTDIR)"
- $(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-SOURCE=cfitsio\region.c
-
-"$(INTDIR)\region.obj" : $(SOURCE) "$(INTDIR)"
- $(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-SOURCE=cfitsio\scalnull.c
-
-"$(INTDIR)\scalnull.obj" : $(SOURCE) "$(INTDIR)"
- $(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-SOURCE=cfitsio\swapproc.c
-
-"$(INTDIR)\swapproc.obj" : $(SOURCE) "$(INTDIR)"
- $(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-SOURCE=tclShared.c
-
-"$(INTDIR)\tclShared.obj" : $(SOURCE) "$(INTDIR)"
- $(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-SOURCE=cfitsio\wcsutil.c
-
-"$(INTDIR)\wcsutil.obj" : $(SOURCE) "$(INTDIR)"
- $(CPP) $(CPP_PROJ) $(SOURCE)
-
-SOURCE=cfitsio\imcompress.c
-
-"$(INTDIR)\imcompress.obj" : $(SOURCE) "$(INTDIR)"
- $(CPP) $(CPP_PROJ) $(SOURCE)
-
-SOURCE=cfitsio\ricecomp.c
-
-"$(INTDIR)\ricecomp.obj" : $(SOURCE) "$(INTDIR)"
- $(CPP) $(CPP_PROJ) $(SOURCE)
-
-SOURCE=cfitsio\quantize.c
-
-"$(INTDIR)\quantize.obj" : $(SOURCE) "$(INTDIR)"
- $(CPP) $(CPP_PROJ) $(SOURCE)
-
-SOURCE=cfitsio\pliocomp.c
-
-"$(INTDIR)\pliocomp.obj" : $(SOURCE) "$(INTDIR)"
- $(CPP) $(CPP_PROJ) $(SOURCE)
-
-SOURCE=cfitsio\drvrnet.c
-
-"$(INTDIR)\drvrnet.obj" : $(SOURCE) "$(INTDIR)"
- $(CPP) $(CPP_PROJ) $(SOURCE)
-
-SOURCE=cfitsio\drvrsmem.c
-
-"$(INTDIR)\drvrsmem.obj" : $(SOURCE) "$(INTDIR)"
- $(CPP) $(CPP_PROJ) $(SOURCE)
-
-SOURCE=cfitsio\getcolsb.c
-
-"$(INTDIR)\getcolsb.obj" : $(SOURCE) "$(INTDIR)"
- $(CPP) $(CPP_PROJ) $(SOURCE)
-
-SOURCE=cfitsio\putcolsb.c
-
-"$(INTDIR)\putcolsb.obj" : $(SOURCE) "$(INTDIR)"
- $(CPP) $(CPP_PROJ) $(SOURCE)
-
-SOURCE=cfitsio\wcssub.c
-
-"$(INTDIR)\wcssub.obj" : $(SOURCE) "$(INTDIR)"
- $(CPP) $(CPP_PROJ) $(SOURCE)
-
-!ENDIF
-
diff --git a/makefile_plugin.bc5 b/makefile_plugin.bc5
deleted file mode 100644
index 000b972..0000000
--- a/makefile_plugin.bc5
+++ /dev/null
@@ -1,496 +0,0 @@
-#
-# Borland C++ IDE generated makefile
-# Generated 10/15/98 at 10:52:55 AM
-#
-.AUTODEPEND
-
-
-#
-# Borland C++ tools
-#
-IMPLIB = Implib
-BCC32 = Bcc32 +BccW32.cfg
-BCC32I = Bcc32i +BccW32.cfg
-TLINK32 = TLink32
-TLIB = TLib
-BRC32 = Brc32
-TASM32 = Tasm32
-#
-# IDE macros
-#
-
-
-#
-# Options
-#
-IDE_LinkFLAGS32 = -LD:\BC5\LIB
-LinkerLocalOptsAtC32_fitstcldlib = -Tpd -ap -c /w-inq
-ResLocalOptsAtC32_fitstcldlib =
-BLocalOptsAtC32_fitstcldlib =
-CompInheritOptsAt_fitstcldlib = -ID:\BC5\INCLUDE;C:\lheaplugin\tcl8.0\GENERIC;C:\lheaplugin\FITSTCL\CFITSIO -D_RTLDLL;_BIDSDLL; -w-sig -w-stu -w-par -w-use -w-aus
-LinkerInheritOptsAt_fitstcldlib = -x
-LinkerOptsAt_fitstcldlib = $(LinkerLocalOptsAtC32_fitstcldlib)
-ResOptsAt_fitstcldlib = $(ResLocalOptsAtC32_fitstcldlib)
-BOptsAt_fitstcldlib = $(BLocalOptsAtC32_fitstcldlib)
-CompLocalOptsAtC32_cfitsiodlib = -w-sig -w-stu -w-par -w-use -w-aus
-LinkerLocalOptsAtC32_cfitsiodlib = -Tpd -aa -V4.0 -c
-ResLocalOptsAtC32_cfitsiodlib =
-BLocalOptsAtC32_cfitsiodlib = /P32
-CompOptsAt_cfitsiodlib = $(CompOptsAt_fitstcldlib) $(CompLocalOptsAtC32_cfitsiodlib)
-CompInheritOptsAt_cfitsiodlib = -ID:\BC5\INCLUDE;C:\lheaplugin\TCL8.0\GENERIC;C:\lheaplugin\FITSTCL\CFITSIO -D_RTLDLL;_RTLDLL;_BIDSDLL;
-LinkerInheritOptsAt_cfitsiodlib = -x
-LinkerOptsAt_cfitsiodlib = $(LinkerOptsAt_fitstcldlib) $(LinkerLocalOptsAtC32_cfitsiodlib)
-ResOptsAt_cfitsiodlib = $(ResOptsAt_fitstcldlib) $(ResLocalOptsAtC32_cfitsiodlib)
-BOptsAt_cfitsiodlib = $(BOptsAt_fitstcldlib) $(BLocalOptsAtC32_cfitsiodlib)
-
-#
-# Dependency List
-#
-Dep_fitstcl = \
- fitstcl.lib
-
-fitstcl : BccW32.cfg $(Dep_fitstcl)
- echo MakeNode
-
-fitstcl.lib : fitstcl.dll
- $(IMPLIB) $@ fitstcl.dll
-
-
-Dep_fitstclddll = \
- cfitsio.lib\
- ..\tcl8.0\win\tcl80.lib\
- tclshared.obj\
- fitsinit.obj\
- fitsutils.obj\
- fitstcl.obj\
- fitscmds.obj\
- fitsio.obj\
- fvtcl.obj
-
-fitstcl.dll : $(Dep_fitstclddll) fitstcl.def
- $(TLINK32) @&&|
- /v $(IDE_LinkFLAGS32) $(LinkerOptsAt_fitstcldlib) $(LinkerInheritOptsAt_fitstcldlib) +
-D:\BC5\LIB\c0d32.obj+
-tclshared.obj+
-fitsinit.obj+
-fitsutils.obj+
-fitstcl.obj+
-fitscmds.obj+
-fitsio.obj+
-fvtcl.obj
-$<,$*
-cfitsio.lib+
-..\tcl8.0\win\tcl80.lib+
-D:\BC5\LIB\bidsfi.lib+
-D:\BC5\LIB\import32.lib+
-D:\BC5\LIB\cw32i.lib, fitstcl.def
-
-
-
-|
-Dep_cfitsiodlib = \
- putcols.obj\
- putcolui.obj\
- putcoluj.obj\
- putcoluk.obj\
- putcolu.obj\
- putkey.obj\
- region.obj\
- swapproc.obj\
- scalnull.obj\
- wcsutil.obj\
- putcolk.obj\
- putcolj.obj\
- putcoli.obj\
- putcole.obj\
- putcold.obj\
- putcolb.obj\
- putcol.obj\
- modkey.obj\
- listhead.obj\
- putcoll.obj\
- getcolj.obj\
- iraffits.obj\
- histo.obj\
- group.obj\
- grparser.obj\
- getkey.obj\
- getcoluk.obj\
- getcoluj.obj\
- getcolui.obj\
- getcols.obj\
- getcoll.obj\
- getcolk.obj\
- eval_f.obj\
- getcole.obj\
- getcold.obj\
- getcolb.obj\
- getcol.obj\
- fitscore.obj\
- eval_y.obj\
- eval_l.obj\
- getcoli.obj\
- buffers.obj\
- editcol.obj\
- drvrmem.obj\
- drvrfile.obj\
- compress.obj\
- checksum.obj\
- cfileio.obj\
- edithdu.obj
-
-cfitsio.lib : $(Dep_cfitsiodlib)
- $(TLIB) $< $(IDE_BFLAGS) $(BOptsAt_cfitsiodlib) @&&|
- -+putcols.obj &
--+putcolui.obj &
--+putcoluj.obj &
--+putcoluk.obj &
--+putcolu.obj &
--+putkey.obj &
--+region.obj &
--+swapproc.obj &
--+scalnull.obj &
--+wcsutil.obj &
--+putcolk.obj &
--+putcolj.obj &
--+putcoli.obj &
--+putcole.obj &
--+putcold.obj &
--+putcolb.obj &
--+putcol.obj &
--+modkey.obj &
--+listhead.obj &
--+putcoll.obj &
--+getcolj.obj &
--+iraffits.obj &
--+histo.obj &
--+group.obj &
--+grparser.obj &
--+getkey.obj &
--+getcoluk.obj &
--+getcoluj.obj &
--+getcolui.obj &
--+getcols.obj &
--+getcoll.obj &
--+getcolk.obj &
--+eval_f.obj &
--+getcole.obj &
--+getcold.obj &
--+getcolb.obj &
--+getcol.obj &
--+fitscore.obj &
--+eval_y.obj &
--+eval_l.obj &
--+getcoli.obj &
--+buffers.obj &
--+editcol.obj &
--+drvrmem.obj &
--+drvrfile.obj &
--+compress.obj &
--+checksum.obj &
--+cfileio.obj &
--+edithdu.obj
-|
-
-putcols.obj : cfitsio\putcols.c
- $(BCC32) -P- -c @&&|
- $(CompOptsAt_cfitsiodlib) $(CompInheritOptsAt_cfitsiodlib) -o$@ cfitsio\putcols.c
-|
-
-putcolui.obj : cfitsio\putcolui.c
- $(BCC32) -P- -c @&&|
- $(CompOptsAt_cfitsiodlib) $(CompInheritOptsAt_cfitsiodlib) -o$@ cfitsio\putcolui.c
-|
-
-putcoluj.obj : cfitsio\putcoluj.c
- $(BCC32) -P- -c @&&|
- $(CompOptsAt_cfitsiodlib) $(CompInheritOptsAt_cfitsiodlib) -o$@ cfitsio\putcoluj.c
-|
-
-putcoluk.obj : cfitsio\putcoluk.c
- $(BCC32) -P- -c @&&|
- $(CompOptsAt_cfitsiodlib) $(CompInheritOptsAt_cfitsiodlib) -o$@ cfitsio\putcoluk.c
-|
-
-putcolu.obj : cfitsio\putcolu.c
- $(BCC32) -P- -c @&&|
- $(CompOptsAt_cfitsiodlib) $(CompInheritOptsAt_cfitsiodlib) -o$@ cfitsio\putcolu.c
-|
-
-putkey.obj : cfitsio\putkey.c
- $(BCC32) -P- -c @&&|
- $(CompOptsAt_cfitsiodlib) $(CompInheritOptsAt_cfitsiodlib) -o$@ cfitsio\putkey.c
-|
-
-region.obj : cfitsio\region.c
- $(BCC32) -P- -c @&&|
- $(CompOptsAt_cfitsiodlib) $(CompInheritOptsAt_cfitsiodlib) -o$@ cfitsio\region.c
-|
-
-swapproc.obj : cfitsio\swapproc.c
- $(BCC32) -P- -c @&&|
- $(CompOptsAt_cfitsiodlib) $(CompInheritOptsAt_cfitsiodlib) -o$@ cfitsio\swapproc.c
-|
-
-scalnull.obj : cfitsio\scalnull.c
- $(BCC32) -P- -c @&&|
- $(CompOptsAt_cfitsiodlib) $(CompInheritOptsAt_cfitsiodlib) -o$@ cfitsio\scalnull.c
-|
-
-wcsutil.obj : cfitsio\wcsutil.c
- $(BCC32) -P- -c @&&|
- $(CompOptsAt_cfitsiodlib) $(CompInheritOptsAt_cfitsiodlib) -o$@ cfitsio\wcsutil.c
-|
-
-putcolk.obj : cfitsio\putcolk.c
- $(BCC32) -P- -c @&&|
- $(CompOptsAt_cfitsiodlib) $(CompInheritOptsAt_cfitsiodlib) -o$@ cfitsio\putcolk.c
-|
-
-putcolj.obj : cfitsio\putcolj.c
- $(BCC32) -P- -c @&&|
- $(CompOptsAt_cfitsiodlib) $(CompInheritOptsAt_cfitsiodlib) -o$@ cfitsio\putcolj.c
-|
-
-putcoli.obj : cfitsio\putcoli.c
- $(BCC32) -P- -c @&&|
- $(CompOptsAt_cfitsiodlib) $(CompInheritOptsAt_cfitsiodlib) -o$@ cfitsio\putcoli.c
-|
-
-putcole.obj : cfitsio\putcole.c
- $(BCC32) -P- -c @&&|
- $(CompOptsAt_cfitsiodlib) $(CompInheritOptsAt_cfitsiodlib) -o$@ cfitsio\putcole.c
-|
-
-putcold.obj : cfitsio\putcold.c
- $(BCC32) -P- -c @&&|
- $(CompOptsAt_cfitsiodlib) $(CompInheritOptsAt_cfitsiodlib) -o$@ cfitsio\putcold.c
-|
-
-putcolb.obj : cfitsio\putcolb.c
- $(BCC32) -P- -c @&&|
- $(CompOptsAt_cfitsiodlib) $(CompInheritOptsAt_cfitsiodlib) -o$@ cfitsio\putcolb.c
-|
-
-putcol.obj : cfitsio\putcol.c
- $(BCC32) -P- -c @&&|
- $(CompOptsAt_cfitsiodlib) $(CompInheritOptsAt_cfitsiodlib) -o$@ cfitsio\putcol.c
-|
-
-modkey.obj : cfitsio\modkey.c
- $(BCC32) -P- -c @&&|
- $(CompOptsAt_cfitsiodlib) $(CompInheritOptsAt_cfitsiodlib) -o$@ cfitsio\modkey.c
-|
-
-listhead.obj : cfitsio\listhead.c
- $(BCC32) -P- -c @&&|
- $(CompOptsAt_cfitsiodlib) $(CompInheritOptsAt_cfitsiodlib) -o$@ cfitsio\listhead.c
-|
-
-putcoll.obj : cfitsio\putcoll.c
- $(BCC32) -P- -c @&&|
- $(CompOptsAt_cfitsiodlib) $(CompInheritOptsAt_cfitsiodlib) -o$@ cfitsio\putcoll.c
-|
-
-getcolj.obj : cfitsio\getcolj.c
- $(BCC32) -P- -c @&&|
- $(CompOptsAt_cfitsiodlib) $(CompInheritOptsAt_cfitsiodlib) -o$@ cfitsio\getcolj.c
-|
-
-iraffits.obj : cfitsio\iraffits.c
- $(BCC32) -P- -c @&&|
- $(CompOptsAt_cfitsiodlib) $(CompInheritOptsAt_cfitsiodlib) -o$@ cfitsio\iraffits.c
-|
-
-histo.obj : cfitsio\histo.c
- $(BCC32) -P- -c @&&|
- $(CompOptsAt_cfitsiodlib) $(CompInheritOptsAt_cfitsiodlib) -o$@ cfitsio\histo.c
-|
-
-group.obj : cfitsio\group.c
- $(BCC32) -P- -c @&&|
- $(CompOptsAt_cfitsiodlib) $(CompInheritOptsAt_cfitsiodlib) -o$@ cfitsio\group.c
-|
-
-grparser.obj : cfitsio\grparser.c
- $(BCC32) -P- -c @&&|
- $(CompOptsAt_cfitsiodlib) $(CompInheritOptsAt_cfitsiodlib) -o$@ cfitsio\grparser.c
-|
-
-getkey.obj : cfitsio\getkey.c
- $(BCC32) -P- -c @&&|
- $(CompOptsAt_cfitsiodlib) $(CompInheritOptsAt_cfitsiodlib) -o$@ cfitsio\getkey.c
-|
-
-getcoluk.obj : cfitsio\getcoluk.c
- $(BCC32) -P- -c @&&|
- $(CompOptsAt_cfitsiodlib) $(CompInheritOptsAt_cfitsiodlib) -o$@ cfitsio\getcoluk.c
-|
-
-getcoluj.obj : cfitsio\getcoluj.c
- $(BCC32) -P- -c @&&|
- $(CompOptsAt_cfitsiodlib) $(CompInheritOptsAt_cfitsiodlib) -o$@ cfitsio\getcoluj.c
-|
-
-getcolui.obj : cfitsio\getcolui.c
- $(BCC32) -P- -c @&&|
- $(CompOptsAt_cfitsiodlib) $(CompInheritOptsAt_cfitsiodlib) -o$@ cfitsio\getcolui.c
-|
-
-getcols.obj : cfitsio\getcols.c
- $(BCC32) -P- -c @&&|
- $(CompOptsAt_cfitsiodlib) $(CompInheritOptsAt_cfitsiodlib) -o$@ cfitsio\getcols.c
-|
-
-getcoll.obj : cfitsio\getcoll.c
- $(BCC32) -P- -c @&&|
- $(CompOptsAt_cfitsiodlib) $(CompInheritOptsAt_cfitsiodlib) -o$@ cfitsio\getcoll.c
-|
-
-getcolk.obj : cfitsio\getcolk.c
- $(BCC32) -P- -c @&&|
- $(CompOptsAt_cfitsiodlib) $(CompInheritOptsAt_cfitsiodlib) -o$@ cfitsio\getcolk.c
-|
-
-eval_f.obj : cfitsio\eval_f.c
- $(BCC32) -P- -c @&&|
- $(CompOptsAt_cfitsiodlib) $(CompInheritOptsAt_cfitsiodlib) -o$@ cfitsio\eval_f.c
-|
-
-getcole.obj : cfitsio\getcole.c
- $(BCC32) -P- -c @&&|
- $(CompOptsAt_cfitsiodlib) $(CompInheritOptsAt_cfitsiodlib) -o$@ cfitsio\getcole.c
-|
-
-getcold.obj : cfitsio\getcold.c
- $(BCC32) -P- -c @&&|
- $(CompOptsAt_cfitsiodlib) $(CompInheritOptsAt_cfitsiodlib) -o$@ cfitsio\getcold.c
-|
-
-getcolb.obj : cfitsio\getcolb.c
- $(BCC32) -P- -c @&&|
- $(CompOptsAt_cfitsiodlib) $(CompInheritOptsAt_cfitsiodlib) -o$@ cfitsio\getcolb.c
-|
-
-getcol.obj : cfitsio\getcol.c
- $(BCC32) -P- -c @&&|
- $(CompOptsAt_cfitsiodlib) $(CompInheritOptsAt_cfitsiodlib) -o$@ cfitsio\getcol.c
-|
-
-fitscore.obj : cfitsio\fitscore.c
- $(BCC32) -P- -c @&&|
- $(CompOptsAt_cfitsiodlib) $(CompInheritOptsAt_cfitsiodlib) -o$@ cfitsio\fitscore.c
-|
-
-eval_y.obj : cfitsio\eval_y.c
- $(BCC32) -P- -c @&&|
- $(CompOptsAt_cfitsiodlib) $(CompInheritOptsAt_cfitsiodlib) -o$@ cfitsio\eval_y.c
-|
-
-eval_l.obj : cfitsio\eval_l.c
- $(BCC32) -P- -c @&&|
- $(CompOptsAt_cfitsiodlib) $(CompInheritOptsAt_cfitsiodlib) -o$@ cfitsio\eval_l.c
-|
-
-getcoli.obj : cfitsio\getcoli.c
- $(BCC32) -P- -c @&&|
- $(CompOptsAt_cfitsiodlib) $(CompInheritOptsAt_cfitsiodlib) -o$@ cfitsio\getcoli.c
-|
-
-buffers.obj : cfitsio\buffers.c
- $(BCC32) -P- -c @&&|
- $(CompOptsAt_cfitsiodlib) $(CompInheritOptsAt_cfitsiodlib) -o$@ cfitsio\buffers.c
-|
-
-editcol.obj : cfitsio\editcol.c
- $(BCC32) -P- -c @&&|
- $(CompOptsAt_cfitsiodlib) $(CompInheritOptsAt_cfitsiodlib) -o$@ cfitsio\editcol.c
-|
-
-drvrmem.obj : cfitsio\drvrmem.c
- $(BCC32) -P- -c @&&|
- $(CompOptsAt_cfitsiodlib) $(CompInheritOptsAt_cfitsiodlib) -o$@ cfitsio\drvrmem.c
-|
-
-drvrfile.obj : cfitsio\drvrfile.c
- $(BCC32) -P- -c @&&|
- $(CompOptsAt_cfitsiodlib) $(CompInheritOptsAt_cfitsiodlib) -o$@ cfitsio\drvrfile.c
-|
-
-compress.obj : cfitsio\compress.c
- $(BCC32) -P- -c @&&|
- $(CompOptsAt_cfitsiodlib) $(CompInheritOptsAt_cfitsiodlib) -o$@ cfitsio\compress.c
-|
-
-checksum.obj : cfitsio\checksum.c
- $(BCC32) -P- -c @&&|
- $(CompOptsAt_cfitsiodlib) $(CompInheritOptsAt_cfitsiodlib) -o$@ cfitsio\checksum.c
-|
-
-cfileio.obj : cfitsio\cfileio.c
- $(BCC32) -P- -c @&&|
- $(CompOptsAt_cfitsiodlib) $(CompInheritOptsAt_cfitsiodlib) -o$@ cfitsio\cfileio.c
-|
-
-edithdu.obj : cfitsio\edithdu.c
- $(BCC32) -P- -c @&&|
- $(CompOptsAt_cfitsiodlib) $(CompInheritOptsAt_cfitsiodlib) -o$@ cfitsio\edithdu.c
-|
-
-tclshared.obj : tclshared.c
- $(BCC32) -P- -c @&&|
- $(CompOptsAt_fitstcldlib) $(CompInheritOptsAt_fitstcldlib) -o$@ tclshared.c
-|
-
-fitscmds.obj : fitscmds.c
- $(BCC32) -P- -c @&&|
- $(CompOptsAt_fitstcldlib) $(CompInheritOptsAt_fitstcldlib) -o$@ fitscmds.c
-|
-
-fitsio.obj : fitsio.c
- $(BCC32) -P- -c @&&|
- $(CompOptsAt_fitstcldlib) $(CompInheritOptsAt_fitstcldlib) -o$@ fitsio.c
-|
-
-fvtcl.obj : fvtcl.c
- $(BCC32) -P- -c @&&|
- $(CompOptsAt_fitstcldlib) $(CompInheritOptsAt_fitstcldlib) -o$@ fvtcl.c
-|
-
-fitsutils.obj : fitsutils.c
- $(BCC32) -P- -c @&&|
- $(CompOptsAt_fitstcldlib) $(CompInheritOptsAt_fitstcldlib) -o$@ fitsutils.c
-|
-
-fitstcl.obj : fitstcl.c
- $(BCC32) -P- -c @&&|
- $(CompOptsAt_fitstcldlib) $(CompInheritOptsAt_fitstcldlib) -o$@ fitstcl.c
-|
-
-fitsinit.obj : fitsinit.c
- $(BCC32) -P- -c @&&|
- $(CompOptsAt_fitstcldlib) $(CompInheritOptsAt_fitstcldlib) -o$@ fitsinit.c
-|
-vcclib: fitstcl.def
- lib/def:fitstcl.def
-
-
-fitstcl.def:
- ..\tcl8.0\win\DUMPEXTS -o fitstcl.def fitstcl.dll @&&|
- $(Dep_fitstclddll)
-|
-
-
-# Compiler configuration file
-BccW32.cfg :
- Copy &&|
--w
--R
--v
--vi
--H
--H=fitstcl.csm
--g255
--WCD
-| $@
-
diff --git a/tclShared.c b/tclShared.c
index 6de7e05..760c77c 100644
--- a/tclShared.c
+++ b/tclShared.c
@@ -21,3 +21,18 @@ int Fitstcl_Init (interp)
return Fits_Init(interp);
}
+int Fitstcl_SafeInit (interp)
+ Tcl_Interp *interp; /* Interpreter for application. */
+{
+ return Fits_SafeInit(interp);
+}
+
+int Fitstcl_SafeUnload(Tcl_Interp *interp, int flags)
+{
+ return FitsTcl_SafeUnload(interp, flags);
+}
+
+int Fitstcl_Unload(Tcl_Interp *interp, int flags)
+{
+ return FitsTcl_Unload(interp, flags);
+}
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-astro/packages/tcl-fitstcl.git
More information about the debian-science-commits
mailing list