mirror of
https://github.com/TREX-CoE/qmckl.git
synced 2024-12-23 04:44:03 +01:00
Removed advanced chameleon configure options in this user friendly build. #22
This commit is contained in:
parent
5461d75161
commit
062a1b8b55
10
README.md
10
README.md
@ -34,16 +34,6 @@ make
|
|||||||
make check
|
make check
|
||||||
```
|
```
|
||||||
|
|
||||||
### Building with Chameleon Library
|
|
||||||
|
|
||||||
```
|
|
||||||
./autogen.sh
|
|
||||||
LIBCHAMELEON_LIBS="$(pkg-config --libs chameleon)" LIBCHAMELEON_CFLAGS="$(pkg-config --cflags chameleon)" QMCKL_DEVEL=1 ./configure --prefix=$PWD/_install --enable-silent-rules --enable-maintainer-mode --with-chameleon=yes
|
|
||||||
|
|
||||||
make
|
|
||||||
make check
|
|
||||||
```
|
|
||||||
|
|
||||||
## For users
|
## For users
|
||||||
|
|
||||||
Obtain a source distribution and run
|
Obtain a source distribution and run
|
||||||
|
54
configure.ac
54
configure.ac
@ -98,60 +98,6 @@ AC_CHECK_LIB([pthread], [pthread_create])
|
|||||||
# CFLAGS="${CFLAGS} ${OPENMP_CFLAGS}"
|
# CFLAGS="${CFLAGS} ${OPENMP_CFLAGS}"
|
||||||
#fi
|
#fi
|
||||||
|
|
||||||
|
|
||||||
# CHAMELEON
|
|
||||||
AC_ARG_WITH(chameleon,
|
|
||||||
AS_HELP_STRING([--without-chameleon],
|
|
||||||
[Do not use Chameleon. Default: auto-detect]), [
|
|
||||||
case "$with_chameleon" in
|
|
||||||
yes|no)
|
|
||||||
: # Nothing special to do here
|
|
||||||
;;
|
|
||||||
*)
|
|
||||||
if test ! -d "$withval" ; then
|
|
||||||
AC_MSG_ERROR([--with-chameleon path does not point to a directory])
|
|
||||||
fi
|
|
||||||
LIBCHAMELEON_PATH="-L$with_chameleon/lib"
|
|
||||||
CFLAGS="$LIBCHAMELEON_CFLAGS $CFLAGS"
|
|
||||||
CXXFLAGS="-I$with_chameleon/include $CXXFLAGS"
|
|
||||||
CPPFLAGS="$LIBCHAMELEON_CFLAGS $CPPFLAGS"
|
|
||||||
esac
|
|
||||||
])
|
|
||||||
AH_TEMPLATE(USE_CHAMELEON,[Chameleon support is available])
|
|
||||||
|
|
||||||
if test "x$with_chameleon" != "xno"; then
|
|
||||||
LIBS="$LIBS $LIBCHAMELEON_PATH"
|
|
||||||
|
|
||||||
if test "x$with_chameleon" = "xyes" -a "x$LIBCHAMELEON_LIBS" = "x"; then
|
|
||||||
AC_MSG_ERROR([Required Chameleon library not found])
|
|
||||||
fi
|
|
||||||
if test "x$LIBCHAMELEON_LIBS" != "x" ; then
|
|
||||||
CFLAGS="$LIBCHAMELEON_CFLAGS $CFLAGS"
|
|
||||||
CXXFLAGS="$LIBCHAMELEON_CFLAGS $CXXFLAGS"
|
|
||||||
CPPFLAGS="$LIBCHAMELEON_CFLAGS $CPPFLAGS"
|
|
||||||
CHAMELEONLIB="$LIBCHAMELEON_PATH $LIBCHAMELEON_LIBS"
|
|
||||||
AC_DEFINE(USE_CHAMELEON,1,[CHAMELEON support is available])
|
|
||||||
with_CHAMELEON=yes
|
|
||||||
else
|
|
||||||
with_CHAMELEON=no
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
AC_MSG_NOTICE([CHAMELEON library support: ${with_CHAMELEON:=auto} ${LIBCHAMELEON_PATH} ${LIBCHAMELEON_LIBS}])
|
|
||||||
AC_SUBST(CHAMELEONLIB)
|
|
||||||
# auto-detect using pkg-config
|
|
||||||
PKG_CHECK_MODULES([LIBCHAMELEON],[chameleon >= 1.0.0],,[
|
|
||||||
|
|
||||||
## something went wrong.
|
|
||||||
## try to find the package without pkg-config
|
|
||||||
|
|
||||||
## check that the library is actually new enough.
|
|
||||||
## by testing for a 1.0.0+ function which we use
|
|
||||||
AC_CHECK_LIB(chameleon,CHAMELEON_finalize,[LIBCHAMELEON_LIBS="-lchameleon"])
|
|
||||||
])
|
|
||||||
if test "x$LIBCHAMELEON_LIBS" != "x" ; then
|
|
||||||
AC_CHECK_HEADERS(chameleon.h)
|
|
||||||
fi
|
|
||||||
|
|
||||||
## BLAS
|
## BLAS
|
||||||
#AX_BLAS([], [AC_MSG_ERROR([BLAS was not found.])])
|
#AX_BLAS([], [AC_MSG_ERROR([BLAS was not found.])])
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user