diff --git a/autogen.sh b/autogen.sh index babb518a..45b24713 100755 --- a/autogen.sh +++ b/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" && \ diff --git a/configure.ac b/configure.ac index 65f15012..b9442be6 100644 --- a/configure.ac +++ b/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. diff --git a/src/include/PFunction.h b/src/include/PFunction.h index 799f814f..3bae2960 100644 --- a/src/include/PFunction.h +++ b/src/include/PFunction.h @@ -34,8 +34,15 @@ #include -#include -using namespace boost::spirit; +#include + +#if BOOST_VERSION >= 103800 +# include + using namespace BOOST_SPIRIT_CLASSIC_NS; +#else +# include + using namespace boost::spirit; +#endif #include diff --git a/src/include/PFunctionGrammar.h b/src/include/PFunctionGrammar.h index a8b0a442..9d938b49 100644 --- a/src/include/PFunctionGrammar.h +++ b/src/include/PFunctionGrammar.h @@ -37,9 +37,17 @@ using namespace std; //#define BOOST_SPIRIT_DEBUG -#include -#include -using namespace boost::spirit; +#include + +#if BOOST_VERSION >= 103800 +# include +# include + using namespace BOOST_SPIRIT_CLASSIC_NS; +#else +# include +# include + using namespace boost::spirit; +#endif typedef char const* iterator_t; typedef tree_match parse_tree_match_t; diff --git a/src/musrfit_startup.xml b/src/musrfit_startup.xml index 93e15ac3..022e61de 100644 --- a/src/musrfit_startup.xml +++ b/src/musrfit_startup.xml @@ -1,5 +1,5 @@ - + $Id$ Defines default settings for the musrfit package diff --git a/src/musrgui/musrgui_startup.xml b/src/musrgui/musrgui_startup.xml index ab36495a..1690dedc 100644 --- a/src/musrgui/musrgui_startup.xml +++ b/src/musrgui/musrgui_startup.xml @@ -1,5 +1,5 @@ - + $Id$ This is handling default setting parameters for the musrgui. diff --git a/src/tests/CheckMusrfitInstall/deltat_pta_gpd_0423.bin b/src/tests/CheckMusrfitInstall/deltat_pta_gpd_0423.bin new file mode 100644 index 00000000..3580f2d3 Binary files /dev/null and b/src/tests/CheckMusrfitInstall/deltat_pta_gpd_0423.bin differ diff --git a/src/tests/CheckMusrfitInstall/deltat_pta_gps_0440.bin b/src/tests/CheckMusrfitInstall/deltat_pta_gps_0440.bin deleted file mode 100644 index 24be3360..00000000 Binary files a/src/tests/CheckMusrfitInstall/deltat_pta_gps_0440.bin and /dev/null differ diff --git a/src/tests/CheckMusrfitInstall/test-histo-ROOT-NPP.msr b/src/tests/CheckMusrfitInstall/test-histo-ROOT-NPP.msr index 0375ed80..a450e394 100644 --- a/src/tests/CheckMusrfitInstall/test-histo-ROOT-NPP.msr +++ b/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