Small change to avoid problems when using Boost >= 1.38.0

autogen.sh

@@ -23,20 +23,21 @@
 PATHTOAUTOCONF=$(which autoconf)
 PATHTOAUTOMAKE=$(which automake)
 PATHTOLIBTOOL=$(which libtoolize)
+PATHTOGLIBTOOL=$(which glibtoolize)
 
-if [ "$PATHTOAUTOCONF" == "" ]; then
+if [ "$PATHTOAUTOCONF" = "" ]; then
   echo
   echo ">> GNU autoconf has not been found!"
   echo ">> Please install it first and then re-run the script!"
   echo
   exit 1
-elif [ "$PATHTOAUTOMAKE" == "" ]; then
+elif [ "$PATHTOAUTOMAKE" = "" ]; then
   echo
   echo ">> GNU automake has not been found!"
   echo ">> Please install it first and then re-run the script!"
   echo
   exit 1
-elif [ "$PATHTOLIBTOOL" == "" ]; then
+elif [ "$PATHTOLIBTOOL" = "" ] && [ "$PATHTOGLIBTOOL" = "" ]; then
   echo
   echo ">> GNU libtool has not been found!"
   echo ">> Please install it first and then re-run the script!"
@@ -44,6 +45,12 @@ elif [ "$PATHTOLIBTOOL" == "" ]; then
   exit 1
 fi
 
+if [ "$PATHTOLIBTOOL" = "" ]; then
+  LIBTOOLIZE="glibtoolize"
+else
+  LIBTOOLIZE="libtoolize"
+fi
+
 dir=`echo "$0" | sed 's,[^/]*$,,'`
 test "x${dir}" = "x" && dir='.'
 
@@ -69,7 +76,7 @@ then
     autoreconf                    && exit 0
 else
     echo ">> libtoolize"          && \
-    libtoolize --force            && \
+    $LIBTOOLIZE --force           && \
     echo ">> aclocal"             && \
     aclocal                       && \
     echo ">> autoconf"		  && \

configure.ac

@@ -136,6 +136,9 @@ AC_ARG_WITH([fftw3],
       elif test -r /sw/include/fftw3.h; then
         FFTW3_PREFIX="/sw"
         AC_MSG_RESULT([using ${FFTW3_PREFIX} as prefix of the FFTW3 installation... (ignore the negative check result just above)])
+      elif test -r /opt/local/include/fftw3.h; then
+        FFTW3_PREFIX="/opt/local"
+        AC_MSG_RESULT([using ${FFTW3_PREFIX} as prefix of the FFTW3 installation... (ignore the negative check result just above)])
       else
         AC_MSG_ERROR(
         [FFTW3 not found. Please call configure with the --with-fftw3 option.
@@ -178,6 +181,9 @@ AC_ARG_WITH([gsl],
       elif test -r /sw/include/gsl/gsl_sf_hyperg.h; then
         GSL_PREFIX="/sw"
         AC_MSG_RESULT([using ${GSL_PREFIX} as prefix of the GSL installation... (ignore the negative check result just above)])
+      elif test -r /opt/local/include/gsl/gsl_sf_hyperg.h; then
+        GSL_PREFIX="/opt/local"
+        AC_MSG_RESULT([using ${GSL_PREFIX} as prefix of the GSL installation... (ignore the negative check result just above)])
       else
         AC_MSG_ERROR(
         [GSL not found. Please call configure with the --with-gsl option.
@@ -220,6 +226,9 @@ AC_ARG_WITH([boostinc],
       elif test -r /sw/include/boost/spirit.hpp; then
         BOOST_INCLUDE="/sw/include"
         AC_MSG_RESULT([using ${BOOST_INCLUDE} as include path for the Boost headers... (ignore the negative check result just above)])
+      elif test -r /opt/local/include/boost/spirit.hpp; then
+        BOOST_INCLUDE="/opt/local/include"
+        AC_MSG_RESULT([using ${BOOST_INCLUDE} as include path for the Boost headers... (ignore the negative check result just above)])
       else
         AC_MSG_ERROR(
         [Boost not found. Please call configure with the --with-boostinc option.

src/include/PFunction.h

@@ -34,8 +34,15 @@
 
 #include <vector>
 
-#include <boost/spirit/tree/ast.hpp>
-using namespace boost::spirit;
+#include <boost/version.hpp>
+
+#if BOOST_VERSION >= 103800
+#  include <boost/spirit/include/classic_ast.hpp>
+   using namespace BOOST_SPIRIT_CLASSIC_NS;
+#else
+#  include <boost/spirit/tree/ast.hpp>
+   using namespace boost::spirit;
+#endif
 
 #include <TString.h>
 

src/include/PFunctionGrammar.h

@@ -37,9 +37,17 @@ using namespace std;
 
 //#define BOOST_SPIRIT_DEBUG
 
-#include <boost/spirit/core.hpp>
-#include <boost/spirit/tree/ast.hpp>
-using namespace boost::spirit;
+#include <boost/version.hpp>
+
+#if BOOST_VERSION >= 103800
+#  include <boost/spirit/include/classic_core.hpp>
+#  include <boost/spirit/include/classic_ast.hpp>
+   using namespace BOOST_SPIRIT_CLASSIC_NS;
+#else
+#  include <boost/spirit/core.hpp>
+#  include <boost/spirit/tree/ast.hpp>
+   using namespace boost::spirit;
+#endif
 
 typedef char const* iterator_t;
 typedef tree_match<iterator_t> parse_tree_match_t;

src/musrfit_startup.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<musrfit xmlns="http://nemu.web.psi.ch/musrfit">
+<musrfit xmlns="https://wiki.intranet.psi.ch/MUSR/MusrFit">
     <comment>
         $Id$
         Defines default settings for the musrfit package

src/musrgui/musrgui_startup.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<musrgui_startup xmlns="http://nemu.web.psi.ch/musrgui">
+<musrgui_startup xmlns="https://wiki.intranet.psi.ch/MUSR/MusrGui">
   <comment>
     $Id$
     This is handling default setting parameters for the musrgui.

src/tests/CheckMusrfitInstall/test-histo-ROOT-NPP.msr

@@ -19,7 +19,7 @@ TFieldCos      1     2       (phase frequency)
 #FUNCTIONS
 
 ###############################################################
-RUN 2008/lem08_his_2279 MUE4 PSI ROOT-NPP   (name beamline institute data-file-format)
+RUN lem08_his_2279 MUE4 PSI ROOT-NPP   (name beamline institute data-file-format)
 fittype         0         (single histogram fit)
 norm            5
 backgr.fit      6