Imported Upstream version 6.4.0~rc1

parent 078dbbe1
......@@ -10,7 +10,7 @@ if GNU_FORTRAN
AM_FFLAGS = -fno-second-underscore
endif
ccp4datadir = $(datadir)/ccp4
ccp4datadir = $(datarootdir)/ccp4
ccp4includedir = $(includedir)/ccp4
pkgconfigdir = $(libdir)/pkgconfig
......@@ -65,11 +65,12 @@ fortran_libccp4f_la_LDFLAGS = -no-undefined
# 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 \
dist_ccp4data_DATA = ccp4-config.cmake
dist_data_DATA = data/atomsf_neutron.lib \
data/atomsf.lib data/syminfo.lib data/symop.lib
pkgconfig_DATA = libccp4c.pc
if FORTRAN_LIB
dist_ccp4data_DATA += data/font84.ascii
dist_data_DATA += data/font84.ascii
pkgconfig_DATA += libccp4f.pc
endif
......
......@@ -56,11 +56,11 @@ host_triplet = @host@
@FORTRAN_LIB_TRUE@am__append_2 = data/font84.ascii
@FORTRAN_LIB_TRUE@am__append_3 = libccp4f.pc
subdir = .
DIST_COMMON = $(am__configure_deps) $(am__dist_ccp4data_DATA_DIST) \
$(ccp4include_HEADERS) $(srcdir)/Makefile.am \
$(srcdir)/Makefile.in $(srcdir)/config.h.in \
$(srcdir)/libccp4c.pc.in $(srcdir)/libccp4f.pc.in \
$(top_srcdir)/build-aux/ar-lib \
DIST_COMMON = $(am__configure_deps) $(am__dist_data_DATA_DIST) \
$(ccp4include_HEADERS) $(dist_ccp4data_DATA) \
$(srcdir)/Makefile.am $(srcdir)/Makefile.in \
$(srcdir)/config.h.in $(srcdir)/libccp4c.pc.in \
$(srcdir)/libccp4f.pc.in $(top_srcdir)/build-aux/ar-lib \
$(top_srcdir)/build-aux/config.guess \
$(top_srcdir)/build-aux/config.sub \
$(top_srcdir)/build-aux/depcomp \
......@@ -111,7 +111,8 @@ am__uninstall_files_from_dir = { \
$(am__cd) "$$dir" && rm -f $$files; }; \
}
am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(ccp4datadir)" \
"$(DESTDIR)$(pkgconfigdir)" "$(DESTDIR)$(ccp4includedir)"
"$(DESTDIR)$(datadir)" "$(DESTDIR)$(pkgconfigdir)" \
"$(DESTDIR)$(ccp4includedir)"
LTLIBRARIES = $(lib_LTLIBRARIES)
ccp4_libccp4c_la_LIBADD =
am__dirstamp = $(am__leading_dot)dirstamp
......@@ -213,10 +214,9 @@ am__can_run_installinfo = \
n|no|NO) false;; \
*) (install-info --version) >/dev/null 2>&1;; \
esac
am__dist_ccp4data_DATA_DIST = ccp4-config.cmake \
data/atomsf_neutron.lib data/atomsf.lib data/syminfo.lib \
data/symop.lib data/font84.ascii
DATA = $(dist_ccp4data_DATA) $(pkgconfig_DATA)
am__dist_data_DATA_DIST = data/atomsf_neutron.lib data/atomsf.lib \
data/syminfo.lib data/symop.lib data/font84.ascii
DATA = $(dist_ccp4data_DATA) $(dist_data_DATA) $(pkgconfig_DATA)
HEADERS = $(ccp4include_HEADERS)
ETAGS = etags
CTAGS = ctags
......@@ -368,7 +368,7 @@ top_srcdir = @top_srcdir@
ACLOCAL_AMFLAGS = -I m4
lib_LTLIBRARIES = ccp4/libccp4c.la $(am__append_1)
@GNU_FORTRAN_TRUE@AM_FFLAGS = -fno-second-underscore
ccp4datadir = $(datadir)/ccp4
ccp4datadir = $(datarootdir)/ccp4
ccp4includedir = $(includedir)/ccp4
pkgconfigdir = $(libdir)/pkgconfig
ccp4_libccp4c_la_SOURCES = \
......@@ -416,9 +416,9 @@ fortran_libccp4f_la_LDFLAGS = -no-undefined
# Files default.def and environ.def are not part of libccp4.
# 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 \
$(am__append_2)
dist_ccp4data_DATA = ccp4-config.cmake
dist_data_DATA = data/atomsf_neutron.lib data/atomsf.lib \
data/syminfo.lib data/symop.lib $(am__append_2)
pkgconfig_DATA = libccp4c.pc $(am__append_3)
# FIXME: all files but the first are unused now, should they be distributed?
......@@ -777,6 +777,27 @@ uninstall-dist_ccp4dataDATA:
@list='$(dist_ccp4data_DATA)'; test -n "$(ccp4datadir)" || list=; \
files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
dir='$(DESTDIR)$(ccp4datadir)'; $(am__uninstall_files_from_dir)
install-dist_dataDATA: $(dist_data_DATA)
@$(NORMAL_INSTALL)
@list='$(dist_data_DATA)'; test -n "$(datadir)" || list=; \
if test -n "$$list"; then \
echo " $(MKDIR_P) '$(DESTDIR)$(datadir)'"; \
$(MKDIR_P) "$(DESTDIR)$(datadir)" || exit 1; \
fi; \
for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
echo "$$d$$p"; \
done | $(am__base_list) | \
while read files; do \
echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(datadir)'"; \
$(INSTALL_DATA) $$files "$(DESTDIR)$(datadir)" || exit $$?; \
done
uninstall-dist_dataDATA:
@$(NORMAL_UNINSTALL)
@list='$(dist_data_DATA)'; test -n "$(datadir)" || list=; \
files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
dir='$(DESTDIR)$(datadir)'; $(am__uninstall_files_from_dir)
install-pkgconfigDATA: $(pkgconfig_DATA)
@$(NORMAL_INSTALL)
@list='$(pkgconfig_DATA)'; test -n "$(pkgconfigdir)" || list=; \
......@@ -1057,7 +1078,7 @@ check: $(BUILT_SOURCES)
$(MAKE) $(AM_MAKEFLAGS) check-am
all-am: Makefile $(LTLIBRARIES) $(DATA) $(HEADERS) config.h
installdirs:
for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(ccp4datadir)" "$(DESTDIR)$(pkgconfigdir)" "$(DESTDIR)$(ccp4includedir)"; do \
for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(ccp4datadir)" "$(DESTDIR)$(datadir)" "$(DESTDIR)$(pkgconfigdir)" "$(DESTDIR)$(ccp4includedir)"; do \
test -z "$$dir" || $(MKDIR_P) "$$dir"; \
done
install: $(BUILT_SOURCES)
......@@ -1122,7 +1143,7 @@ info: info-am
info-am:
install-data-am: install-ccp4includeHEADERS install-dist_ccp4dataDATA \
install-pkgconfigDATA
install-dist_dataDATA install-pkgconfigDATA
install-dvi: install-dvi-am
......@@ -1171,7 +1192,8 @@ ps: ps-am
ps-am:
uninstall-am: uninstall-ccp4includeHEADERS uninstall-dist_ccp4dataDATA \
uninstall-libLTLIBRARIES uninstall-pkgconfigDATA
uninstall-dist_dataDATA uninstall-libLTLIBRARIES \
uninstall-pkgconfigDATA
.MAKE: all check install install-am install-strip
......@@ -1184,15 +1206,16 @@ uninstall-am: uninstall-ccp4includeHEADERS uninstall-dist_ccp4dataDATA \
distdir distuninstallcheck dvi dvi-am html html-am info \
info-am install install-am install-ccp4includeHEADERS \
install-data install-data-am install-dist_ccp4dataDATA \
install-dvi install-dvi-am install-exec install-exec-am \
install-html install-html-am install-info install-info-am \
install-libLTLIBRARIES install-man install-pdf install-pdf-am \
install-pkgconfigDATA install-ps install-ps-am install-strip \
installcheck installcheck-am installdirs maintainer-clean \
maintainer-clean-generic mostlyclean mostlyclean-compile \
mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
tags uninstall uninstall-am uninstall-ccp4includeHEADERS \
uninstall-dist_ccp4dataDATA uninstall-libLTLIBRARIES \
install-dist_dataDATA install-dvi install-dvi-am install-exec \
install-exec-am install-html install-html-am install-info \
install-info-am install-libLTLIBRARIES install-man install-pdf \
install-pdf-am install-pkgconfigDATA install-ps install-ps-am \
install-strip installcheck installcheck-am installdirs \
maintainer-clean maintainer-clean-generic mostlyclean \
mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
pdf pdf-am ps ps-am tags uninstall uninstall-am \
uninstall-ccp4includeHEADERS uninstall-dist_ccp4dataDATA \
uninstall-dist_dataDATA uninstall-libLTLIBRARIES \
uninstall-pkgconfigDATA
fortran/unix.f: fortran/unix.m4 Makefile
......
This diff is collapsed.
This diff is collapsed.
......@@ -93,6 +93,7 @@ foreach(_component ${CCP4_FIND_COMPONENTS})
set(_incl_var "${_upper}_INCLUDE_DIR")
find_path(${_incl_var} ${_header}
HINTS ${CMAKE_INSTALL_PREFIX}/include
HINTS ${CMAKE_INSTALL_PREFIX}/include/cctbx
PATHS ${_cincl})
message(STATUS "Looking for ${_header} - ${${_incl_var}}")
find_package_handle_standard_args(CCP4 DEFAULT_MSG
......
......@@ -253,7 +253,9 @@
# define NATIVEFT DFNTF_LEIEEE
#endif
#if defined (powerpc) || defined (__ppc__) || defined __PPC
#if defined (powerpc) || defined (__powerpc__) || defined (__ppc__) || \
defined __PPC || defined (__s390__) || defined (__s390x__) || \
defined (__hppa__)
# define NATIVEIT DFNTI_MBO
# define NATIVEFT DFNTF_BEIEEE
#endif
......@@ -271,11 +273,39 @@
# define NATIVEIT DFNTI_IBO
#endif
#if defined(MIPSEB) || defined(__hpux) || defined(_AIX) || defined(m68k) || defined(mc68000) || defined(sparc) || defined (__sparc__) || defined(__s390__)
#if defined(MIPSEB) || defined(__hpux) || defined(_AIX) || defined(m68k) || defined(mc68000) || defined(sparc) || defined (__sparc__)
# define NATIVEIT DFNTI_MBO
# define NATIVEFT DFNTF_BEIEEE
#endif
#if defined(__ARM__) || defined(__arm__)
# if defined(__ARMEB__)
# define NATIVEIT DFNTI_MBO
# define NATIVEFT DFNTF_BEIEEE
# elif defined(__ARMEL__)
# define NATIVEIT DFNTI_IBO
# define NATIVEFT DFNTF_LEIEEE
# endif
#endif
/* From time to time new architectures are added here, often because Linux
* packagers want to build it on all platforms supported by their distro.
* Here we try to catch machines not listed explicitely above, under
* assumption that endianness is the same for floating point numbers
* as for integers. Which is safe assumption on modern standard computers
* (not embedded systems), according to
* http://en.wikipedia.org/wiki/Endianness#Floating-point_and_endianness
*/
#if !defined(NATIVEIT) && !defined(NATIVEFT) && defined(__BYTE_ORDER)
# if __BYTE_ORDER == __LITTLE_ENDIAN
# define NATIVEIT DFNTI_IBO
# define NATIVEFT DFNTF_LEIEEE
# elif __BYTE_ORDER == __BIG_ENDIAN
# define NATIVEIT DFNTI_MBO
# define NATIVEFT DFNTF_BEIEEE
# endif
#endif
#ifndef NATIVEFT
# error "Can't determine machine number format"
#endif
......
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.69 for libccp4 6.3.1.
# Generated by GNU Autoconf 2.69 for libccp4 6.4.0.
#
#
# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
......@@ -587,8 +587,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='libccp4'
PACKAGE_TARNAME='libccp4'
PACKAGE_VERSION='6.3.1'
PACKAGE_STRING='libccp4 6.3.1'
PACKAGE_VERSION='6.4.0'
PACKAGE_STRING='libccp4 6.4.0'
PACKAGE_BUGREPORT=''
PACKAGE_URL=''
......@@ -1335,7 +1335,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
\`configure' configures libccp4 6.3.1 to adapt to many kinds of systems.
\`configure' configures libccp4 6.4.0 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
......@@ -1405,7 +1405,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
short | recursive ) echo "Configuration of libccp4 6.3.1:";;
short | recursive ) echo "Configuration of libccp4 6.4.0:";;
esac
cat <<\_ACEOF
......@@ -1519,7 +1519,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
libccp4 configure 6.3.1
libccp4 configure 6.4.0
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
......@@ -2002,7 +2002,7 @@ 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 libccp4 $as_me 6.3.1, which was
It was created by libccp4 $as_me 6.4.0, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
......@@ -2870,7 +2870,7 @@ fi
# Define the identity of the package.
PACKAGE='libccp4'
VERSION='6.3.1'
VERSION='6.4.0'
cat >>confdefs.h <<_ACEOF
......@@ -16178,12 +16178,13 @@ fi
if test "x$enable_fortran" != "xno"; then
# sorting_main.f (mix of F77 and F90) cannot be compiled with g77
ac_ext=f
ac_compile='$F77 -c $FFLAGS conftest.$ac_ext >&5'
ac_link='$F77 -o conftest$ac_exeext $FFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
ac_compiler_gnu=$ac_cv_f77_compiler_gnu
if test -n "$ac_tool_prefix"; then
for ac_prog in g77 xlf f77 frt pgf77 cf77 fort77 fl32 af77 xlf90 f90 pgf90 pghpf epcf90 gfortran g95 xlf95 f95 fort ifort ifc efc pgfortran pgf95 lf95 ftn nagfor
for ac_prog in xlf90 f90 pgf90 pghpf epcf90 gfortran g95 xlf95 f95 fort ifort ifc efc pgfortran pgf95 lf95 ftn nagfor g77 xlf f77 frt pgf77 cf77 fort77 fl32 af77
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
......@@ -16227,7 +16228,7 @@ fi
fi
if test -z "$F77"; then
ac_ct_F77=$F77
for ac_prog in g77 xlf f77 frt pgf77 cf77 fort77 fl32 af77 xlf90 f90 pgf90 pghpf epcf90 gfortran g95 xlf95 f95 fort ifort ifc efc pgfortran pgf95 lf95 ftn nagfor
for ac_prog in xlf90 f90 pgf90 pghpf epcf90 gfortran g95 xlf95 f95 fort ifort ifc efc pgfortran pgf95 lf95 ftn nagfor g77 xlf f77 frt pgf77 cf77 fort77 fl32 af77
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
......@@ -19957,7 +19958,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
This file was extended by libccp4 $as_me 6.3.1, which was
This file was extended by libccp4 $as_me 6.4.0, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
......@@ -20023,7 +20024,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
libccp4 config.status 6.3.1
libccp4 config.status 6.4.0
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
......
AC_INIT(libccp4, 6.3.1)
AC_INIT(libccp4, 6.4.0)
AC_CONFIG_AUX_DIR(build-aux)
AC_CONFIG_MACRO_DIR(m4)
......@@ -23,7 +23,8 @@ AC_ARG_ENABLE(fortran, AS_HELP_STRING([--disable-fortran],
AM_CONDITIONAL([FORTRAN_LIB], [ test "x$enable_fortran" != xno ])
if test "x$enable_fortran" != "xno"; then
AC_PROG_F77
# sorting_main.f (mix of F77 and F90) cannot be compiled with g77
AC_PROG_F77([_AC_F90_FC _AC_F95_FC _AC_F77_FC])
# AC_PROG_F77 doesn't fail if compiler is not found, test it explicitely
AC_LANG_PUSH(Fortran 77)
AC_LINK_IFELSE([AC_LANG_PROGRAM([], [ write(*,*) 'hello' ])], [],
......
......@@ -8684,7 +8684,7 @@ C
READ (IUNITF) IFSTRT,LENGF,IFX0,IFY0,IFWID,IFHT,NFONTS
else
call getenv('CCP4', str)
str(lenstr(str)+1:) = '/share/ccp4/font84.ascii'
str(lenstr(str)+1:) = '/lib/data/font84.ascii'
call CCPDPN (ITEROP,str,'READONLY','F',0,IFAIL)
IF (IFAIL.NE.0) GO TO 10
READ(IUNITF,2000) IFSTRT,LENGF,IFX0,IFY0,IFWID,IFHT,NFONTS
......
......@@ -6,6 +6,6 @@ includedir=@includedir@
Name: libccp4f
Description: CCP4 core FORTRAN libraries
Version: @VERSION@
Requires.private: ccp4c mmdb
Requires.private: libccp4c mmdb
Libs: -L${libdir} -lccp4f
Cflags: -I${includedir}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment