From 570accd25759b1f7111ab19a05971342e0866901 Mon Sep 17 00:00:00 2001 From: Ed Hartnett Date: Thu, 8 Mar 2018 04:04:53 -0700 Subject: [PATCH] cleaned up --- acinclude.m4 | 626 -------------------------------------------------- nctest/README | 44 ---- test_prog.F | 10 - test_prog.f90 | 12 - 4 files changed, 692 deletions(-) delete mode 100644 nctest/README delete mode 100644 test_prog.F delete mode 100644 test_prog.f90 diff --git a/acinclude.m4 b/acinclude.m4 index 2040f45d2..4909765cd 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -1,107 +1,5 @@ -dnl $Id: acinclude.m4,v 1.34 2009/10/14 21:12:01 dmh Exp $ dnl UD macros for netcdf configure - -dnl Convert a string to all uppercase. -dnl -define([uppercase], -[translit($1, abcdefghijklmnopqrstuvwxyz, ABCDEFGHIJKLMNOPQRSTUVWXYZ)]) - -dnl -dnl Check for an nm(1) utility. -dnl -AC_DEFUN([UD_PROG_NM], -[ - case "${NM-unset}" in - unset) AC_CHECK_PROGS(NM, nm, nm) ;; - *) AC_CHECK_PROGS(NM, $NM nm, nm) ;; - esac - AC_MSG_CHECKING(nm flags) - case "${NMFLAGS-unset}" in - unset) NMFLAGS= ;; - esac - AC_MSG_RESULT($NMFLAGS) - AC_SUBST(NMFLAGS) -]) - -dnl -dnl Check for an m4(1) preprocessor utility. -dnl -AC_DEFUN([UD_PROG_M4], -[ - case "${M4-unset}" in - unset) AC_CHECK_PROGS(M4, m4 gm4, m4) ;; - *) AC_CHECK_PROGS(M4, $M4 m4 gm4, m4) ;; - esac - AC_MSG_CHECKING(m4 flags) - case "${M4FLAGS-unset}" in - unset) M4FLAGS=-B10000 ;; - esac - AC_MSG_RESULT($M4FLAGS) - AC_SUBST(M4FLAGS) -]) - -dnl -dnl Set the top-level source-directory. -dnl -AC_DEFUN([UD_SRCDIR], -[ - AC_MSG_CHECKING(for top-level source-directory) - SRCDIR=`(cd $srcdir && pwd)` - AC_MSG_RESULT($SRCDIR) - AC_SUBST(SRCDIR) -]) - - -dnl -dnl like AC_LONG_DOUBLE, except checks for 'long long' -dnl -AC_DEFUN([UD_C_LONG_LONG], -[AC_MSG_CHECKING(for long long) -AC_CACHE_VAL(ac_cv_c_long_long, -[if test "$GCC" = yes; then - ac_cv_c_long_long=yes -else -AC_TRY_RUN([int main() { -long long foo = 0; -exit(sizeof(long long) < sizeof(long)); }], -ac_cv_c_long_long=yes, ac_cv_c_long_long=no, :) -fi])dnl -AC_MSG_RESULT($ac_cv_c_long_long) -if test "$ac_cv_c_long_long" = yes; then - AC_DEFINE([HAVE_LONG_LONG], [], [have long long type]) -fi -]) - -dnl UD_CHECK_SIZEOF(TYPE) -AC_DEFUN([UD_CHECK_SIZEOF], -[changequote(<<, >>)dnl -dnl The name to #define. -define(<>, translit(sizeof_$1, [a-z *], [A-Z_P]))dnl -dnl The cache variable name. -define(<>, translit(ac_cv_sizeof_$1, [ *], [_p]))dnl -changequote([, ])dnl -AC_MSG_CHECKING(size of $1) -AC_CACHE_VAL(AC_CV_NAME, -[AC_TRY_RUN([#include -#include -#if STDC_HEADERS -#include -#endif -main() -{ - FILE *f=fopen("conftestval", "w"); - if (!f) exit(1); - fprintf(f, "%d\n", sizeof($1)); - exit(0); -}], AC_CV_NAME=`cat conftestval`, AC_CV_NAME=0, AC_CV_NAME=0)])dnl -AC_MSG_RESULT($AC_CV_NAME) -AC_DEFINE_UNQUOTED(AC_TYPE_NAME, $AC_CV_NAME, [type size]) -undefine([AC_TYPE_NAME])dnl -undefine([AC_CV_NAME])dnl -]) - - dnl dnl UD_CHECK_IEEE dnl If the 'double' is not an IEEE double @@ -147,397 +45,6 @@ if test "$ac_cv_c_ieeefloat" = no; then fi ]) -dnl Check for utility for generating makefile dependencies. -dnl Should only be used at the UPC. -dnl -AC_DEFUN([UD_PROG_CC_MAKEDEPEND], -[ - AC_MSG_CHECKING(how to make dependencies) - case `uname -s` in - IRIX*|OSF1) - CC_MAKEDEPEND='cc -M' - ;; - SunOS) - case `uname -r` in - 4*) - CC_MAKEDEPEND='cc -M' - ;; - 5*|*) - CC_MAKEDEPEND='cc -xM' - ;; - esac - ;; - ULTRIX) - case `uname -m` in - RISC) - CC_MAKEDEPEND='cc -M' - ;; - VAX) # Can't handle prototypes in netcdf.h - ;; - esac - ;; - AIX) # Writes to .u files rather than standard out - ;; - HP-UX) # Writes escaped newlines to standard error - ;; - esac - case "${CC_MAKEDEPEND}" in - '') - CC_MAKEDEPEND=false - ;; - esac - AC_MSG_RESULT($CC_MAKEDEPEND) - AC_SUBST(CC_MAKEDEPEND) -]) - -dnl Check for a Fortran type equivalent to a netCDF type. -dnl -dnl UD_CHECK_FORTRAN_NCTYPE(forttype, possibs, nctype) -dnl -AC_DEFUN([UD_CHECK_FORTRAN_NCTYPE], -[ - AC_MSG_CHECKING(for Fortran-equivalent to netCDF \"$3\") - for type in $2; do - cat >conftest.f <conftest.f <conftest.c < -#include -void main() -{ -$3 values[[]] = {0, $4, 0, $5, 0}; -$3 minval, maxval; -void $FCALLSCSUB($3*, $3*, $3*); -$FCALLSCSUB(values, &minval, &maxval); -exit(!(minval == $4 && maxval == $5)); -} -EOF - doit='$CC -o conftest ${CPPFLAGS} ${CFLAGS} ${LDFLAGS} conftest.c conftestf.o ${LIBS}' - if AC_TRY_EVAL(doit); then - doit=./conftest - if AC_TRY_EVAL(doit); then - AC_MSG_RESULT($2) - $1=$2 - AC_DEFINE_UNQUOTED($1,$2, [take a guess]) - else - AC_MSG_RESULT(no equivalent type) - unset $1 - fi - else - AC_MSG_ERROR(Could not compile-and-link conftest.c and conftestf.o) - fi - else - AC_MSG_ERROR(Could not compile conftest.f) - fi - rm -f conftest* -]) - - -dnl Check for a Fortran data type. -dnl -dnl UD_CHECK_FORTRAN_TYPE(varname, ftypes) -dnl -AC_DEFUN([UD_CHECK_FORTRAN_TYPE], -[ - for ftype in $2; do - AC_MSG_CHECKING(for Fortran \"$ftype\") - cat >conftest.f <conftest.f <<\EOF - call sub() - end -EOF - doit='$FC -c ${FFLAGS} conftest.f' - if AC_TRY_EVAL(doit); then - FCALLSCSUB=`$NM $NMFLAGS conftest.o | awk ' - /SUB_/{print "SUB_";exit} - /SUB/ {print "SUB"; exit} - /sub_/{print "sub_";exit} - /sub/ {print "sub"; exit}'` - case "$FCALLSCSUB" in - '') AC_MSG_ERROR(not found) - ;; - *) AC_MSG_RESULT($FCALLSCSUB) - ;; - esac - else - AC_MSG_ERROR(Could not compile conftest.f) - fi - rm -f conftest* - ;; - esac -]) - - -dnl Check for a C type equivalent to a Fortran type. -dnl -dnl UD_CHECK_CTYPE_FORTRAN(ftype, ctypes, fmacro_root) -dnl -AC_DEFUN([UD_CHECK_CTYPE_FORTRAN], -[ - cat >conftestf.f <conftest.c </dev/null || echo dummy_system` - FTPBINDIR=${FTPDIR-/home/ftp}/pub/binary/$system - ;; - esac - AC_SUBST(FTPBINDIR)dnl - AC_MSG_RESULT($FTPBINDIR) -]) - - -dnl -dnl -dnl - -dnl -dnl These headers won't get C style comments -dnl -dnl UD_CONFIG_HEADER(HEADER-TO-CREATE ...) -AC_DEFUN([UD_CONFIG_HEADER], -[define(UD_LIST_HEADER, $1)]) - dnl dnl Print which compilers are going to be used, the flags, and their @@ -616,139 +123,6 @@ fi ]) -# AC_PROG_FC_MOD -# --------------- -AC_DEFUN([AC_PROG_FC_UPPERCASE_MOD], -[ -AC_LANG_PUSH(Fortran) -AC_MSG_CHECKING([if Fortran 90 compiler capitalizes .mod filenames]) - cat <conftest.f90 - module conftest - end module conftest -EOF -ac_try='$F90 ${F90FLAGS} conftest.f90 ${F90LIBS}>&AS_MESSAGE_LOG_FD' -AC_TRY_EVAL(ac_try) -if test -f CONFTEST.mod ; then - ac_cv_prog_f90_uppercase_mod=yes - rm -f CONFTEST.mod -else - ac_cv_prog_f90_uppercase_mod=no -fi -AC_MSG_RESULT($ac_cv_prog_f90_uppercase_mod) -#rm -f conftest* -AC_LANG_POP(Fortran) -]) - -# [AC_LANG_CONFTEST([AC_LANG_SOURCE([ module conftest -# end module])]) -# ac_try='$F90 -o conftest ${F90FLAGS} conftest.f90 ${F90LIBS}>&AS_MESSAGE_LOG_FD' -# if AC_TRY_EVAL(ac_try) && -# test -f CONFTEST.mod ; then -# ac_cv_prog_f90_uppercase_mod=yes -# rm -f CONFTEST.mod -# else -# ac_cv_prog_f90_uppercase_mod=no -# fi -# rm -f conftest* - - -AC_DEFUN([AX_F90_MODULE_FLAG],[ -AC_CACHE_CHECK([fortran 90 modules inclusion flag], -ax_cv_f90_modflag, -[AC_LANG_PUSH(Fortran) -i=0 -while test \( -f tmpdir_$i \) -o \( -d tmpdir_$i \) ; do - i=`expr $i + 1` -done -mkdir tmpdir_$i -cd tmpdir_$i -AC_COMPILE_IFELSE([AC_LANG_SOURCE([module conftest_module - contains - subroutine conftest_routine - write(*,'(a)') 'gotcha!' - end subroutine conftest_routine - end module conftest_module]) - ],[],[]) -cd .. -ax_cv_f90_modflag="not found" -for ax_flag in "-I" "-M" "-p"; do - if test "$ax_cv_f90_modflag" = "not found" ; then - ax_save_FCFLAGS="$FCFLAGS" - FCFLAGS="$ax_save_FCFLAGS ${ax_flag}tmpdir_$i" - AC_COMPILE_IFELSE([AC_LANG_SOURCE([program conftest_program - use conftest_module - call conftest_routine - end program conftest_program]) - ],[ax_cv_f90_modflag="$ax_flag"],[]) - FCFLAGS="$ax_save_FCFLAGS" - fi -done -rm -fr tmpdir_$i -if test "$ax_flag" = "not found" ; then - AC_MSG_ERROR([unable to find compiler flag for modules inclusion]) -fi -AC_LANG_POP(Fortran) -])]) - -# AX_C_FLOAT_WORDS_BIGENDIAN -# added by: -# Warren Turkal -# -# Copyright © 2006 Daniel Amelang -# -# Copying and distribution of this file, with or without modification, are -# permitted in any medium without royalty provided the copyright notice and -# this notice are preserved. -# -# This macro will detect if double variables are words packed in big endian -# order while the bits in the words are arranged in little endian order. This -# macro was added to support the ARM architecture. The FLOAT_WORDS_BIGENDIAN -# macro will be set to 1 if the word order is big endian. If the word order is -# not big endian, FLOAT_WORDS_BIGENDIAN will be not be set. -AC_DEFUN([AX_C_FLOAT_WORDS_BIGENDIAN], - [AC_CACHE_CHECK(whether float word ordering is bigendian, - ax_cv_c_float_words_bigendian, [ - -ax_cv_c_float_words_bigendian=unknown -AC_COMPILE_IFELSE([AC_LANG_SOURCE([[ - -double d = 90904234967036810337470478905505011476211692735615632014797120844053488865816695273723469097858056257517020191247487429516932130503560650002327564517570778480236724525140520121371739201496540132640109977779420565776568942592.0; - -]])], [ - -if grep noonsees conftest.$ac_objext >/dev/null ; then - ax_cv_c_float_words_bigendian=yes -fi -if grep seesnoon conftest.$ac_objext >/dev/null ; then - if test "$ax_cv_c_float_words_bigendian" = unknown; then - ax_cv_c_float_words_bigendian=no - else - ax_cv_c_float_words_bigendian=unknown - fi -fi - -])]) - -case $ax_cv_c_float_words_bigendian in - yes) - m4_default([$1], - [AC_DEFINE([FLOAT_WORDS_BIGENDIAN], 1, - [Define to 1 if your system stores words within floats - with the most significant word first])]) ;; - no) - $2 ;; - *) - m4_default([$3], - [AC_MSG_ERROR([ - -Unknown float word ordering. You need to manually preset -ax_cv_c_float_words_bigendian=no (or yes) according to your system. - - ])]) ;; -esac - -])# AX_C_FLOAT_WORDS_BIGENDIAN - dnl Find the full path of a header file dnl dnl UD_CHECK_HEADER_PATH(file, [action-if-found], [action-if-not-found]) diff --git a/nctest/README b/nctest/README deleted file mode 100644 index 340fcb1d7..000000000 --- a/nctest/README +++ /dev/null @@ -1,44 +0,0 @@ -This directory contains source code for nctest, an extensive test -program for the entire netCDF library. Before compiling the sources in -this directory, you must have already made the netCDF library from the -../src directory. - -For UNIX, just type "make". Then, when "nctest" is successfully made, -invoke it with "nctest". - -For VMS, type "@make". The make.com, make.opt, and *-vms files are for -VMS only. When nctest.exe is successfully made, invoke it with "run -nctest". - -Output from the test program should look like the following: ---- Testing nccreate ... ---- Testing ncopen ... ---- Testing ncredef ... ---- Testing ncendef ... ---- Testing ncclose ... ---- Testing ncinquire ... ---- Testing ncsync ... ---- Testing ncabort ... ---- Testing ncdimdef ... ---- Testing ncdimid ... ---- Testing ncdiminq ... ---- Testing ncdimrename ... ---- Testing ncvardef ... ---- Testing ncvarid ... ---- Testing ncvarinq ... ---- Testing ncvarput1 ... ---- Testing ncvarget1 ... ---- Testing ncvarput ... ---- Testing ncvarget ... ---- Testing ncvarrename ... ---- Testing ncattput ... ---- Testing ncattinq ... ---- Testing ncattget ... ---- Testing ncattcopy ... ---- Testing ncattname ... ---- Testing ncattrename ... ---- Testing ncattdel ... ---- Testing nctypelen ... -except that on VMS systems, the line "Doesn't support shared access on -vms" will appear a couple of times after the "ncopen" and "ncsync" -tests. diff --git a/test_prog.F b/test_prog.F deleted file mode 100644 index 82605ec38..000000000 --- a/test_prog.F +++ /dev/null @@ -1,10 +0,0 @@ -C This is part of Unidata's netCDF package. Copyright 2009. -C This is a test program for the nc-config utility. - - program test_prog - implicit none -#include "netcdf.inc" - print *, 'NetCDF version: ', nf_inq_libvers() - print *, '*** SUCCESS!' - end - diff --git a/test_prog.f90 b/test_prog.f90 deleted file mode 100644 index 3fd587926..000000000 --- a/test_prog.f90 +++ /dev/null @@ -1,12 +0,0 @@ -! This is part of Unidata's netCDF package. Copyright 2009. -! This is a test program for the nc-config utility. - -program test_prog - use typeSizes - use netcdf - implicit none - - print *, 'NetCDF version: ', nf90_inq_libvers() - print *, '*** SUCCESS!' -end program test_prog -