From ed8ce18422d243e63bef210e1af055533bd7eaeb Mon Sep 17 00:00:00 2001
From: sspagnol <s.spagnol@aims.gov.au>
Date: Tue, 2 Oct 2018 12:16:07 +0800
Subject: [PATCH] GSL include path wasn't passed to model/lib/da/makefile.in,
 also make naming consistent with GSLLIB i.e. GSL_INC -> GSLINC

---
 conf/configure           | 6 +++---
 conf/configure.in        | 4 ++--
 model/lib/da/makefile.in | 3 ++-
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/conf/configure b/conf/configure
index 1274c20..c4c9707 100755
--- a/conf/configure
+++ b/conf/configure
@@ -4518,10 +4518,10 @@ found_header=no
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $found_header" >&5
 $as_echo "$found_header" >&6; }
 
-test "$found_header" = yes && GSL_INC=$header_path
-test "$found_header" = no && GSL_INC=
+test "$found_header" = yes && GSLINC=$header_path
+test "$found_header" = no && GSLINC=
 
-       if test -z "$GSL_INC" ; then
+       if test -z "$GSLINC" ; then
        	 as_fn_error $? "'Unable to find the gsl headers as needed by DA'" "$LINENO" 5
        fi
        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -lgsl" >&5
diff --git a/conf/configure.in b/conf/configure.in
index b984e3f..8d52576 100644
--- a/conf/configure.in
+++ b/conf/configure.in
@@ -303,8 +303,8 @@ if test "$HAVE_DA"; then
        DAINC=-I../${MODEL_LIB_OFFSET}${DADIR}/include
        DALIB="-L../${MODEL_LIB_OFFSET}${DADIR} -lda"
        dnl Locate GSL
-       AC_FIND_HEADER(gsl/gsl_matrix.h, GSL_INC=$header_path, GSL_INC=) 
-       if test -z "$GSL_INC" ; then
+       AC_FIND_HEADER(gsl/gsl_matrix.h, GSLINC=$header_path, GSLINC=) 
+       if test -z "$GSLINC" ; then
        	 AC_MSG_ERROR('Unable to find the gsl headers as needed by DA')
        fi
        AC_FIND_LIB(gsl, GSLLIB=$lib_path, GSLLIB=)
diff --git a/model/lib/da/makefile.in b/model/lib/da/makefile.in
index 2c59501..96ef721 100644
--- a/model/lib/da/makefile.in
+++ b/model/lib/da/makefile.in
@@ -36,12 +36,13 @@ NETCDFINC=@NETCDFINC@
 NETCDFLIB=@NETCDFLIB@
 EMSINC=@EMSLIBINC@
 EMSLIB=@EMSLIBLIB@
+GSLINC=@GSLINC@
 GSLLIB=@GSLLIB@
 MLIB=-lm
 
 BASEINC=
 
-INCS=-Iinclude $(EMSINC) $(BASEINC) $(NETCDFINC) $(GSL_INC)
+INCS=-Iinclude $(EMSINC) $(BASEINC) $(NETCDFINC) $(GSLINC)
 
 # Make a list of all c-files
 SRCS_C   := $(wildcard *.c)