[Genabel-commits] r1727 - in branches/ProbABEL-pvals/ProbABEL: . src

[noreply at r-forge.r-project.org]

Author: lckarssen
Date: 2014-05-13 23:22:31 +0200 (Tue, 13 May 2014)
New Revision: 1727

Modified:
   branches/ProbABEL-pvals/ProbABEL/configure.ac
   branches/ProbABEL-pvals/ProbABEL/src/Makefile.am
Log:
The change from configure option WITH_BOOST to WITH_BOOST_MATH in r1720 wasn't complete. This commit fixes that. The most important part I forgot was to propagate the WITH_BOOST_MATH option to src/Makefile.am, so in the end the -DWITH_BOOST_MATH flag was never set.


Modified: branches/ProbABEL-pvals/ProbABEL/configure.ac
===================================================================
--- branches/ProbABEL-pvals/ProbABEL/configure.ac	2014-05-13 21:17:30 UTC (rev 1726)
+++ branches/ProbABEL-pvals/ProbABEL/configure.ac	2014-05-13 21:22:31 UTC (rev 1727)
@@ -97,7 +97,7 @@
                )
 )
 
-if test "x$with_boost" != "xno"; then
+if test "x$with_boost_math" != "xno"; then
     AC_MSG_NOTICE([building using the Boost Math library enabled])
 
     AC_ARG_WITH([boost-include-path],
@@ -120,7 +120,7 @@
    AC_MSG_NOTICE([not using the Boost Math libraries, so no p-values in the \
 output])
 fi
-AM_CONDITIONAL([WITH_BOOST_MATH], test "x$with_boost" != "xno")
+AM_CONDITIONAL([WITH_BOOST_MATH], test "x$with_boost_math" != "xno")
 
 
 # Checks for typedefs, structures, and compiler characteristics.

Modified: branches/ProbABEL-pvals/ProbABEL/src/Makefile.am
===================================================================
--- branches/ProbABEL-pvals/ProbABEL/src/Makefile.am	2014-05-13 21:17:30 UTC (rev 1726)
+++ branches/ProbABEL-pvals/ProbABEL/src/Makefile.am	2014-05-13 21:22:31 UTC (rev 1727)
@@ -68,10 +68,10 @@
 pacoxph_CFLAGS = -DCOXPH -I $(top_srcdir)/src/include $(AM_CFLAGS)
 pacoxph_SOURCES += $(EIGENFILES)
 
-if WITH_BOOST
-palinear_CXXFLAGS += -DWITH_BOOST
-palogist_CXXFLAGS += -DWITH_BOOST
-pacoxph_CXXFLAGS += -DWITH_BOOST
+if WITH_BOOST_MATH
+palinear_CXXFLAGS += -DWITH_BOOST_MATH
+palogist_CXXFLAGS += -DWITH_BOOST_MATH
+pacoxph_CXXFLAGS += -DWITH_BOOST_MATH
 endif
 
 extract_snp_SOURCES = extract-snp.cpp $(FVSRC) $(FVHEADERS)