ExternalVendorCode/trick
1
0
Fork 0
mirror of https://github.com/nasa/trick.git synced 2024-12-19 21:27:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Configure script does not set up GSL correctly

Browse Source 
The configure script does not set up the defines for GSL correctly which causes our GSL
support code not to compile correctly. Fixed it.

refs #143
This commit is contained in:
Alex Lin 2015-11-18 08:30:21 -06:00
parent 3c24d80383
commit ca51142553
3 changed files with 22 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
autoconf/configure.ac
View File

@ -78,7 +78,7 @@ AC_DEFUN([AX_GSL_HOME],[
[GSL_HOME="$withval"
AC_CHECK_FILE([$GSL_HOME/include/gsl],
[],
AC_MSG_ERROR([could not find $GSL_HOME/sample/bcuser.h])
AC_MSG_ERROR([could not find $GSL_HOME/include/gsl])
)
],
[GSL_HOME=""]

21
share/trick/makefiles/Makefile.common
View File

@ -129,18 +129,31 @@ endif
TRICK_EXEC_LINK_LIBS += ${HDF5_LIB}
endif
HAVE_GSL := $(shell test -e ${GSL_HOME}/include/gsl && echo "1")
ifeq ($(HAVE_GSL),1)
ifneq ($(GSL_HOME),)
ifneq ($(GSL_HOME),/usr)
HAVE_GSL_HOME_LIB64 := $(shell test -e ${GSL_HOME}/lib64 && echo "1")
HAVE_GSL_HOME_LIB64 := $(shell test -e ${GSL_HOME}/lib64 && echo "1")
ifeq ($(HAVE_GSL_HOME_LIB64),1)
TRICK_EXEC_LINK_LIBS += -L$(GSL_HOME)/lib64
endif
TRICK_EXEC_LINK_LIBS += -L$(GSL_HOME)/lib
TRICK_EXEC_LINK_LIBS += -L$(GSL_HOME)/lib
endif
TRICK_EXEC_LINK_LIBS += -lgsl -lgslcblas
TRICK_SYSTEM_CFLAGS += -D_HAVE_GSL
TRICK_SYSTEM_CXXFLAGS += -D_HAVE_GSL
endif
#HAVE_GSL := $(shell test -e ${GSL_HOME}/include/gsl && echo "1")
#ifeq ($(HAVE_GSL),1)
# ifneq ($(GSL_HOME),/usr)
# HAVE_GSL_HOME_LIB64 := $(shell test -e ${GSL_HOME}/lib64 && echo "1")
# ifeq ($(HAVE_GSL_HOME_LIB64),1)
# TRICK_EXEC_LINK_LIBS += -L$(GSL_HOME)/lib64
# endif
# TRICK_EXEC_LINK_LIBS += -L$(GSL_HOME)/lib
# endif
# TRICK_EXEC_LINK_LIBS += -lgsl -lgslcblas
#endif
TRICK_INCLUDE = $(shell $(PERL) -e '@inc_paths = "${TRICK_CFLAGS}" =~ /-I\s*(\S+)/g ; foreach $$i (@inc_paths) { print "-I$$i " if (-e $$i)}')
TRICK_INCLUDE += $(shell $(PERL) -e '@inc_paths = "${TRICK_SYSTEM_CFLAGS}" =~ /-I\s*(\S+)/g ; foreach $$i (@inc_paths) { print "-I$$i " if (-e $$i)}')
TRICK_DEFINES = $(shell $(PERL) -e '@defines = "${TRICK_CFLAGS}" =~ /-D\s*(\S+)/g ; foreach $$i (@defines) { print "-D$$i "}')

4
trick_source/trick_swig/Makefile
View File

@ -40,6 +40,10 @@ TRICK_CXXFLAGS += -I$(HDF5)/include
endif
endif
ifneq ($(GSL_HOME),)
SWIG_DEFS += -D_HAVE_GSL
endif
ifeq ($(USE_ER7_UTILS_INTEGRATORS), 1)
SWIG_DEFS += -DUSE_ER7_UTILS_INTEGRATORS
endif