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

changed Qt parts of configure.ac in order to be compatible with BSD MacOS X

Browse Source
This commit is contained in:
suter_a 2011-12-23 06:19:43 +00:00
parent e76399634f
commit 7f65a27d1e
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@ -21,6 +21,8 @@ NEW the chi^2 calculation in single-histogram and asymmetry fits is parallelized
if musrfit is built using a compiler supporting OpenMP (e.g. GCC >= 4.2) if musrfit is built using a compiler supporting OpenMP (e.g. GCC >= 4.2)
Using --disable-omp this feature can be disabled on the configure level. Using --disable-omp this feature can be disabled on the configure level.
NEW any2many: force the user to define the exact NeXus ouput format (HDF4,HDF5,XML) NEW any2many: force the user to define the exact NeXus ouput format (HDF4,HDF5,XML)
FIXED 2011-12-23 changed Qt parts of configure.ac in order to be compatible
with BSD MacOS X
FIXED 2011-12-22 some more work towards a proper NeXus muon data format support. FIXED 2011-12-22 some more work towards a proper NeXus muon data format support.
FIXED proper phase correction for Re/Im Fourier transform (MUSR-206) FIXED proper phase correction for Re/Im Fourier transform (MUSR-206)
FIXED when release or restore is called (command block commands), the FIXED when release or restore is called (command block commands), the

9
configure.ac
View File

@ -771,7 +771,7 @@ if test "x$enable_editor" != "xno"; then
QMAKEVERSIONSTRING="$(${QT3_PREFIX}/bin/${QMAKE} -v 2>&1)" QMAKEVERSIONSTRING="$(${QT3_PREFIX}/bin/${QMAKE} -v 2>&1)"
for a in $QMAKEVERSIONSTRING for a in $QMAKEVERSIONSTRING
do do
if test "$(expr match "$a" '\(..\)')" = "3."; then if test "$(expr "$a" : '\(..\)')" = "3."; then
QMAKEBIN="${QT3_PREFIX}/bin/${QMAKE}" QMAKEBIN="${QT3_PREFIX}/bin/${QMAKE}"
QTEDITOR=musrgui QTEDITOR=musrgui
AC_MSG_RESULT([${QMAKEBIN}]) AC_MSG_RESULT([${QMAKEBIN}])
@ -800,7 +800,7 @@ if test "x$enable_editor" != "xno"; then
QMAKEVERSIONSTRING="$(${QT4_PREFIX}/bin/${QMAKE} -v 2>&1)" QMAKEVERSIONSTRING="$(${QT4_PREFIX}/bin/${QMAKE} -v 2>&1)"
for a in $QMAKEVERSIONSTRING for a in $QMAKEVERSIONSTRING
do do
if test "$(expr match "$a" '\(..\)')" = "4."; then if test "$(expr "$a" : '\(..\)')" = "4."; then
QMAKEBIN="${QT4_PREFIX}/bin/${QMAKE}" QMAKEBIN="${QT4_PREFIX}/bin/${QMAKE}"
QTEDITOR=musredit QTEDITOR=musredit
AC_MSG_RESULT([${QMAKEBIN}]) AC_MSG_RESULT([${QMAKEBIN}])
@ -865,7 +865,7 @@ if test "x$enable_editor" != "xno"; then
QMAKEVERSIONSTRING="$(${QTPATH}/bin/qmake -v 2>&1)" QMAKEVERSIONSTRING="$(${QTPATH}/bin/qmake -v 2>&1)"
for a in $QMAKEVERSIONSTRING for a in $QMAKEVERSIONSTRING
do do
if test "$(expr match "$a" '\(..\)')" = "4."; then if test "$(expr "$a" : '\(..\)')" = "4."; then
QMAKEBIN="${QTPATH}/bin/qmake" QMAKEBIN="${QTPATH}/bin/qmake"
AC_MSG_RESULT([${QMAKEBIN}]) AC_MSG_RESULT([${QMAKEBIN}])
break break
@ -887,7 +887,7 @@ if test "x$enable_editor" != "xno"; then
QMAKEVERSIONSTRING="$(${QTPATH}/bin/qmake -v 2>&1)" QMAKEVERSIONSTRING="$(${QTPATH}/bin/qmake -v 2>&1)"
for a in $QMAKEVERSIONSTRING for a in $QMAKEVERSIONSTRING
do do
if test "$(expr match "$a" '\(..\)')" = "3."; then if test "$(expr "$a" : '\(..\)')" = "3."; then
QMAKEBIN="${QTPATH}/bin/qmake" QMAKEBIN="${QTPATH}/bin/qmake"
AC_MSG_RESULT([${QMAKEBIN}]) AC_MSG_RESULT([${QMAKEBIN}])
break break
@ -1182,4 +1182,3 @@ echo ""
echo " Programs and XML configuration files: ${INSTALLDIR}/bin" echo " Programs and XML configuration files: ${INSTALLDIR}/bin"
echo " Documentation: ${DOCDIR}" echo " Documentation: ${DOCDIR}"
echo "" echo ""