Imported Upstream version 6.3.0.20121001

parent 7741db32
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
......@@ -43,30 +43,13 @@ fortran/cmtzlib_f.c fortran/library_f.c \
fortran/ccplib.f fortran/fftlib.f fortran/modlib.f fortran/parser.f \
fortran/rwbrook.f fortran/libhtml.f fortran/keyparse.f \
fortran/dna_output.f fortran/pack_f.f fortran/pxxml.f fortran/lgglib.f \
fortran/plot84lib.f fortran/plotsubs.f \
fortran/cciflib.fh fortran/dna_header.fh \
fortran/harderiv.inc fortran/harsymm.inc \
fortran/harshell.inc fortran/harvest.inc
# there are two implementations of SRTBEG/SRTRLS/SRTMRG/SRTRET functions
# the sorting_main.f is probably better, but needs to be reviewed and tested
# before we switch to it on all platforms.
if HAVE_FORK
fortran_libccp4f_la_SOURCES += fortran/binsortint.c fortran/binsort.h
else
fortran_libccp4f_la_SOURCES += fortran/sorting_main.f
endif
fortran/plot84lib.f fortran/plotsubs.f fortran/sorting_main.f \
fortran/dna_header.fh
nodist_fortran_libccp4f_la_SOURCES = fortran/unix.f
fortran_libccp4f_la_CPPFLAGS = -I$(srcdir)/ccp4
fortran_libccp4f_la_LIBADD = ccp4/libccp4c.la -lmmdb
if CCIF_API
fortran_libccp4f_la_SOURCES += fortran/harvlib.f fortran/cciflib.f
fortran_libccp4f_la_LIBADD += -lccif
else
fortran_libccp4f_la_SOURCES += fortran/harv_dummy.f
endif
BUILT_SOURCES = fortran/unix.f
CLEANFILES = fortran/unix.f
......@@ -76,28 +59,16 @@ fortran/unix.f: fortran/unix.m4 Makefile
ccp4_libccp4c_la_LDFLAGS = -no-undefined
fortran_libccp4f_la_LDFLAGS = -no-undefined
dist_data_DATA = data/atomsf_neutron.lib data/atomsf.lib \
data/syminfo.lib data/symop.lib
# Files default.def and environ.def are not part of libccp4.
# They are included in CCP4 and may be useful for running programs
# compiled with libccp4 (see http://www.ccp4.ac.uk/dist/html/ccp4.html
# for details)
# They are included in CCP4 and may be needed for running programs
# compiled with libccp4 (see http://www.ccp4.ac.uk/dist/html/ccp4.html)
dist_ccp4data_DATA = ccp4-config.cmake data/atomsf_neutron.lib \
data/atomsf.lib data/syminfo.lib data/symop.lib
if FORTRAN_LIB
ccp4data_DATA = data/font84.dat
noinst_PROGRAMS = data/fontpack
data_fontpack_SOURCES = data/fontpack.f
data_fontpack_LDADD = fortran/libccp4f.la
dist_noinst_DATA = data/font84.ascii
CLEANFILES += data/font84.dat
dist_ccp4data_DATA += data/font84.ascii
endif
data/font84.dat: data/font84.ascii data/fontpack$(EXEEXT)
rm -f $@
[ -e data/font84.ascii ] || copy_font84_ascii=true; \
$${copy_font84_ascii:=false} && cp $< data/; \
( cd data/ && ./fontpack$(EXEEXT) ) && \
( $$copy_font84_ascii && rm -f data/font84.ascii ||: )
# FIXME: all files but the first are unused now, should they be distributed?
EXTRA_DIST = fortran/unix.m4 \
......@@ -105,3 +76,7 @@ ccp4/w32mvs.c ccp4/vmslibrary.c \
fortran/vmsdiskio.for fortran/vms.for \
fortran/testlib.f fortran/mthlib.for fortran/w32mvs.f
# Clean up Fortran modules.
clean-local: clean-modules
clean-modules:
$(RM) *.mod
This diff is collapsed.
This diff is collapsed.
# libtool (GNU libtool) 2.4
# libtool (GNU libtool) 2.4.2
# Written by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006,
# 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
# 2007, 2008, 2009, 2010, 2011 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.
......@@ -41,6 +41,7 @@
# --quiet, --silent don't print informational messages
# --no-quiet, --no-silent
# print informational messages (default)
# --no-warn don't display warning messages
# --tag=TAG use configuration variables from tag TAG
# -v, --verbose print more informational messages than default
# --no-verbose don't print the extra informational messages
......@@ -69,7 +70,7 @@
# compiler: $LTCC
# compiler flags: $LTCFLAGS
# linker: $LD (gnu? $with_gnu_ld)
# $progname: (GNU libtool) 2.4
# $progname: (GNU libtool) 2.4.2
# automake: $automake_version
# autoconf: $autoconf_version
#
......@@ -79,9 +80,9 @@
PROGRAM=libtool
PACKAGE=libtool
VERSION=2.4
VERSION=2.4.2
TIMESTAMP=""
package_revision=1.3293
package_revision=1.3337
# Be Bourne compatible
if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
......@@ -136,15 +137,10 @@ progpath="$0"
: ${CP="cp -f"}
test "${ECHO+set}" = set || ECHO=${as_echo-'printf %s\n'}
: ${EGREP="/bin/grep -E"}
: ${FGREP="/bin/grep -F"}
: ${GREP="/bin/grep"}
: ${LN_S="ln -s"}
: ${MAKE="make"}
: ${MKDIR="mkdir"}
: ${MV="mv -f"}
: ${RM="rm -f"}
: ${SED="/bin/sed"}
: ${SHELL="${CONFIG_SHELL-/bin/sh}"}
: ${Xsed="$SED -e 1s/^X//"}
......@@ -387,7 +383,7 @@ case $progpath in
;;
*)
save_IFS="$IFS"
IFS=:
IFS=${PATH_SEPARATOR-:}
for progdir in $PATH; do
IFS="$save_IFS"
test -x "$progdir/$progname" && break
......@@ -771,8 +767,8 @@ func_help ()
s*\$LTCFLAGS*'"$LTCFLAGS"'*
s*\$LD*'"$LD"'*
s/\$with_gnu_ld/'"$with_gnu_ld"'/
s/\$automake_version/'"`(automake --version) 2>/dev/null |$SED 1q`"'/
s/\$autoconf_version/'"`(autoconf --version) 2>/dev/null |$SED 1q`"'/
s/\$automake_version/'"`(${AUTOMAKE-automake} --version) 2>/dev/null |$SED 1q`"'/
s/\$autoconf_version/'"`(${AUTOCONF-autoconf} --version) 2>/dev/null |$SED 1q`"'/
p
d
}
......@@ -1052,6 +1048,7 @@ opt_finish=false
opt_help=false
opt_help_all=false
opt_silent=:
opt_warning=:
opt_verbose=:
opt_silent=false
opt_verbose=false
......@@ -1118,6 +1115,10 @@ esac
;;
--no-silent|--no-quiet)
opt_silent=false
func_append preserve_args " $opt"
;;
--no-warning|--no-warn)
opt_warning=false
func_append preserve_args " $opt"
;;
--no-verbose)
......@@ -2059,7 +2060,7 @@ func_mode_compile ()
*.[cCFSifmso] | \
*.ada | *.adb | *.ads | *.asm | \
*.c++ | *.cc | *.ii | *.class | *.cpp | *.cxx | \
*.[fF][09]? | *.for | *.java | *.obj | *.sx | *.cu | *.cup)
*.[fF][09]? | *.for | *.java | *.go | *.obj | *.sx | *.cu | *.cup)
func_xform "$libobj"
libobj=$func_xform_result
;;
......@@ -3201,11 +3202,13 @@ func_mode_install ()
# Set up the ranlib parameters.
oldlib="$destdir/$name"
func_to_tool_file "$oldlib" func_convert_file_msys_to_w32
tool_oldlib=$func_to_tool_file_result
func_show_eval "$install_prog \$file \$oldlib" 'exit $?'
if test -n "$stripme" && test -n "$old_striplib"; then
func_show_eval "$old_striplib $oldlib" 'exit $?'
func_show_eval "$old_striplib $tool_oldlib" 'exit $?'
fi
# Do each command in the postinstall commands.
......@@ -3470,7 +3473,7 @@ static const void *lt_preloaded_setup() {
# linked before any other PIC object. But we must not use
# pic_flag when linking with -static. The problem exists in
# FreeBSD 2.2.6 and is fixed in FreeBSD 3.1.
*-*-freebsd2*|*-*-freebsd3.0*|*-*-freebsdelf3.0*)
*-*-freebsd2.*|*-*-freebsd3.0*|*-*-freebsdelf3.0*)
pic_flag_for_symtable=" $pic_flag -DFREEBSD_WORKAROUND" ;;
*-*-hpux*)
pic_flag_for_symtable=" $pic_flag" ;;
......@@ -3982,14 +3985,17 @@ func_exec_program_core ()
# launches target application with the remaining arguments.
func_exec_program ()
{
for lt_wr_arg
do
case \$lt_wr_arg in
--lt-*) ;;
*) set x \"\$@\" \"\$lt_wr_arg\"; shift;;
esac
shift
done
case \" \$* \" in
*\\ --lt-*)
for lt_wr_arg
do
case \$lt_wr_arg in
--lt-*) ;;
*) set x \"\$@\" \"\$lt_wr_arg\"; shift;;
esac
shift
done ;;
esac
func_exec_program_core \${1+\"\$@\"}
}
......@@ -5057,9 +5063,15 @@ void lt_dump_script (FILE* f)
{
EOF
func_emit_wrapper yes |
$SED -e 's/\([\\"]\)/\\\1/g' \
-e 's/^/ fputs ("/' -e 's/$/\\n", f);/'
$SED -n -e '
s/^\(.\{79\}\)\(..*\)/\1\
\2/
h
s/\([\\"]\)/\\\1/g
s/$/\\n/
s/\([^\n]*\).*/ fputs ("\1", f);/p
g
D'
cat <<"EOF"
}
EOF
......@@ -5643,7 +5655,8 @@ func_mode_link ()
continue
;;
-mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads)
-mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe \
|-threads|-fopenmp|-openmp|-mp|-xopenmp|-omp|-qsmp=*)
func_append compiler_flags " $arg"
func_append compile_command " $arg"
func_append finalize_command " $arg"
......@@ -6147,7 +6160,8 @@ func_mode_link ()
lib=
found=no
case $deplib in
-mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads)
-mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe \
|-threads|-fopenmp|-openmp|-mp|-xopenmp|-omp|-qsmp=*)
if test "$linkmode,$pass" = "prog,link"; then
compile_deplibs="$deplib $compile_deplibs"
finalize_deplibs="$deplib $finalize_deplibs"
......@@ -6831,7 +6845,7 @@ func_mode_link ()
test "$hardcode_direct_absolute" = no; then
add="$dir/$linklib"
elif test "$hardcode_minus_L" = yes; then
add_dir="-L$dir"
add_dir="-L$absdir"
# Try looking first in the location we're being installed to.
if test -n "$inst_prefix_dir"; then
case $libdir in
......@@ -7316,6 +7330,7 @@ func_mode_link ()
# which has an extra 1 added just for fun
#
case $version_type in
# correct linux to gnu/linux during the next big refactor
darwin|linux|osf|windows|none)
func_arith $number_major + $number_minor
current=$func_arith_result
......@@ -7432,7 +7447,7 @@ func_mode_link ()
versuffix="$major.$revision"
;;
linux)
linux) # correct to gnu/linux during the next big refactor
func_arith $current - $age
major=.$func_arith_result
versuffix="$major.$age.$revision"
......@@ -8020,6 +8035,11 @@ EOF
# Test again, we may have decided not to build it any more
if test "$build_libtool_libs" = yes; then
# Remove ${wl} instances when linking with ld.
# FIXME: should test the right _cmds variable.
case $archive_cmds in
*\$LD\ *) wl= ;;
esac
if test "$hardcode_into_libs" = yes; then
# Hardcode the library paths
hardcode_libdirs=
......@@ -8050,7 +8070,7 @@ EOF
elif test -n "$runpath_var"; then
case "$perm_rpath " in
*" $libdir "*) ;;
*) func_apped perm_rpath " $libdir" ;;
*) func_append perm_rpath " $libdir" ;;
esac
fi
done
......@@ -8058,11 +8078,7 @@ EOF
if test -n "$hardcode_libdir_separator" &&
test -n "$hardcode_libdirs"; then
libdir="$hardcode_libdirs"
if test -n "$hardcode_libdir_flag_spec_ld"; then
eval dep_rpath=\"$hardcode_libdir_flag_spec_ld\"
else
eval dep_rpath=\"$hardcode_libdir_flag_spec\"
fi
eval "dep_rpath=\"$hardcode_libdir_flag_spec\""
fi
if test -n "$runpath_var" && test -n "$perm_rpath"; then
# We should set the runpath_var.
......@@ -9152,6 +9168,8 @@ EOF
esac
done
fi
func_to_tool_file "$oldlib" func_convert_file_msys_to_w32
tool_oldlib=$func_to_tool_file_result
eval cmds=\"$old_archive_cmds\"
func_len " $cmds"
......@@ -9261,7 +9279,8 @@ EOF
*.la)
func_basename "$deplib"
name="$func_basename_result"
eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
func_resolve_sysroot "$deplib"
eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $func_resolve_sysroot_result`
test -z "$libdir" && \
func_fatal_error "\`$deplib' is not a valid libtool archive"
func_append newdependency_libs " ${lt_sysroot:+=}$libdir/$name"
......
# - Find CCP4 libraries
# Find one or more of CCP4 libraries: ccp4c, ccp4f, mmdb, ccif,
# clipper-core, clipper-ccp4, clipper-contrib, clipper-minimol, clipper-mmdb.
#
# Once done this will define
# CCP4_INCLUDE_DIRS - all include directories
# <name>_LIBRARY - library, name is one of CCP4C, CCP4F, MMDB, CCIF, SSM,
# CLIPPER-CORE, CLIPPER-CCP4, CLIPPER-CONTRIB,
# CLIPPER-MINIMOL, CLIPPER-MMDB, CLIPPER-CIF,
# RFFTW2, FFTW2
# CCIF_LIBRARIES - CCIF_LIBRARY with (if needed) regex library
# CLIPPER-CORE_LIBRARIES - CLIPPER-CORE_LIBRARY with (if needed)
# fftw2 and thread library
# CCP4_LIBRARIES - all requested libraries with necessary dependencies
# <name>_FOUND - TRUE if library and header files are found.
#
# You need to name libraries that you will use as components:
# FIND_PACKAGE(CCP4 COMPONENTS mmdb ccp4c)
# or
# FIND_PACKAGE(CCP4 REQUIRED mmdb ccp4c)
#
# Checking for clipper-core sets also variables for FFTW2 library used
# by clipper: FFTW2_LIBRARY, RFFTW2_LIBRARY, FFTW2_INCLUDE_DIRS,
# and if fftw2 is prefixed with 's' FFTW2_DEFINITIONS=-DFFTW2_PREFIX_S.
#
# Sample usage:
# FIND_PACKAGE(CCP4 REQUIRED mmdb ccp4)
# INCLUDE_DIRECTORIES(${CCP4_INCLUDE_DIRS})
# TARGET_LINK_LIBRARIES(<YourTarget> ${CCP4_LIBRARIES})
if(NOT CCP4_FIND_COMPONENTS)
message(FATAL_ERROR "Please specify CCP4 libraries/components.")
endif()
include(FindPackageHandleStandardArgs)
include(CheckFunctionExists)
include(CheckCSourceCompiles)
include(CheckCXXSourceCompiles)
foreach(_component ${CCP4_FIND_COMPONENTS})
string(TOUPPER ${_component} _upper)
string(TOLOWER ${_component} _lower)
set(_lib_var "${_upper}_LIBRARY")
find_library(${_lib_var} NAMES ${_lower}
HINTS ${LIB_INSTALL_DIR}
PATHS $ENV{CLIB}
$ENV{CCP4}/lib
$ENV{CCP4}/lib64)
#message("DEBUG: ${_lib_var} (${_lower}) = ${${_upper}_LIBRARY}")
if (${_upper} STREQUAL "MMDB")
set(_header "mmdb/mmdb_defs.h")
elseif (${_upper} STREQUAL "CCP4C")
set(_header "ccp4/ccp4_general.h")
elseif (${_upper} STREQUAL "CCP4F")
# fortran library, no headers
set(_header)
elseif (${_upper} STREQUAL "CCIF")
set(_header "ccif/ccif_defines.h")
elseif (${_upper} STREQUAL "SSM")
set(_header "ssm/ss_vxedge.h")
elseif (${_upper} STREQUAL "CLIPPER-CORE")
find_package(Threads)
set(_header "clipper/clipper.h")
elseif (${_upper} STREQUAL "CLIPPER-CCP4")
set(_header "clipper/clipper-ccp4.h")
elseif (${_upper} STREQUAL "CLIPPER-CONTRIB")
set(_header "clipper/clipper-contrib.h")
elseif (${_upper} STREQUAL "CLIPPER-MINIMOL")
set(_header "clipper/clipper-minimol.h")
elseif (${_upper} STREQUAL "CLIPPER-MMDB")
set(_header "clipper/clipper-mmdb.h")
elseif (${_upper} STREQUAL "CLIPPER-CIF")
set(_header "clipper/clipper-cif.h")
else()
message(FATAL_ERROR "'${_component}' is not a valid CCP4 library.")
endif()
if (_header)
set(_incl_var "${_upper}_INCLUDE_DIR")
find_path(${_incl_var} ${_header}
PATHS $ENV{CINCL} $ENV{CCP4}/include)
message(STATUS "Looking for ${_header} - ${${_incl_var}}")
find_package_handle_standard_args(CCP4 DEFAULT_MSG
${_lib_var} ${_incl_var})
set(CCP4_INCLUDE_DIRS ${CCP4_INCLUDE_DIRS} ${${_incl_var}})
else()
find_package_handle_standard_args(CCP4 DEFAULT_MSG
${_lib_var})
endif()
# check if libccif needs -lregex
if (${_upper} STREQUAL "CCIF")
set(_CCIF_SRC "int main() {zzs_undump(0,0,0);}")
foreach (_REGEX_LIB "" regex)
message (STATUS "Trying _REGEX_LIB=${_REGEX_LIB}")
set(CMAKE_REQUIRED_LIBRARIES ${CCIF_LIBRARY} ${_REGEX_LIB} m)
set(_VAR _LINKING_WITH_CCIF_${_REGEX_LIB})
check_c_source_compiles("${_CCIF_SRC}" ${_VAR})
if (${_VAR})
set(CCIF_LIBRARIES ${CCIF_LIBRARY} ${_REGEX_LIB} m)
break()
endif()
endforeach()
if (NOT ${_VAR})
message(FATAL_ERROR "Linking with libccif failed.")
endif()
endif()
# check if clipper-core needs rfftw fftw
if (${_upper} STREQUAL "CLIPPER-CORE")
# first look for FFTW2 libs are available separately
find_library(FFTW2_LIBRARY NAMES sfftw fftw
HINTS ${LIB_INSTALL_DIR}
PATHS $ENV{CLIB} $ENV{CCP4}/lib $ENV{CCP4}/lib64)
message(STATUS "FFTW2 library - ${FFTW2_LIBRARY}")
if (${FFTW2_LIBRARY} MATCHES "sfftw")
find_library(RFFTW2_LIBRARY NAMES srfftw)
find_path(FFTW2_INCLUDE_DIRS srfftw.h)
set(FFTW2_DEFINITIONS "-DFFTW2_PREFIX_S")
else()
find_library(RFFTW2_LIBRARY NAMES rfftw)
find_path(FFTW2_INCLUDE_DIRS rfftw.h)
endif()
set(_SAVE ${CMAKE_REQUIRED_INCLUDES})
set(CMAKE_REQUIRED_INCLUDES "${_SAVE};${CLIPPER-CORE_INCLUDE_DIR}")
set(_CLIP_SRC "#include <clipper/clipper.h>\n"
"int main() {clipper::FFTmap().fft_h_to_x();}")
set(CMAKE_REQUIRED_LIBRARIES ${CLIPPER-CORE_LIBRARY})
set(_VAR _LINKING_WITH_CLIPPER_CORE)
check_cxx_source_compiles("${_CLIP_SRC}" ${_VAR})
if (NOT ${_VAR})
set(_ADD_LIBS ${CMAKE_THREAD_LIBS_INIT})
set(CMAKE_REQUIRED_LIBRARIES ${CLIPPER-CORE_LIBRARY} ${_ADD_LIBS})
set(_VAR _LINKING_WITH_CLIPPER_CORE_AND_THREADS)
check_cxx_source_compiles("${_CLIP_SRC}" ${_VAR})
endif()
if (NOT ${_VAR})
set(_ADD_LIBS ${RFFTW2_LIBRARY} ${FFTW2_LIBRARY}
${CMAKE_THREAD_LIBS_INIT})
set(CMAKE_REQUIRED_LIBRARIES ${CLIPPER-CORE_LIBRARY} ${_ADD_LIBS})
set(_VAR _LINKING_WITH_CLIPPER_CORE_AND_FFTW)
check_cxx_source_compiles("${_CLIP_SRC}" ${_VAR})
endif()
if (NOT ${_VAR})
message(FATAL_ERROR "Linking with clipper-core failed.")
endif()
set(CLIPPER-CORE_LIBRARIES ${CLIPPER-CORE_LIBRARY} ${_ADD_LIBS})
SET(CMAKE_REQUIRED_INCLUDES ${_SAVE})
endif()
endforeach()
set(CCP4_LIBRARIES ${CLIPPER-CCP4_LIBRARY}
${CLIPPER-CONTRIB_LIBRARY}
${CLIPPER-MINIMOL_LIBRARY}
${CLIPPER-MMDB_LIBRARY}
${CLIPPER-CORE_LIBRARIES}
${SSM_LIBRARY}
${CCIF_LIBRARIES}
${CCP4F_LIBRARY}
${CCP4C_LIBRARY}
${MMDB_LIBRARY})
if(CCP4_INCLUDE_DIRS)
list(REMOVE_DUPLICATES CCP4_INCLUDE_DIRS)
endif()
message(STATUS "CCP4 include directory: ${CCP4_INCLUDE_DIRS}")
mark_as_advanced(CCP4C_INCLUDE_DIR MMDB_INCLUDE_DIR CCIF_INCLUDE_DIR
CLIPPER-CORE_INCLUDE_DIR CLIPPER-CCP4_INCLUDE_DIR
CLIPPER-CONTRIB_INCLUDE_DIR CLIPPER-MINIMOL_INCLUDE_DIR
CLIPPER-MMDB_INCLUDE_DIR FFTW2_INCLUDE_DIRS)
......@@ -23,7 +23,7 @@
*/
#include "ccp4_array.h"
/* rcsid[] = "$Id: ccp4_array.c,v 1.5 2008/06/18 16:55:56 mdw Exp $" */
/* rcsid[] = "$Id$" */
ccp4_ptr ccp4array_new_(ccp4_ptr *p)
{
......
......@@ -74,7 +74,7 @@ extern "C" {
#include <stdlib.h>
#include <string.h>
/* rcsidha[] = "$Id: ccp4_array.h,v 1.6 2008/06/18 16:55:56 mdw Exp $" */
/* rcsidha[] = "$Id$" */
/*! constant pointer type */
typedef const void *ccp4_constptr;
......
......@@ -26,7 +26,7 @@
#include <errno.h>
/* rcsidhe[] = "$Id: ccp4_errno.h,v 1.10 2008/06/18 16:55:56 mdw Exp $" */
/* rcsidhe[] = "$Id$" */
#ifndef CCP4_ERRSYSTEM
#define CCP4_ERRSYSTEM(x) (((x)&0xfff)<<24)
......
File mode changed from 100755 to 100644
......@@ -26,7 +26,7 @@
#define __CCP4_FORTRAN
#include "ccp4_types.h"
/* rcsidhh[] = "$Id: ccp4_fortran.h,v 1.9 2008/06/18 16:55:56 mdw Exp $" */
/* rcsidhh[] = "$Id$" */
/* stardent is now obsolete, but we retain this category in case it is useful later */
#ifdef CALL_LIKE_STARDENT
......
......@@ -72,7 +72,7 @@
#include "cmtzlib.h"
#include "csymlib.h"
#include "ccp4_errno.h"
/* rcsid[] = "$Id: ccp4_general.c,v 1.45 2012/03/13 19:23:58 gxg60988 Exp $" */
/* rcsid[] = "$Id$" */
/*------------------------------------------------------------------*/
......
......@@ -32,7 +32,7 @@
#ifndef __CCPGeneral__
#define __CCPGeneral__
/* rcsidhl[] = "$Id: ccp4_general.h,v 1.8 2008/06/18 16:55:56 mdw Exp $" */
/* rcsidhl[] = "$Id$" */
/* note order: this must be outside CCP4 namespace */
#include "ccp4_parser.h"
......
......@@ -95,7 +95,7 @@
#include "ccp4_parser.h"
#include "ccp4_errno.h"
#include "ccp4_sysdep.h"
/* rcsid[] = "$Id: ccp4_parser.c,v 1.25 2008/06/18 16:55:56 mdw Exp $" */
/* rcsid[] = "$Id$" */
/* stuff for error reporting */
#define CPARSER_ERRNO(n) (CCP4_ERR_PARS | (n))
......
......@@ -105,7 +105,7 @@ See the distributed programs <a href="../ncont.html">NCONT</a> and
#ifndef __CCP4_Parser__
#define __CCP4_Parser__
/* rcsidhhh[] = "$Id: ccp4_parser.h,v 1.15 2008/06/18 16:55:56 mdw Exp $" */
/* rcsidhhh[] = "$Id$" */
/* note order: these must be outside CCP4 namespace */
#include <stdio.h>
......
......@@ -30,7 +30,7 @@
#include "ccp4_parser.h"
#include "ccp4_utils.h"
#include "ccp4_general.h"
/* rcsid[] = "$Id: ccp4_program.c,v 1.24 2011/11/07 13:17:27 mdw Exp $" */
/* rcsid[] = "$Id$" */
char *ccp4_prog_vers(const char *progvers)
{
......@@ -118,7 +118,7 @@ char *ccp4RCSDate(const char *rcs_string)
tmpstr2[2] = '\0';
if (strncmp(tmpstr1,"$Date: ",7) == 0) {
/* Raw form of RCS string (not exported) i.e.:
"$Date: 2011/11/07 13:17:27 $"
"$Date$"
*/
/* Build the date string in the form DD/MM/YY */
strncpy(RCSDate,rcs_string+15,2);
......@@ -200,7 +200,8 @@ int ccp4VerbosityLevel(int level)
Internal function: applications should use the API functions
ccp4SetCallback and ccp4InvokeCallback
*/
int ccp4Callback(CCP4INTFUNCPTR mycallback, char *mode, int ierr, char *message)
int ccp4Callback(CCP4INTFUNCPTR mycallback, char *mode, int ierr,
const char *message)
{
static CCP4INTFUNCPTR callback=ccp4NullCallback;
......@@ -238,7 +239,7 @@ int ccp4SetCallback(CCP4INTFUNCPTR mycallback)
This is a wrapper to ccp4Callback in "invoke" mode.
*/
int ccp4InvokeCallback(int ierr, char *message)
int ccp4InvokeCallback(int ierr, const char *message)
{
return ccp4Callback(ccp4NullCallback,"invoke",ierr,message);
}
......@@ -249,7 +250,7 @@ int ccp4InvokeCallback(int ierr, char *message)
used by ccp4Callback if no user-defined function has been
specified.
*/
int ccp4NullCallback(int level, char *message)
int ccp4NullCallback(int level, const char *message)
{
/* This is the default callback function which takes no
action */
......
......@@ -32,7 +32,7 @@
#ifndef __CCP4Program__
#define __CCP4Program__
/* rcsidhp[] = "$Id: ccp4_program.h,v 1.47 2012/05/15 16:12:43 ehl25977 Exp $" */
/* rcsidhp[] = "$Id$" */
#ifdef __cplusplus
namespace CCP4 {
......@@ -55,7 +55,7 @@ extern "C" {
/* Define a type which is a pointer to a function taking an integer
and a pointer to character, and returning an integer */
typedef int (*CCP4INTFUNCPTR)(int, char *);
typedef int (*CCP4INTFUNCPTR)(int, const char *);
/*------------------------------------------------------------------*/
......@@ -111,7 +111,8 @@ int ccp4VerbosityLevel(int level);
* @param message A message string equivalent to that used in ccperror
* @return Result of the executed function (invoke mode)
*/
int ccp4Callback(CCP4INTFUNCPTR mycallback, char *mode, int ierr, char *message);
int ccp4Callback(CCP4INTFUNCPTR mycallback, char *mode, int ierr,
const char *message);
/** Set a user-defined callback function
* This is a wrapper to ccp4Callback - it stores a user-defined
......@@ -129,7 +130,7 @@ int ccp4SetCallback(CCP4INTFUNCPTR mycallback);
* @param message A message string equivalent to that used in ccperror
* @return Result of the executed function
*/
int ccp4InvokeCallback(int ierr, char *message);
int ccp4InvokeCallback(int ierr, const char *message);
/** A dummy callback function used by default in ccp4CallOnExit
* Internal function. This function does nothing.
......@@ -137,7 +138,7 @@ int ccp4InvokeCallback(int ierr, char *message);
* @param message Message text supplied from ccperror
* @return Always returns 1
*/
int ccp4NullCallback(int level, char *message);
int ccp4NullCallback(int level, const char *message);
/** Check existence of licence agreement
* @param name Name of licence, e.g. "CCP4".
......
......@@ -34,7 +34,7 @@
#ifndef __CCP4_SPG__
#define __CCP4_SPG__
/* rcsidhsp[] = "$Id: ccp4_spg.h,v 1.9 2009/11/18 15:10:02 mdw Exp $" */
/* rcsidhsp[] = "$Id$" */
#ifdef __cplusplus
namespace CSym {
......
......@@ -130,11 +130,6 @@
#define _POSIX_SOURCE
#endif
/* include X/Open Unix extensions (e.g. cuserid) */
#ifndef _XOPEN_SOURCE
#define _XOPEN_SOURCE
#endif
#include <stdio.h>
#if defined (VMS)
......
File mode changed from 100755 to 100644
......@@ -27,7 +27,7 @@
#include "ccp4_unitcell.h"
#include "cvecmat.h"
#include "ccp4_errno.h"
/* rcsid[] = "$Id: ccp4_unitcell.c,v 1.8 2008/06/18 16:55:56 mdw Exp $" */