[Genabel-commits] r998 - branches/ProbABEL-refactoring/ProbABEL pkg/ProbABEL

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

Author: lckarssen
Date: 2012-11-04 14:42:07 +0100 (Sun, 04 Nov 2012)
New Revision: 998

Modified:
   branches/ProbABEL-refactoring/ProbABEL/configure.ac
   pkg/ProbABEL/configure.ac
Log:
- In both ProbABEL trunk and the refactoring branch set the default language for autoconf tests to C++, this makes the tests for functions like pow and floor work. 
- In the configure.ac of the branch add a check for floor (as suggested by running autoscan)


Modified: branches/ProbABEL-refactoring/ProbABEL/configure.ac
===================================================================
--- branches/ProbABEL-refactoring/ProbABEL/configure.ac	2012-11-03 14:07:48 UTC (rev 997)
+++ branches/ProbABEL-refactoring/ProbABEL/configure.ac	2012-11-04 13:42:07 UTC (rev 998)
@@ -24,6 +24,11 @@
 # with its own defaults
 AC_PROG_CXX
 
+# Since most of our code is in C++, set that language as the default
+# for the subsequent checks
+AC_LANG_PUSH([C++])
+
+
 # Checks for libraries.
 
 # Checks for header files.
@@ -54,9 +59,7 @@
     dnl AC_SUBST([EIGEN_CFLAGS])
 
     # Check for the EIGEN header files
-    AC_LANG_PUSH([C++])
     AC_CHECK_HEADERS([Eigen/Dense Eigen/LU])
-    AC_LANG_POP([C++])
 
     if test x$ac_cv_header_Eigen_Dense = xno; then
       AC_MSG_ERROR([Could not find the Eigen header files. Did you specify \
@@ -78,7 +81,7 @@
 # Checks for library functions.
 AC_FUNC_ERROR_AT_LINE
 AC_FUNC_MALLOC
-AC_CHECK_FUNCS([pow putenv sqrt strdup strncasecmp])
+AC_CHECK_FUNCS([pow putenv sqrt strdup strncasecmp floor])
 
 # Check if we can use large (>2GB) files on 32 bit platforms
 AC_SYS_LARGEFILE

Modified: pkg/ProbABEL/configure.ac
===================================================================
--- pkg/ProbABEL/configure.ac	2012-11-03 14:07:48 UTC (rev 997)
+++ pkg/ProbABEL/configure.ac	2012-11-04 13:42:07 UTC (rev 998)
@@ -24,6 +24,10 @@
 # with its own defaults
 AC_PROG_CXX
 
+# Since most of our code is in C++, set that language as the default
+# for the subsequent checks
+AC_LANG_PUSH([C++])
+
 # Checks for libraries.
 
 # Checks for header files.