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

Added ROOTAUXLIBS and ROOTAUXCFLAGS to the Makefiles

Browse Source
This commit is contained in:
Bastian M. Wojek 2009-06-22 13:54:55 +00:00
parent a983753912
commit bcebaacfd9
5 changed files with 17 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
autogen.sh
View File

@ -3,8 +3,7 @@
# autogen.sh # autogen.sh
# #
# Copyright (c) 2009 BMW # Copyright (c) 2009 BMW
# # Copyright (c) 2002 Daniel Elstner <daniel.elstner@gmx.net>
# Based on an autogen.sh script written by Daniel Elstner <daniel.elstner@gmx.net>
# #
# This program is free software; you can redistribute it and/or modify # This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License VERSION 2 as # it under the terms of the GNU General Public License VERSION 2 as

27
configure.ac
View File

@ -95,13 +95,13 @@ AC_ARG_WITH([fftw3],
[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 [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 no just above)]) AC_MSG_RESULT([using ${FFTW3_PREFIX} as prefix of the FFTW3 installation... (ignore the negative check result just above)])
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 no just above)]) AC_MSG_RESULT([using ${FFTW3_PREFIX} as prefix of the FFTW3 installation... (ignore the negative check result just above)])
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 no just above)]) AC_MSG_RESULT([using ${FFTW3_PREFIX} as prefix of the FFTW3 installation... (ignore the negative check result just above)])
else else
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.
@ -137,13 +137,13 @@ AC_ARG_WITH([gsl],
[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 [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 no just above)]) AC_MSG_RESULT([using ${GSL_PREFIX} as prefix of the GSL installation... (ignore the negative check result just above)])
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 no just above)]) AC_MSG_RESULT([using ${GSL_PREFIX} as prefix of the GSL installation... (ignore the negative check result just above)])
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 no just above)]) AC_MSG_RESULT([using ${GSL_PREFIX} as prefix of the GSL installation... (ignore the negative check result just above)])
else else
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.
@ -179,13 +179,13 @@ AC_ARG_WITH([boostinc],
[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 [if test -r /usr/local/include/boost/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 no just above)]) AC_MSG_RESULT([using ${BOOST_INCLUDE} as include path for the Boost headers... (ignore the negative check result just above)])
elif test -r /usr/include/boost/spirit.hpp; then elif test -r /usr/include/boost/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 no just above)]) AC_MSG_RESULT([using ${BOOST_INCLUDE} as include path for the Boost headers... (ignore the negative check result just above)])
elif test -r /sw/include/boost/spirit.hpp; then elif test -r /sw/include/boost/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 no just above)]) AC_MSG_RESULT([using ${BOOST_INCLUDE} as include path for the Boost headers... (ignore the negative check result just above)])
else else
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.
@ -212,11 +212,16 @@ dnl -----------------------------------------------
ROOT_PATH([5.22/00], [], AC_MSG_ERROR([Either ROOT is not installed correctly or the version is too old... please check!])) ROOT_PATH([5.22/00], [], AC_MSG_ERROR([Either ROOT is not installed correctly or the version is too old... please check!]))
ROOT_LIBS="-L@ROOTLIBDIR@ @ROOTGLIBS@ -lMinuit2 -lMathMore -lXMLParser" ROOT_LIBS="-L${ROOTLIBDIR} ${ROOTGLIBS} ${ROOTAUXLIBS} -lMinuit2 -lMathMore -lXMLParser"
ROOT_CFLAGS="-I@ROOTINCDIR@ @ROOTCFLAGS@" ROOT_CFLAGS="-I${ROOTINCDIR} ${ROOTCFLAGS} ${ROOTAUXCFLAGS}"
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_ERROR([Minuit2 headers not found... Please check!]))
dnl ----------------------------------------------- dnl -----------------------------------------------
dnl Set some paths and flags for PMusr and TLemRunHeader dnl Set some paths and flags for PMusr and TLemRunHeader

