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

Fixed some bugs in the configure-generation introduced with the cuba-support

Browse Source
This commit is contained in:
Bastian M. Wojek 2010-01-07 19:58:37 +00:00
parent 6837ba3cdf
commit b321f52dd1
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
configure.ac
View File

@ -146,7 +146,7 @@ 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++])
AC_PROG_LN_S AC_PROG_LN_S
AC_PROG_INSTALL AC_PROG_INSTALL
@ -378,13 +378,15 @@ AC_ARG_ENABLE([BMWlibs], [AC_HELP_STRING([--enable-BMWlibs],[build optional BMW
] ]
) )
if test "${BUILD_CUBA}" -eq 1; then if test "${BUILD_CUBA}" = "1"; then
if test "x$GCC" = "xyes" ; then if test "x$GCC" = "xyes" ; then
CUBA_BUILD_CFLAGS=${USER_CFLAGS:--O3 -fomit-frame-pointer -ffast-math} CUBA_BUILD_CFLAGS=${USER_CFLAGS:--O3 -fomit-frame-pointer -ffast-math}
else else
CUBA_BUILD_CFLAGS=${USER_CFLAGS:--O} CUBA_BUILD_CFLAGS=${USER_CFLAGS:--O}
fi fi
AC_LANG_PUSH([C])
AC_C_CONST AC_C_CONST
AC_C_INLINE AC_C_INLINE
AC_C_LONG_DOUBLE AC_C_LONG_DOUBLE
@ -419,6 +421,8 @@ AC_ARG_ENABLE([BMWlibs], [AC_HELP_STRING([--enable-BMWlibs],[build optional BMW
AC_DEFINE_UNQUOTED([NCOMP], [$MAXCOMP], [Maximum number of dimensions])] AC_DEFINE_UNQUOTED([NCOMP], [$MAXCOMP], [Maximum number of dimensions])]
) )
AC_LANG_POP([C])
CUBA_SRCDIR="$(pwd)/src/external/libCuba/src" CUBA_SRCDIR="$(pwd)/src/external/libCuba/src"
CUBA_LIBS="${CUBA_SRCDIR}/libcuba.la" CUBA_LIBS="${CUBA_SRCDIR}/libcuba.la"
CUBA_CFLAGS="-I${CUBA_SRCDIR}" CUBA_CFLAGS="-I${CUBA_SRCDIR}"
@ -473,7 +477,7 @@ PMUSR_CFLAGS="-I${SRCDIR}/include"
AC_SUBST(PMUSR_LIBS) AC_SUBST(PMUSR_LIBS)
AC_SUBST(PMUSR_CFLAGS) AC_SUBST(PMUSR_CFLAGS)
if test "${BUILD_BMW_LIBS}" -eq 1; then if test "${BUILD_BMW_LIBS}" = "1"; then
TFITPOFB_SRCDIR="${SRCDIR}/external/TFitPofB-lib" TFITPOFB_SRCDIR="${SRCDIR}/external/TFitPofB-lib"
TFITPOFB_LIBS="${TFITPOFB_SRCDIR}/classes/libTFitPofB.la" TFITPOFB_LIBS="${TFITPOFB_SRCDIR}/classes/libTFitPofB.la"
TFITPOFB_CFLAGS="-I${TFITPOFB_SRCDIR}/include" TFITPOFB_CFLAGS="-I${TFITPOFB_SRCDIR}/include"
@ -543,9 +547,9 @@ dnl -----------------------------------------------
dnl Specify the files that are going to be created by configure dnl Specify the files that are going to be created by configure
dnl ----------------------------------------------- dnl -----------------------------------------------
AM_CONDITIONAL([BUILD_CUBALIB], [test "${BUILD_CUBA}" -eq 1]) AM_CONDITIONAL([BUILD_CUBALIB], [test "${BUILD_CUBA}" = "1"])
AM_CONDITIONAL([BUILD_BMWLIBS], [test "${BUILD_BMW_LIBS}" -eq 1]) AM_CONDITIONAL([BUILD_BMWLIBS], [test "${BUILD_BMW_LIBS}" = "1"])
AM_CONDITIONAL([BUILD_ASLIBS], [test "${BUILD_AS_LIBS}" -eq 1]) AM_CONDITIONAL([BUILD_ASLIBS], [test "${BUILD_AS_LIBS}" = "1"])
AC_CONFIG_FILES([Makefile \ AC_CONFIG_FILES([Makefile \
src/Makefile \ src/Makefile \