LMU/musrfit
LMU/musrfit
5
0
Fork 0
Code Issues 6 Pull Requests Actions Packages Projects Releases 3 Activity

Merge branch 'master' into root6

Browse Source
This commit is contained in:
suter_a 2016-08-10 12:49:24 +02:00
commit e95bee2c41
2 changed files with 15 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@ -11,6 +11,7 @@ NEW 2016-04-28 msr2data gets a new option: paramList which allows to
of msr-files.
NEW 2016-04-22 Added the theory function muMinusExpTF for mu minus fits
NEW 2016-02-23 It is now possible to export the averaged data/Fourier
CHANGED 2016-08-10 drop NeXus support for Version < 4.4
CHANGED 2016-04-26 start-/endTimeBin are now class members. This reduces
the number of recalculations.
FIXED 2016-08-02 run lists are now properly loaded if containing nS-nE elements.

31
configure.ac
View File

@ -554,34 +554,31 @@ AC_ARG_ENABLE([NeXus], [AS_HELP_STRING([--enable-NeXus],[build optional NeXus su
[AS_HELP_STRING([--with-nexus],[prefix of the NeXus installation, e.g. /usr/local])],
[NEXUS_PREFIX=$with_nexus
AC_MSG_CHECKING([whether NeXus can be found at the specified location])
if !(test -r ${NEXUS_PREFIX}/include/napi.h); then
if !(test -r ${NEXUS_PREFIX}/include/nexus/napi.h); then
AC_MSG_RESULT([no])
AC_MSG_ERROR([NeXus cannot be found at the specified path!])
fi
AC_MSG_RESULT([${NEXUS_PREFIX}])],
[PKG_CHECK_MODULES(NEXUS, nexus >= 4.1, [NEXUS_FOUND=1],
[PKG_CHECK_MODULES(NEXUS, nexus >= 4.4, [NEXUS_FOUND=1],
[AC_MSG_CHECKING([whether NeXus is installed in a standard location])
if test -r /usr/local/include/napi.h; then
NEXUS_PREFIX="/usr/local"
AC_MSG_RESULT([${NEXUS_PREFIX}])
elif test -r /usr/local/nexus/include/napi.h; then
NEXUS_PREFIX="/usr/local/nexus"
if test -r /usr/local/include/nexus/napi.h; then
NEXUS_PREFIX="/usr/local"
AC_MSG_RESULT([${NEXUS_PREFIX}])
elif test -r /usr/include/napi.h; then
NEXUS_PREFIX="/usr"
AC_MSG_RESULT([${NEXUS_PREFIX}])
elif test -r /sw/include/napi.h; then
elif test -r /sw/include/nexus/napi.h; then
NEXUS_PREFIX="/sw"
AC_MSG_RESULT([${NEXUS_PREFIX}])
elif test -r /opt/local/include/napi.h; then
elif test -r /opt/local/include/nexus/napi.h; then
NEXUS_PREFIX="/opt/local"
AC_MSG_RESULT([${NEXUS_PREFIX}])
else
elif test -r /opt/nexus/include/nexus/napi.h; then
NEXUS_PREFIX="/opt/nexus"
AC_MSG_RESULT([${NEXUS_PREFIX}])
else
AC_MSG_RESULT([no])
AC_MSG_ERROR(
[NeXus not found. Please call configure with the --with-nexus option.
[NeXus Version >= 4.4 not found. Please call configure with the --with-nexus option.
This tells configure where to find the NeXus headers,
e.g. --with-nexus=/usr/local/nexus]
e.g. --with-nexus=/opt/nexus]
)
fi
]
@ -589,8 +586,8 @@ AC_ARG_ENABLE([NeXus], [AS_HELP_STRING([--enable-NeXus],[build optional NeXus su
)
AC_SUBST(NEXUS_PREFIX)
if test "${NEXUS_FOUND}" != "1"; then
NEXUS_LIBS="-L${NEXUS_PREFIX}/lib -lNeXus"
NEXUS_CFLAGS="-I${NEXUS_PREFIX}/include"
NEXUS_LIBS="-L${NEXUS_PREFIX}/lib64 -lNeXus"
NEXUS_CFLAGS="-I${NEXUS_PREFIX}/include/nexus"
fi
AC_SUBST(NEXUS_LIBS)
AC_SUBST(NEXUS_CFLAGS)