portelli/Grid
1
0
Fork 0
mirror of https://github.com/paboyle/Grid.git synced 2024-11-10 07:55:35 +00:00
Code Releases Activity

Merge branch 'develop' of https://github.com/paboyle/Grid into develop

Browse Source
This commit is contained in:
Peter Boyle 2020-04-29 03:05:36 -04:00
commit 103e7ae2f0
2 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
configure.ac
View File

@ -547,6 +547,7 @@ DX_INIT_DOXYGEN([$PACKAGE_NAME], [doxygen.cfg])
############### Ouput ############### Ouput
cwd=`pwd -P`; cd ${srcdir}; abs_srcdir=`pwd -P`; cd ${cwd} cwd=`pwd -P`; cd ${srcdir}; abs_srcdir=`pwd -P`; cd ${cwd}
GRID_CXX="$CXX" GRID_CXX="$CXX"
GRID_CXXLD="$CXXLD"
GRID_CXXFLAGS="$AM_CXXFLAGS $CXXFLAGS" GRID_CXXFLAGS="$AM_CXXFLAGS $CXXFLAGS"
GRID_LDFLAGS="$AM_LDFLAGS $LDFLAGS" GRID_LDFLAGS="$AM_LDFLAGS $LDFLAGS"
GRID_LIBS=$LIBS GRID_LIBS=$LIBS
@ -561,6 +562,7 @@ AC_SUBST([AM_CFLAGS])
AC_SUBST([AM_CXXFLAGS]) AC_SUBST([AM_CXXFLAGS])
AC_SUBST([AM_LDFLAGS]) AC_SUBST([AM_LDFLAGS])
AC_SUBST([GRID_CXX]) AC_SUBST([GRID_CXX])
AC_SUBST([GRID_CXXLD])
AC_SUBST([GRID_CXXFLAGS]) AC_SUBST([GRID_CXXFLAGS])
AC_SUBST([GRID_LDFLAGS]) AC_SUBST([GRID_LDFLAGS])
AC_SUBST([GRID_LIBS]) AC_SUBST([GRID_LIBS])

6
grid-config.in
View File

@ -19,6 +19,8 @@ Known values for OPTION are:
--help display this help and exit --help display this help and exit
--version output version information --version output version information
--git print git revision --git print git revision
--cxx print c++ compiler (may include some flags and spaces)
--cxxld print c++ linker (may include some flags and spaces)
EOF EOF
@ -65,6 +67,10 @@ while test $# -gt 0; do
echo @GRID_CXX@ echo @GRID_CXX@
;; ;;
--cxxld)
echo @GRID_CXXLD@
;;
--ldflags) --ldflags)
echo @GRID_LDFLAGS@ echo @GRID_LDFLAGS@
;; ;;