put guards around GSL code in moment_sequence.cpp. Makefile in src directory can now compile with GSL support

Author: terencewtli

src/Makefile

@@ -20,7 +20,7 @@ endif
 
 INCLUDEDIRS = smithlab_cpp
 INCLUDEARGS = $(addprefix -I, $(INCLUDEDIRS))
-LIBS = -lgsl -lgslcblas -lz
+LIBS = -lz
 CXX = g++
 CXXFLAGS = -std=c++11 -Wall
 
@@ -35,6 +35,11 @@ CXXFLAGS += -DHAVE_HTSLIB
 LIBS += -lhts
 endif
 
+ifdef HAVE_GSL
+CXXFLAGS += -DHAVE_GSL
+LIBS += -lgsl -lgslcblas
+endif
+
 all: $(PROGS)
 
 $(PROGS): $(addprefix smithlab_cpp/, \

src/moment_sequence.cpp

@@ -18,13 +18,15 @@
  *    along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#ifdef HAVE_GSL
 #include <gsl/gsl_sf_gamma.h>
 #include <gsl/gsl_vector.h>
 #include <gsl/gsl_matrix.h>
 #include <gsl/gsl_multiroots.h>
 #include <gsl/gsl_linalg.h>
 #include <gsl/gsl_poly.h>
 #include <gsl/gsl_randist.h>
+#endif 
 
 #include "moment_sequence.hpp"
 
@@ -35,6 +37,7 @@
 #include <iostream>
 #include <cassert>
 #include <algorithm>
+#include <cmath>
 
 using std::string;
 using std::vector;
@@ -45,8 +48,10 @@ using std::setprecision;
 using std::swap;
 using std::find_if;
 using std::transform;
+using std::isfinite;
+using std::isinf;
 
-
+#ifdef HAVE_GSL
 /////////////////////////////////////////////////////
 // test Hankel moment matrix
 // ensure moment sequence is positive definite
@@ -110,6 +115,7 @@ ensure_pos_def_mom_seq(vector <double> &moments,
 
   return max(hankel_dim - 1, min_hankel_dim);
 }
+#endif
 
 
 /////////////////////////////////////////////////////