From 7f65a27d1e3d39f071bd0de9ffacace0d5dfe241 Mon Sep 17 00:00:00 2001
From: Andreas Suter <andreas.suter@psi.ch>
Date: Fri, 23 Dec 2011 06:19:43 +0000
Subject: [PATCH] changed Qt parts of configure.ac in order to be compatible
 with BSD MacOS X

---
 ChangeLog    | 2 ++
 configure.ac | 9 ++++-----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index c66be610..f2abe96a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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)
     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)
+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 proper phase correction for Re/Im Fourier transform (MUSR-206)
 FIXED when release or restore is called (command block commands), the
diff --git a/configure.ac b/configure.ac
index 8173f072..1fb1425a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -771,7 +771,7 @@ if test "x$enable_editor" != "xno"; then
             QMAKEVERSIONSTRING="$(${QT3_PREFIX}/bin/${QMAKE} -v 2>&1)"
             for a in $QMAKEVERSIONSTRING
             do
-              if test "$(expr match "$a" '\(..\)')" = "3."; then
+              if test "$(expr "$a" : '\(..\)')" = "3."; then
                 QMAKEBIN="${QT3_PREFIX}/bin/${QMAKE}"
                 QTEDITOR=musrgui
                 AC_MSG_RESULT([${QMAKEBIN}])
@@ -800,7 +800,7 @@ if test "x$enable_editor" != "xno"; then
             QMAKEVERSIONSTRING="$(${QT4_PREFIX}/bin/${QMAKE} -v 2>&1)"
             for a in $QMAKEVERSIONSTRING
             do
-              if test "$(expr match "$a" '\(..\)')" = "4."; then
+              if test "$(expr "$a" : '\(..\)')" = "4."; then
                 QMAKEBIN="${QT4_PREFIX}/bin/${QMAKE}"
                 QTEDITOR=musredit
                 AC_MSG_RESULT([${QMAKEBIN}])
@@ -865,7 +865,7 @@ if test "x$enable_editor" != "xno"; then
               QMAKEVERSIONSTRING="$(${QTPATH}/bin/qmake -v 2>&1)"
               for a in $QMAKEVERSIONSTRING
               do
-                if test "$(expr match "$a" '\(..\)')" = "4."; then
+                if test "$(expr "$a" : '\(..\)')" = "4."; then
                   QMAKEBIN="${QTPATH}/bin/qmake"
                   AC_MSG_RESULT([${QMAKEBIN}])
                   break
@@ -887,7 +887,7 @@ if test "x$enable_editor" != "xno"; then
               QMAKEVERSIONSTRING="$(${QTPATH}/bin/qmake -v 2>&1)"
               for a in $QMAKEVERSIONSTRING
               do
-                if test "$(expr match "$a" '\(..\)')" = "3."; then
+                if test "$(expr "$a" : '\(..\)')" = "3."; then
                   QMAKEBIN="${QTPATH}/bin/qmake"
                   AC_MSG_RESULT([${QMAKEBIN}])
                   break
@@ -1182,4 +1182,3 @@ echo ""
 echo "   Programs and XML configuration files:  ${INSTALLDIR}/bin"
 echo "   Documentation:                         ${DOCDIR}"
 echo ""
-