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

Minor improvements in the build procedure of musrfit:

Browse Source 
- removed most of the not used checks
- introduced a new check for Minuit2 in ROOT
- building of static libraries is disabled by default now
- disabled the F77-checks related to libtool
  (when support for Minuit will become available in musrfit checks for Fortran compilers will be added explicitly)

Some tests under different environments are still needed...
This commit is contained in:
Bastian M. Wojek 2009-12-27 21:08:16 +00:00
parent 199ff918f0
commit a270d81853
2 changed files with 93 additions and 74 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
acinclude.m4
View File

@ -68,7 +68,7 @@ AC_DEFUN([ROOT_PATH],
ROOTSOVERSION=`dirname $ROOTVERSION` ROOTSOVERSION=`dirname $ROOTVERSION`
if test $1 ; then if test $1 ; then
AC_MSG_CHECKING(wether ROOT version >= [$1]) AC_MSG_CHECKING(whether ROOT version >= [$1])
vers=`$ROOTCONF --version | tr './' ' ' | awk 'BEGIN { FS = " "; } { printf "%d", ($''1 * 1000 + $''2) * 1000 + $''3;}'` vers=`$ROOTCONF --version | tr './' ' ' | awk 'BEGIN { FS = " "; } { printf "%d", ($''1 * 1000 + $''2) * 1000 + $''3;}'`
requ=`echo $1 | tr './' ' ' | awk 'BEGIN { FS = " "; } { printf "%d", ($''1 * 1000 + $''2) * 1000 + $''3;}'` requ=`echo $1 | tr './' ' ' | awk 'BEGIN { FS = " "; } { printf "%d", ($''1 * 1000 + $''2) * 1000 + $''3;}'`
if test $vers -lt $requ ; then if test $vers -lt $requ ; then

163
configure.ac
View File

@ -4,6 +4,12 @@ AC_CONFIG_AUX_DIR(admin)
AC_CANONICAL_HOST AC_CANONICAL_HOST
#AC_MSG_RESULT([${host} ${host_cpu} ${host_vendor} ${host_os}]) #AC_MSG_RESULT([${host} ${host_cpu} ${host_vendor} ${host_os}])
dnl -----------------------------------------------
dnl Check if pkg-config is installed
dnl -----------------------------------------------
m4_ifdef([PKG_CHECK_MODULES],[],AC_MSG_ERROR([Please install pkg-config before configuring musrfit!]))
dnl ----------------------------------------------- dnl -----------------------------------------------
dnl Package names and version numbers dnl Package names and version numbers
dnl ----------------------------------------------- dnl -----------------------------------------------
@ -124,17 +130,18 @@ dnl -----------------------------------------------
AM_INIT_AUTOMAKE(@PACKAGE_NAME@, @PACKAGE_VERSION@) AM_INIT_AUTOMAKE(@PACKAGE_NAME@, @PACKAGE_VERSION@)
AC_CONFIG_HEADER([config.h]) AC_CONFIG_HEADER([config.h])
AC_LANG(C++) AC_LANG(C++)
# Checks for programs.
# AC_PROG_AWK
AC_PROG_CXX
AC_PROG_CC
# AC_PROG_LEX
AC_PROG_LN_S AC_PROG_LN_S
# AC_PROG_YACC
AC_PROG_INSTALL AC_PROG_INSTALL
m4_ifdef([LT_INIT],
[LT_INIT([disable-static])
LT_LANG([C++])
LT_LANG([C])],
[m4_defun([_LT_AC_LANG_F77_CONFIG], [:])
AM_DISABLE_STATIC
AM_PROG_LIBTOOL AM_PROG_LIBTOOL
ROOT_PATH AC_PROG_CXX
AC_PROG_CC])
dnl ----------------------------------------------- dnl -----------------------------------------------
dnl Ask user for path to fftw3 dnl Ask user for path to fftw3
@ -142,29 +149,33 @@ dnl -----------------------------------------------
FFTW3_FOUND=0 FFTW3_FOUND=0
AC_ARG_WITH([fftw3], AC_ARG_WITH([fftw3],
[AC_HELP_STRING([--with-fftw3],[prefix of FFTW3 installation. e.g. /usr/local or /usr])], [AC_HELP_STRING([--with-fftw3],[prefix of FFTW3 installation, e.g. /usr/local or /usr])],
[FFTW3_PREFIX=$with_fftw3 [FFTW3_PREFIX=$with_fftw3
AC_MSG_CHECKING([whether FFTW3 can be found at the specified location])
if !(test -r ${FFTW3_PREFIX}/include/fftw3.h); then if !(test -r ${FFTW3_PREFIX}/include/fftw3.h); then
AC_MSG_ERROR(FFTW3 cannot be found at the specified path!) AC_MSG_RESULT([no])
AC_MSG_ERROR([FFTW3 cannot be found at the specified path!])
fi fi
AC_MSG_RESULT([using ${FFTW3_PREFIX} as prefix of the FFTW3 installation...])], AC_MSG_RESULT([${FFTW3_PREFIX}])],
[PKG_CHECK_MODULES(FFTW3, fftw3 >= 3.1.0, [FFTW3_FOUND=1], [PKG_CHECK_MODULES(FFTW3, fftw3 >= 3.1.0, [FFTW3_FOUND=1],
[if test -r /usr/local/include/fftw3.h; then [AC_MSG_CHECKING([whether FFTW3 is installed in a standard location])
if test -r /usr/local/include/fftw3.h; then
FFTW3_PREFIX="/usr/local" FFTW3_PREFIX="/usr/local"
AC_MSG_RESULT([using ${FFTW3_PREFIX} as prefix of the FFTW3 installation... (ignore the negative check result just above)]) AC_MSG_RESULT([${FFTW3_PREFIX}])
elif test -r /usr/include/fftw3.h; then elif test -r /usr/include/fftw3.h; then
FFTW3_PREFIX="/usr" FFTW3_PREFIX="/usr"
AC_MSG_RESULT([using ${FFTW3_PREFIX} as prefix of the FFTW3 installation... (ignore the negative check result just above)]) AC_MSG_RESULT([${FFTW3_PREFIX}])
elif test -r /sw/include/fftw3.h; then elif test -r /sw/include/fftw3.h; then
FFTW3_PREFIX="/sw" FFTW3_PREFIX="/sw"
AC_MSG_RESULT([using ${FFTW3_PREFIX} as prefix of the FFTW3 installation... (ignore the negative check result just above)]) AC_MSG_RESULT([${FFTW3_PREFIX}])
elif test -r /opt/local/include/fftw3.h; then elif test -r /opt/local/include/fftw3.h; then
FFTW3_PREFIX="/opt/local" FFTW3_PREFIX="/opt/local"
AC_MSG_RESULT([using ${FFTW3_PREFIX} as prefix of the FFTW3 installation... (ignore the negative check result just above)]) AC_MSG_RESULT([${FFTW3_PREFIX}])
else else
AC_MSG_RESULT([no])
AC_MSG_ERROR( AC_MSG_ERROR(
[FFTW3 not found. Please call configure with the --with-fftw3 option. [FFTW3 not found. Please call configure with the --with-fftw3 option.
This tells configure where to find the FFTW3 C libraries and headers. This tells configure where to find the FFTW3 C libraries and headers,
e.g. --with-fftw3=/usr/local or --with-fftw3=/usr] e.g. --with-fftw3=/usr/local or --with-fftw3=/usr]
) )
fi fi
@ -198,27 +209,31 @@ GSL_FOUND=0
AC_ARG_WITH([gsl], AC_ARG_WITH([gsl],
[AC_HELP_STRING([--with-gsl],[prefix of GSL installation. e.g. /usr/local or /usr])], [AC_HELP_STRING([--with-gsl],[prefix of GSL installation. e.g. /usr/local or /usr])],
[GSL_PREFIX=$with_gsl [GSL_PREFIX=$with_gsl
AC_MSG_CHECKING([whether GSL can be found at the specified location])
if !(test -r ${GSL_PREFIX}/include/gsl/gsl_sf_hyperg.h); then if !(test -r ${GSL_PREFIX}/include/gsl/gsl_sf_hyperg.h); then
AC_MSG_ERROR(GSL cannot be found at the specified path!) AC_MSG_RESULT([no])
AC_MSG_ERROR([GSL cannot be found at the specified path!])
fi fi
AC_MSG_RESULT([using ${GSL_PREFIX} as prefix of the GSL installation...])], AC_MSG_RESULT([${GSL_PREFIX}])],
[PKG_CHECK_MODULES(GSL, gsl >= 1.9, [GSL_FOUND=1], [PKG_CHECK_MODULES(GSL, gsl >= 1.9, [GSL_FOUND=1],
[if test -r /usr/local/include/gsl/gsl_sf_hyperg.h; then [AC_MSG_CHECKING([whether GSL is installed in a standard location])
if test -r /usr/local/include/gsl/gsl_sf_hyperg.h; then
GSL_PREFIX="/usr/local" GSL_PREFIX="/usr/local"
AC_MSG_RESULT([using ${GSL_PREFIX} as prefix of the GSL installation... (ignore the negative check result just above)]) AC_MSG_RESULT([${GSL_PREFIX}])
elif test -r /usr/include/gsl/gsl_sf_hyperg.h; then elif test -r /usr/include/gsl/gsl_sf_hyperg.h; then
GSL_PREFIX="/usr" GSL_PREFIX="/usr"
AC_MSG_RESULT([using ${GSL_PREFIX} as prefix of the GSL installation... (ignore the negative check result just above)]) AC_MSG_RESULT([${GSL_PREFIX}])
elif test -r /sw/include/gsl/gsl_sf_hyperg.h; then elif test -r /sw/include/gsl/gsl_sf_hyperg.h; then
GSL_PREFIX="/sw" GSL_PREFIX="/sw"
AC_MSG_RESULT([using ${GSL_PREFIX} as prefix of the GSL installation... (ignore the negative check result just above)]) AC_MSG_RESULT([${GSL_PREFIX}])
elif test -r /opt/local/include/gsl/gsl_sf_hyperg.h; then elif test -r /opt/local/include/gsl/gsl_sf_hyperg.h; then
GSL_PREFIX="/opt/local" GSL_PREFIX="/opt/local"
AC_MSG_RESULT([using ${GSL_PREFIX} as prefix of the GSL installation... (ignore the negative check result just above)]) AC_MSG_RESULT([${GSL_PREFIX}])
else else
AC_MSG_RESULT([no])
AC_MSG_ERROR( AC_MSG_ERROR(
[GSL not found. Please call configure with the --with-gsl option. [GSL not found. Please call configure with the --with-gsl option.
This tells configure where to find the GSL C libraries and headers. This tells configure where to find the GSL C libraries and headers,
e.g. --with-gsl=/usr/local or --with-gsl=/usr] e.g. --with-gsl=/usr/local or --with-gsl=/usr]
) )
fi fi
@ -241,29 +256,33 @@ dnl -----------------------------------------------
BOOST_FOUND=0 BOOST_FOUND=0
AC_ARG_WITH([boostinc], AC_ARG_WITH([boostinc],
[AC_HELP_STRING([--with-boostinc],[path to the header files of the Boost installation, e.g. /usr/local/include or /usr/include])], [AC_HELP_STRING([--with-boostinc],[path to the header files of the BOOST installation, e.g. /usr/local/include or /usr/include])],
[BOOST_INCLUDE=$with_boostinc [BOOST_INCLUDE=$with_boostinc
if !(test -r ${BOOST_INCLUDE}/boost/spirit.hpp); then AC_MSG_CHECKING([whether BOOST can be found at the specified location])
AC_MSG_ERROR(Boost cannot be found at the specified path!) if !(test -r ${BOOST_INCLUDE}/boost/spirit.hpp) && !(test -r ${BOOST_INCLUDE}/boost/spirit/include/classic_spirit.hpp); then
AC_MSG_RESULT([no])
AC_MSG_ERROR([BOOST cannot be found at the specified path!])
fi fi
AC_MSG_RESULT([using ${BOOST_INCLUDE} as include path for the Boost headers...])], AC_MSG_RESULT([${BOOST_INCLUDE}])],
[PKG_CHECK_MODULES(BOOST, boost >= 1.30, [BOOST_FOUND=1], [PKG_CHECK_MODULES(BOOST, boost >= 1.30, [BOOST_FOUND=1],
[if test -r /usr/local/include/boost/spirit.hpp; then [AC_MSG_CHECKING([whether BOOST is installed in a standard location])
if test -r /usr/local/include/boost/spirit.hpp || test -r /usr/local/include/boost/spirit/include/classic_spirit.hpp; then
BOOST_INCLUDE="/usr/local/include" BOOST_INCLUDE="/usr/local/include"
AC_MSG_RESULT([using ${BOOST_INCLUDE} as include path for the Boost headers... (ignore the negative check result just above)]) AC_MSG_RESULT([${BOOST_INCLUDE}])
elif test -r /usr/include/boost/spirit.hpp; then elif test -r /usr/include/boost/spirit.hpp || test -r /usr/include/boost/spirit/include/classic_spirit.hpp; then
BOOST_INCLUDE="/usr/include" BOOST_INCLUDE="/usr/include"
AC_MSG_RESULT([using ${BOOST_INCLUDE} as include path for the Boost headers... (ignore the negative check result just above)]) AC_MSG_RESULT([${BOOST_INCLUDE}])
elif test -r /sw/include/boost/spirit.hpp; then elif test -r /sw/include/boost/spirit.hpp || test -r /sw/include/boost/spirit/include/classic_spirit.hpp; then
BOOST_INCLUDE="/sw/include" BOOST_INCLUDE="/sw/include"
AC_MSG_RESULT([using ${BOOST_INCLUDE} as include path for the Boost headers... (ignore the negative check result just above)]) AC_MSG_RESULT([${BOOST_INCLUDE}])
elif test -r /opt/local/include/boost/spirit.hpp; then elif test -r /opt/local/include/boost/spirit.hpp || test -r /opt/local/include/boost/spirit/include/classic_spirit.hpp; then
BOOST_INCLUDE="/opt/local/include" 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)]) AC_MSG_RESULT([${BOOST_INCLUDE}])
else else
AC_MSG_RESULT([no])
AC_MSG_ERROR( AC_MSG_ERROR(
[Boost not found. Please call configure with the --with-boostinc option. [BOOST not found. Please call configure with the --with-boostinc option.
This tells configure where to find the Boost C++ headers. This tells configure where to find the BOOST C++ headers,
e.g. --with-boostinc=/usr/local/include or --with-boostinc=/usr/include or --with-boostinc=/usr/include/boost-1_33_0] e.g. --with-boostinc=/usr/local/include or --with-boostinc=/usr/include or --with-boostinc=/usr/include/boost-1_33_0]
) )
fi fi
@ -289,52 +308,51 @@ ROOT_PATH([5.22/00], [], AC_MSG_ERROR([Either ROOT is not installed correctly or
ROOT_LIBS="-L${ROOTLIBDIR} ${ROOTGLIBS} ${ROOTAUXLIBS} -lMinuit2 -lMathMore -lXMLParser" ROOT_LIBS="-L${ROOTLIBDIR} ${ROOTGLIBS} ${ROOTAUXLIBS} -lMinuit2 -lMathMore -lXMLParser"
ROOT_CFLAGS="-I${ROOTINCDIR} ${ROOTCFLAGS} ${ROOTAUXCFLAGS}" ROOT_CFLAGS="-I${ROOTINCDIR} ${ROOTCFLAGS} ${ROOTAUXCFLAGS}"
## Check for Minuit2-library - not working at the moment, needs some more thoughts # Check if Minuit2 has been enabled during the ROOT configuration
#SAVED_CXXFLAGS="$CXXFLAGS"
#CXXFLAGS="$CXXFLAGS -I${ROOTINCDIR}/../include/Minuit2 $ROOT_CFLAGS" AC_MSG_CHECKING([for Minuit2 in ROOT])
#SAVED_LIBSS="$LIBS" if [[[ $(${ROOTCONF} --config) == *--enable-minuit2* ]]]; then
#LIBS="$LIBS $ROOT_LIBS" AC_MSG_RESULT([yes])
#AC_SEARCH_LIBS([MnMinimize], [Minuit2], [ROOT_LIBS="$ROOT_LIBS -lMinuit2 -lMathMore"], else
# [AC_MSG_ERROR([Minuit2 library not found... Please check!])], [-lMathMore]) AC_MSG_RESULT([no])
#CXXFLAGS="$SAVED_CXXFLAGS" AC_MSG_ERROR([Minuit2 not included in the ROOT installation... Please configure ROOT with the --enable-minuit2 option!])
#LIBS="$SAVED_LIBS" fi
AC_SUBST(ROOT_LIBS) AC_SUBST(ROOT_LIBS)
AC_SUBST(ROOT_CFLAGS) AC_SUBST(ROOT_CFLAGS)
# It should be checked properly for -lMinuit2 -- at the moment we simply look if a header file is present in the include directory:
AC_CHECK_FILE([${ROOTINCDIR}/../include/Minuit2/MnMinimize.h], AC_MSG_RESULT([Minuit2 headers found... OK]),
AC_MSG_WARN([Minuit2 headers not found... Please check!]))
dnl ----------------------------------------------- dnl -----------------------------------------------
dnl Ask user if BMWlibs should be built and where to find the CUBA installation dnl Ask user if BMWlibs should be built and where to find the CUBA installation
dnl ----------------------------------------------- dnl -----------------------------------------------
AC_ARG_ENABLE([BMWlibs], [AC_HELP_STRING([--enable-BMWlibs],[build optional BMW plug-ins (default: disabled)])], AC_ARG_ENABLE([BMWlibs], [AC_HELP_STRING([--enable-BMWlibs],[build optional BMW plug-ins [default=no]])],
[CUBA_FOUND=0 [CUBA_FOUND=0
AC_ARG_WITH([cuba], AC_ARG_WITH([cuba],
[AC_HELP_STRING([--with-cuba],[prefix of CUBA installation, e.g. /usr/local or /usr])], [AC_HELP_STRING([--with-cuba],[prefix of CUBA installation, e.g. /usr/local or /usr])],
[CUBA_PREFIX=$with_cuba [CUBA_PREFIX=$with_cuba
AC_MSG_CHECKING([whether CUBA can be found at the specified location])
if !(test -r ${CUBA_PREFIX}/include/cuba.h); then if !(test -r ${CUBA_PREFIX}/include/cuba.h); then
AC_MSG_ERROR(CUBA cannot be found at the specified path!) AC_MSG_RESULT([no])
AC_MSG_ERROR([CUBA cannot be found at the specified path!])
fi fi
AC_MSG_RESULT([using ${CUBA_PREFIX} as prefix of the CUBA installation...])], AC_MSG_RESULT([${CUBA_PREFIX}])],
[PKG_CHECK_MODULES(CUBA, cuba >= 1.6, [CUBA_FOUND=1], [PKG_CHECK_MODULES(CUBA, cuba >= 1.6, [CUBA_FOUND=1],
[if test -r /usr/local/include/cuba.h; then [AC_MSG_CHECKING([whether CUBA is installed in a standard location])
if test -r /usr/local/include/cuba.h; then
CUBA_PREFIX="/usr/local" CUBA_PREFIX="/usr/local"
AC_MSG_RESULT([using ${CUBA_PREFIX} as prefix of the CUBA installation... (ignore the negative check result just above)]) AC_MSG_RESULT([${CUBA_PREFIX}])
elif test -r /usr/include/cuba.h; then elif test -r /usr/include/cuba.h; then
CUBA_PREFIX="/usr" CUBA_PREFIX="/usr"
AC_MSG_RESULT([using ${CUBA_PREFIX} as prefix of the CUBA installation... (ignore the negative check result just above)]) AC_MSG_RESULT([${CUBA_PREFIX}])
elif test -r /sw/include/cuba.h; then elif test -r /sw/include/cuba.h; then
CUBA_PREFIX="/sw" CUBA_PREFIX="/sw"
AC_MSG_RESULT([using ${CUBA_PREFIX} as prefix of the CUBA installation... (ignore the negative check result just above)]) AC_MSG_RESULT([${CUBA_PREFIX}])
elif test -r /opt/local/include/cuba.h; then elif test -r /opt/local/include/cuba.h; then
CUBA_PREFIX="/opt/local" CUBA_PREFIX="/opt/local"
AC_MSG_RESULT([using ${CUBA_PREFIX} as prefix of the CUBA installation... (ignore the negative check result just above)]) AC_MSG_RESULT([${CUBA_PREFIX}])
else else
AC_MSG_RESULT([no])
AC_MSG_ERROR( AC_MSG_ERROR(
[CUBA not found. Please call configure with the --with-cuba option. [CUBA not found. Please call configure with the --with-cuba option.
This tells configure where to find the CUBA C library and header, This tells configure where to find the CUBA C library and header,
@ -362,7 +380,7 @@ dnl -----------------------------------------------
dnl Ask user if ASlibs should be built dnl Ask user if ASlibs should be built
dnl ----------------------------------------------- dnl -----------------------------------------------
AC_ARG_ENABLE([ASlibs], [AC_HELP_STRING([--enable-ASlibs],[build optional AS plug-ins (default: disabled)])],[BUILD_AS_LIBS=1], [BUILD_AS_LIBS=0]) AC_ARG_ENABLE([ASlibs], [AC_HELP_STRING([--enable-ASlibs],[build optional AS plug-ins [default=no]])],[BUILD_AS_LIBS=1], [BUILD_AS_LIBS=0])
dnl ----------------------------------------------- dnl -----------------------------------------------
dnl Set some paths and flags for PMusr, TLemRunHeader, Class_MuSR_PSI and mud dnl Set some paths and flags for PMusr, TLemRunHeader, Class_MuSR_PSI and mud
@ -436,23 +454,24 @@ AC_SUBST(LOCAL_LIB_LDFLAGS)
dnl ----------------------------------------------- dnl -----------------------------------------------
dnl Some standard checks for header files and libraries dnl Some standard checks for header files and libraries
dnl Since these checks are not further used at the moment, they are commented
dnl ----------------------------------------------- dnl -----------------------------------------------
# Checks for header files. # Checks for header files.
AC_HEADER_STDC #AC_HEADER_STDC
AC_CHECK_HEADERS([stddef.h stdlib.h string.h sys/time.h unistd.h]) #AC_CHECK_HEADERS([stddef.h stdlib.h string.h sys/time.h unistd.h])
# Checks for typedefs, structures, and compiler characteristics. # Checks for typedefs, structures, and compiler characteristics.
AC_HEADER_STDBOOL #AC_HEADER_STDBOOL
AC_C_CONST #AC_C_CONST
AC_C_INLINE #AC_C_INLINE
AC_TYPE_SIZE_T #AC_TYPE_SIZE_T
AC_HEADER_TIME #AC_HEADER_TIME
# Checks for library functions. # Checks for library functions.
AC_FUNC_MALLOC #AC_FUNC_MALLOC
AC_FUNC_STAT #AC_FUNC_STAT
AC_CHECK_FUNCS([floor gettimeofday memset pow sqrt strstr]) #AC_CHECK_FUNCS([floor gettimeofday memset pow sqrt strstr])
dnl ----------------------------------------------- dnl -----------------------------------------------