4
src/Makefile.am
View File

@ -14,10 +14,6 @@ xml_DATA = musrfit_startup.xml
LIBADD = $(PMUSR_LIBS) $(LEM_LIBS) LIBADD = $(PMUSR_LIBS) $(LEM_LIBS)
# The ROOT flags and libs have to be specified here... different automake-versions do not expand the @...@ in the variable of configure.ac
ROOT_CFLAGS = -I@ROOTINCDIR@ @ROOTCFLAGS@
ROOT_LIBS = -L@ROOTLIBDIR@ @ROOTGLIBS@ -lMinuit2 -lMathMore -lXMLParser
AM_CXXFLAGS = $(LOCAL_BIN_CXXFLAGS) AM_CXXFLAGS = $(LOCAL_BIN_CXXFLAGS)
AM_LDFLAGS = $(LOCAL_BIN_LDFLAGS) AM_LDFLAGS = $(LOCAL_BIN_LDFLAGS)
INCLUDES = $(PMUSR_CFLAGS) $(FFTW3_CFLAGS) $(GSL_CFLAGS) $(BOOST_CFLAGS) $(ROOT_CFLAGS) INCLUDES = $(PMUSR_CFLAGS) $(FFTW3_CFLAGS) $(GSL_CFLAGS) $(BOOST_CFLAGS) $(ROOT_CFLAGS)

4
src/classes/Makefile.am
View File

@ -67,10 +67,6 @@ ext_cpp_sources = $(ext_source_dir)/MuSR_td_PSI_bin.cpp
include_HEADERS = $(h_sources) $(ext_source_dir)/MuSR_td_PSI_bin.h include_HEADERS = $(h_sources) $(ext_source_dir)/MuSR_td_PSI_bin.h
noinst_HEADERS = $(h_linkdef) $(dict_h_sources) $(ext_source_dir)/tydefs.h noinst_HEADERS = $(h_linkdef) $(dict_h_sources) $(ext_source_dir)/tydefs.h
# The ROOT flags and libs have to be specified here... different automake-versions do not expand the @...@ in the variable of configure.ac
ROOT_CFLAGS = -I@ROOTINCDIR@ @ROOTCFLAGS@
ROOT_LIBS = -L@ROOTLIBDIR@ @ROOTGLIBS@ -lMinuit2 -lMathMore -lXMLParser
INCLUDES = -I$(top_srcdir)/src/include -I$(ext_source_dir) $(LEM_CFLAGS) $(FFTW3_CFLAGS) $(GSL_CFLAGS) $(BOOST_CFLAGS) $(ROOT_CFLAGS) INCLUDES = -I$(top_srcdir)/src/include -I$(ext_source_dir) $(LEM_CFLAGS) $(FFTW3_CFLAGS) $(GSL_CFLAGS) $(BOOST_CFLAGS) $(ROOT_CFLAGS)
AM_CXXFLAGS = $(LOCAL_LIB_CXXFLAGS) AM_CXXFLAGS = $(LOCAL_LIB_CXXFLAGS)

3
src/external/TLemRunHeader/Makefile.am vendored
View File

@ -23,9 +23,6 @@ dict_cpp_sources = \
include_HEADERS = $(h_sources) include_HEADERS = $(h_sources)
noinst_HEADERS = $(h_linkdef) $(dict_h_sources) noinst_HEADERS = $(h_linkdef) $(dict_h_sources)
ROOT_CFLAGS = -I@ROOTINCDIR@ @ROOTCFLAGS@
ROOT_LIBS = -L@ROOTLIBDIR@ @ROOTGLIBS@
INCLUDES = -I. $(ROOT_CFLAGS) INCLUDES = -I. $(ROOT_CFLAGS)
AM_CXXFLAGS = $(LOCAL_LIB_CXXFLAGS) AM_CXXFLAGS = $(LOCAL_LIB_CXXFLAGS)