mirror of
https://github.com/nasa/trick.git
synced 2024-12-18 20:57:55 +00:00
1232 1236 ac lib check and linguist (#1237)
* #1232 add lib paths to LDFLAGS in configure script #1236 ignore configure on github by adding linguist commands to .gitattributes Closes #1232 closes #1236 Co-authored-by: Fennell, Scott P 263712616 <scott.p.fennell@nasa.gov>
This commit is contained in:
parent
2d32abf047
commit
087c2adc4a
2
.gitattributes
vendored
2
.gitattributes
vendored
@ -15,3 +15,5 @@ users_guide.html export-ignore
|
|||||||
MonteCarlo_Presentation.pptx export-ignore
|
MonteCarlo_Presentation.pptx export-ignore
|
||||||
Trick_07_to_10.pptx export-ignore
|
Trick_07_to_10.pptx export-ignore
|
||||||
trick_source/data_products/DPX/test export-ignore
|
trick_source/data_products/DPX/test export-ignore
|
||||||
|
configure linguist-generated=true
|
||||||
|
*.dr linguist-language=Python
|
||||||
|
@ -43,7 +43,10 @@ AC_DEFUN([AX_HDF5_HOME],[
|
|||||||
]
|
]
|
||||||
)
|
)
|
||||||
AS_IF([test "$HDF5_HOME" != ""],
|
AS_IF([test "$HDF5_HOME" != ""],
|
||||||
[AC_CHECK_LIB(hdf5, main, [],AC_MSG_ERROR([could not find libhdf5]))]
|
[
|
||||||
|
LDFLAGS="${LDFLAGS} -L${HDF5_HOME}/lib"
|
||||||
|
AC_CHECK_LIB(hdf5, main, [],AC_MSG_ERROR([could not find libhdf5]))
|
||||||
|
]
|
||||||
[]
|
[]
|
||||||
)
|
)
|
||||||
AC_SUBST([HDF5_HOME])
|
AC_SUBST([HDF5_HOME])
|
||||||
@ -65,7 +68,10 @@ AC_DEFUN([AX_GSL_HOME],[
|
|||||||
[AC_CHECK_HEADER(gsl/gsl_rng.h, [GSL_HOME="/usr"], [GSL_HOME=""])]
|
[AC_CHECK_HEADER(gsl/gsl_rng.h, [GSL_HOME="/usr"], [GSL_HOME=""])]
|
||||||
)
|
)
|
||||||
AS_IF([test "$GSL_HOME" != ""],
|
AS_IF([test "$GSL_HOME" != ""],
|
||||||
[AC_CHECK_LIB(gsl, main, [],AC_MSG_ERROR([could not find libgsl]),[-lgslcblas])],
|
[
|
||||||
|
LDFLAGS="${LDFLAGS} -L${GSL_HOME}/lib"
|
||||||
|
AC_CHECK_LIB(gsl, main, [],AC_MSG_ERROR([could not find libgsl]),[-lgslcblas])
|
||||||
|
],
|
||||||
[]
|
[]
|
||||||
)
|
)
|
||||||
AC_SUBST([GSL_HOME])
|
AC_SUBST([GSL_HOME])
|
||||||
|
Loading…
Reference in New Issue
Block a user