changeset 1977:5aabff2737ca

Autoconfiscation
author bert <bert>
date Wed, 16 Feb 2005 19:22:31 +0000
parents fa93a26d1892
children 3063a1d19275
files conversion/Acr_nema/AUTHORS conversion/Acr_nema/COPYING conversion/Acr_nema/ChangeLog conversion/Acr_nema/INSTALL conversion/Acr_nema/Makefile.am conversion/Acr_nema/NEWS conversion/Acr_nema/README conversion/Acr_nema/acr_nema.h conversion/Acr_nema/autogen.sh conversion/Acr_nema/configure.ac conversion/Acr_nema/dicom_client_routines.c conversion/Acr_nema/file_io.c
diffstat 12 files changed, 358 insertions(+), 14 deletions(-) [+]
line wrap: on
line diff
new file mode 100644
--- /dev/null
+++ b/conversion/Acr_nema/AUTHORS
@@ -0,0 +1,1 @@
+Peter Neelin
new file mode 100644
--- /dev/null
+++ b/conversion/Acr_nema/COPYING
@@ -0,0 +1,7 @@
+Copyright 1993-2005 Peter Neelin, McConnell Brain Imaging Centre,
+Montreal Neurological Institute, McGill University.  Permission to use,
+copy, modify, and distribute this software and its documentation for any
+purpose and without fee is hereby granted, provided that the above
+copyright notice appear in all copies.  The author and McGill University
+make no representations about the suitability of this software for any
+purpose.  It is provided "as is" without express or implied warranty.
new file mode 100644
new file mode 100644
--- /dev/null
+++ b/conversion/Acr_nema/INSTALL
@@ -0,0 +1,229 @@
+Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002 Free Software
+Foundation, Inc.
+
+   This file is free documentation; the Free Software Foundation gives
+unlimited permission to copy, distribute and modify it.
+
+Basic Installation
+==================
+
+   These are generic installation instructions.
+
+   The `configure' shell script attempts to guess correct values for
+various system-dependent variables used during compilation.  It uses
+those values to create a `Makefile' in each directory of the package.
+It may also create one or more `.h' files containing system-dependent
+definitions.  Finally, it creates a shell script `config.status' that
+you can run in the future to recreate the current configuration, and a
+file `config.log' containing compiler output (useful mainly for
+debugging `configure').
+
+   It can also use an optional file (typically called `config.cache'
+and enabled with `--cache-file=config.cache' or simply `-C') that saves
+the results of its tests to speed up reconfiguring.  (Caching is
+disabled by default to prevent problems with accidental use of stale
+cache files.)
+
+   If you need to do unusual things to compile the package, please try
+to figure out how `configure' could check whether to do them, and mail
+diffs or instructions to the address given in the `README' so they can
+be considered for the next release.  If you are using the cache, and at
+some point `config.cache' contains results you don't want to keep, you
+may remove or edit it.
+
+   The file `configure.ac' (or `configure.in') is used to create
+`configure' by a program called `autoconf'.  You only need
+`configure.ac' if you want to change it or regenerate `configure' using
+a newer version of `autoconf'.
+
+The simplest way to compile this package is:
+
+  1. `cd' to the directory containing the package's source code and type
+     `./configure' to configure the package for your system.  If you're
+     using `csh' on an old version of System V, you might need to type
+     `sh ./configure' instead to prevent `csh' from trying to execute
+     `configure' itself.
+
+     Running `configure' takes awhile.  While running, it prints some
+     messages telling which features it is checking for.
+
+  2. Type `make' to compile the package.
+
+  3. Optionally, type `make check' to run any self-tests that come with
+     the package.
+
+  4. Type `make install' to install the programs and any data files and
+     documentation.
+
+  5. You can remove the program binaries and object files from the
+     source code directory by typing `make clean'.  To also remove the
+     files that `configure' created (so you can compile the package for
+     a different kind of computer), type `make distclean'.  There is
+     also a `make maintainer-clean' target, but that is intended mainly
+     for the package's developers.  If you use it, you may have to get
+     all sorts of other programs in order to regenerate files that came
+     with the distribution.
+
+Compilers and Options
+=====================
+
+   Some systems require unusual options for compilation or linking that
+the `configure' script does not know about.  Run `./configure --help'
+for details on some of the pertinent environment variables.
+
+   You can give `configure' initial values for configuration parameters
+by setting variables in the command line or in the environment.  Here
+is an example:
+
+     ./configure CC=c89 CFLAGS=-O2 LIBS=-lposix
+
+   *Note Defining Variables::, for more details.
+
+Compiling For Multiple Architectures
+====================================
+
+   You can compile the package for more than one kind of computer at the
+same time, by placing the object files for each architecture in their
+own directory.  To do this, you must use a version of `make' that
+supports the `VPATH' variable, such as GNU `make'.  `cd' to the
+directory where you want the object files and executables to go and run
+the `configure' script.  `configure' automatically checks for the
+source code in the directory that `configure' is in and in `..'.
+
+   If you have to use a `make' that does not support the `VPATH'
+variable, you have to compile the package for one architecture at a
+time in the source code directory.  After you have installed the
+package for one architecture, use `make distclean' before reconfiguring
+for another architecture.
+
+Installation Names
+==================
+
+   By default, `make install' will install the package's files in
+`/usr/local/bin', `/usr/local/man', etc.  You can specify an
+installation prefix other than `/usr/local' by giving `configure' the
+option `--prefix=PATH'.
+
+   You can specify separate installation prefixes for
+architecture-specific files and architecture-independent files.  If you
+give `configure' the option `--exec-prefix=PATH', the package will use
+PATH as the prefix for installing programs and libraries.
+Documentation and other data files will still use the regular prefix.
+
+   In addition, if you use an unusual directory layout you can give
+options like `--bindir=PATH' to specify different values for particular
+kinds of files.  Run `configure --help' for a list of the directories
+you can set and what kinds of files go in them.
+
+   If the package supports it, you can cause programs to be installed
+with an extra prefix or suffix on their names by giving `configure' the
+option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'.
+
+Optional Features
+=================
+
+   Some packages pay attention to `--enable-FEATURE' options to
+`configure', where FEATURE indicates an optional part of the package.
+They may also pay attention to `--with-PACKAGE' options, where PACKAGE
+is something like `gnu-as' or `x' (for the X Window System).  The
+`README' should mention any `--enable-' and `--with-' options that the
+package recognizes.
+
+   For packages that use the X Window System, `configure' can usually
+find the X include and library files automatically, but if it doesn't,
+you can use the `configure' options `--x-includes=DIR' and
+`--x-libraries=DIR' to specify their locations.
+
+Specifying the System Type
+==========================
+
+   There may be some features `configure' cannot figure out
+automatically, but needs to determine by the type of machine the package
+will run on.  Usually, assuming the package is built to be run on the
+_same_ architectures, `configure' can figure that out, but if it prints
+a message saying it cannot guess the machine type, give it the
+`--build=TYPE' option.  TYPE can either be a short name for the system
+type, such as `sun4', or a canonical name which has the form:
+
+     CPU-COMPANY-SYSTEM
+
+where SYSTEM can have one of these forms:
+
+     OS KERNEL-OS
+
+   See the file `config.sub' for the possible values of each field.  If
+`config.sub' isn't included in this package, then this package doesn't
+need to know the machine type.
+
+   If you are _building_ compiler tools for cross-compiling, you should
+use the `--target=TYPE' option to select the type of system they will
+produce code for.
+
+   If you want to _use_ a cross compiler, that generates code for a
+platform different from the build platform, you should specify the
+"host" platform (i.e., that on which the generated programs will
+eventually be run) with `--host=TYPE'.
+
+Sharing Defaults
+================
+
+   If you want to set default values for `configure' scripts to share,
+you can create a site shell script called `config.site' that gives
+default values for variables like `CC', `cache_file', and `prefix'.
+`configure' looks for `PREFIX/share/config.site' if it exists, then
+`PREFIX/etc/config.site' if it exists.  Or, you can set the
+`CONFIG_SITE' environment variable to the location of the site script.
+A warning: not all `configure' scripts look for a site script.
+
+Defining Variables
+==================
+
+   Variables not defined in a site shell script can be set in the
+environment passed to `configure'.  However, some packages may run
+configure again during the build, and the customized values of these
+variables may be lost.  In order to avoid this problem, you should set
+them in the `configure' command line, using `VAR=value'.  For example:
+
+     ./configure CC=/usr/local2/bin/gcc
+
+will cause the specified gcc to be used as the C compiler (unless it is
+overridden in the site shell script).
+
+`configure' Invocation
+======================
+
+   `configure' recognizes the following options to control how it
+operates.
+
+`--help'
+`-h'
+     Print a summary of the options to `configure', and exit.
+
+`--version'
+`-V'
+     Print the version of Autoconf used to generate the `configure'
+     script, and exit.
+
+`--cache-file=FILE'
+     Enable the cache: use and save the results of the tests in FILE,
+     traditionally `config.cache'.  FILE defaults to `/dev/null' to
+     disable caching.
+
+`--config-cache'
+`-C'
+     Alias for `--cache-file=config.cache'.
+
+`--quiet'
+`--silent'
+`-q'
+     Do not print messages saying which checks are being made.  To
+     suppress all normal output, redirect it to `/dev/null' (any error
+     messages will still be shown).
+
+`--srcdir=DIR'
+     Look for the package's source code in directory DIR.  Usually
+     `configure' can determine that directory automatically.
+
+`configure' also accepts some other, not widely useful, options.  Run
+`configure --help' for more details.
+
new file mode 100644
--- /dev/null
+++ b/conversion/Acr_nema/Makefile.am
@@ -0,0 +1,53 @@
+AUTOMAKE_OPTIONS = check-news
+
+include_HEADERS = \
+	acr_nema.h \
+	acr_nema/acr_io.h \
+	acr_nema/dicom_client_routines.h \
+	acr_nema/dicom_network.h \
+	acr_nema/element.h \
+	acr_nema/file_io.h \
+	acr_nema/group.h \
+	acr_nema/message.h \
+	acr_nema/value_repr.h
+
+# Libraries which must be built and installed.
+#
+lib_LTLIBRARIES = libacr_nema.la
+
+bin_PROGRAMS = \
+	acr_test \
+	dump_acr_nema \
+	extract_acr_nema \
+	read_acr_nema \
+	dicom_test \
+	copy_acr_nema
+
+noinst_PROGRAMS = \
+	sample_dicom_client
+
+LDADD = libacr_nema.la
+
+acr_test_SOURCES = acr_test.c
+
+dump_acr_nema_SOURCES = dump_acr_nema.c
+
+extract_acr_nema_SOURCES = extract_acr_nema.c
+
+read_acr_nema_SOURCES = read_acr_nema.c
+
+dicom_test_SOURCES = dicom_test.c
+
+copy_acr_nema_SOURCES = copy_acr_nema.c
+
+libacr_nema_la_LDFLAGS = -version-info 1:0:1
+libacr_nema_la_SOURCES = \
+	acr_io.c \
+	dicom_client_routines.c \
+	dicom_network.c \
+	element.c \
+	file_io.c \
+	globals.c \
+	group.c \
+	message.c \
+	value_repr.c
new file mode 100644
--- /dev/null
+++ b/conversion/Acr_nema/NEWS
@@ -0,0 +1,2 @@
+New in version 1.0
+* autoconfiscation
new file mode 100644
--- a/conversion/Acr_nema/acr_nema.h
+++ b/conversion/Acr_nema/acr_nema.h
@@ -6,7 +6,10 @@
 @CREATED    : November 10, 1993 (Peter Neelin)
 @MODIFIED   : 
  * $Log: acr_nema.h,v $
- * Revision 6.2  2004-10-29 13:08:41  rotor
+ * Revision 6.3  2005-02-16 19:22:32  bert
+ * Autoconfiscation
+ *
+ * Revision 6.2  2004/10/29 13:08:41  rotor
  *  * rewrote Makefile with no dependency on a minc distribution
  *  * removed all references to the abominable minc_def.h
  *  * I should autoconf this really, but this is old code that
@@ -81,14 +84,14 @@
 #endif
 
 /* Include files */
-#include <file_io.h>
-#include <acr_io.h>
-#include <value_repr.h>
-#include <element.h>
-#include <group.h>
-#include <message.h>
-#include <dicom_network.h>
-#include <dicom_client_routines.h>
+#include <acr_nema/file_io.h>
+#include <acr_nema/acr_io.h>
+#include <acr_nema/value_repr.h>
+#include <acr_nema/element.h>
+#include <acr_nema/group.h>
+#include <acr_nema/message.h>
+#include <acr_nema/dicom_network.h>
+#include <acr_nema/dicom_client_routines.h>
 
 /* these are pinched from minc_def.h */
 #define MALLOC(size) ((void *) malloc(size))
new file mode 100755
--- /dev/null
+++ b/conversion/Acr_nema/autogen.sh
@@ -0,0 +1,20 @@
+#! /bin/sh
+
+cat <<EOF
+Messages of the following type may be safely ignored.
+Any other diagnostics may be a sign of trouble.  
+Let us know if something goes wrong.
+
+    automake: configure.in: installing [...]
+    warning: AC_TRY_RUN called without default to allow cross compiling
+
+
+
+EOF
+
+aclocal
+autoheader
+libtoolize --automake
+automake --add-missing
+autoconf
+
new file mode 100644
--- /dev/null
+++ b/conversion/Acr_nema/configure.ac
@@ -0,0 +1,24 @@
+AC_INIT
+AC_CONFIG_SRCDIR([./acr_nema.h])
+AC_CONFIG_AUX_DIR(ac_config_aux)
+AM_INIT_AUTOMAKE(acr_nema, 1.0)
+AC_CONFIG_HEADERS([config.h])
+
+AC_REVISION($Revision: 6.1 $)
+
+AC_PROG_INSTALL
+AC_PROG_LN_S
+AC_PROG_MAKE_SET
+
+AM_PROG_CC_C_O
+AC_PROG_RANLIB
+
+AC_DISABLE_SHARED
+AC_PROG_LIBTOOL
+
+AC_CONFIG_FILES([
+Makefile 
+])
+AC_OUTPUT
+
+
--- a/conversion/Acr_nema/dicom_client_routines.c
+++ b/conversion/Acr_nema/dicom_client_routines.c
@@ -6,7 +6,10 @@
 @CREATED    : May 6, 1997 (Peter Neelin)
 @MODIFIED   : 
  * $Log: dicom_client_routines.c,v $
- * Revision 6.20  2004-10-29 13:08:41  rotor
+ * Revision 6.21  2005-02-16 19:22:32  bert
+ * Autoconfiscation
+ *
+ * Revision 6.20  2004/10/29 13:08:41  rotor
  *  * rewrote Makefile with no dependency on a minc distribution
  *  * removed all references to the abominable minc_def.h
  *  * I should autoconf this really, but this is old code that
@@ -116,7 +119,7 @@
 ---------------------------------------------------------------------------- */
 
 #ifndef lint
-static char rcsid[]="$Header: /private-cvsroot/minc/conversion/Acr_nema/dicom_client_routines.c,v 6.20 2004-10-29 13:08:41 rotor Exp $";
+static char rcsid[]="$Header: /private-cvsroot/minc/conversion/Acr_nema/dicom_client_routines.c,v 6.21 2005-02-16 19:22:32 bert Exp $";
 #endif
 
 #include <stdio.h>
@@ -138,7 +141,6 @@
 #include <ctype.h>
 #include <time.h>
 #include <acr_nema.h>
-#include <dicom_network.h>
 
 /* Constants */
 #ifndef public
--- a/conversion/Acr_nema/file_io.c
+++ b/conversion/Acr_nema/file_io.c
@@ -6,7 +6,10 @@
 @CREATED    : November 9, 1993 (Peter Neelin)
 @MODIFIED   : 
  * $Log: file_io.c,v $
- * Revision 6.5  2004-10-29 13:08:41  rotor
+ * Revision 6.6  2005-02-16 19:22:32  bert
+ * Autoconfiscation
+ *
+ * Revision 6.5  2004/10/29 13:08:41  rotor
  *  * rewrote Makefile with no dependency on a minc distribution
  *  * removed all references to the abominable minc_def.h
  *  * I should autoconf this really, but this is old code that
@@ -94,7 +97,7 @@
 #include <unistd.h>
 #include <errno.h>
 #include <limits.h>
-#include <file_io.h>
+#include <acr_nema/file_io.h>
 
 /* these are pinched from minc_def.h */
 #define MALLOC(size) ((void *) malloc(size))