[Genabel-commits] r1111 - pkg/ProbABEL

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

Author: lckarssen
Date: 2013-02-28 14:32:11 +0100 (Thu, 28 Feb 2013)
New Revision: 1111

Modified:
   pkg/ProbABEL/configure.ac
Log:
- Simplified the check for the Eigen libraries a bit as the old check stopped working (maybe because I upgraded from Ubuntu 12.04 to 12.10?). Now --disable-eigen works again.
- Converted tabs to spaces


Modified: pkg/ProbABEL/configure.ac
===================================================================
--- pkg/ProbABEL/configure.ac	2013-02-25 23:13:14 UTC (rev 1110)
+++ pkg/ProbABEL/configure.ac	2013-02-28 13:32:11 UTC (rev 1111)
@@ -40,29 +40,28 @@
 # Checks for header files.
 AC_FUNC_ALLOCA
 AC_CHECK_HEADERS([float.h inttypes.h libintl.h limits.h stddef.h \
-			  stdint.h stdlib.h string.h sys/param.h wchar.h wctype.h])
+                          stdint.h stdlib.h string.h sys/param.h wchar.h wctype.h])
 
 
 # See if we want use of the Eigen library enabled (yes by default) and if so,
 # whether we can find the library files.
 AC_ARG_WITH([eigen],
- [AS_HELP_STRING([--with-eigen], [Use the Eigen template library for fast \
-				    linear algebra (Eigen can be downloaded \
-				    from eigen.tuxfamily.org); this is enabled \
-				    by default])],
- [eigen=${enableval}],
- [eigen=yes])
+ AS_HELP_STRING([--with-eigen], [Use the Eigen template library for fast \
+                                    linear algebra (Eigen can be downloaded \
+                                    from eigen.tuxfamily.org); this is enabled \
+                                    by default]
+               )
+)
 
-if test "x$eigen" = "xyes"; then
+if test "x$with_eigen" != "xno"; then
     AC_MSG_NOTICE([building using the Eigen headers enabled])
 
     AC_ARG_WITH([eigen-include-path],
-	[AS_HELP_STRING([--with-eigen-include-path],
-	  [location of the Eigen headers, defaults to /usr/include/eigen3])],
-	[CXXFLAGS+=" -I${withval}"],
-	[CXXFLAGS+=' -I/usr/include/eigen3'
-	CPPFLAGS+=' -I/usr/include/eigen3'])
-    dnl AC_SUBST([EIGEN_CFLAGS])
+        [AS_HELP_STRING([--with-eigen-include-path],
+          [location of the Eigen headers, defaults to /usr/include/eigen3])],
+        [CXXFLAGS+=" -I${withval}"],
+        [CXXFLAGS+=' -I/usr/include/eigen3'
+        CPPFLAGS+=' -I/usr/include/eigen3'])
 
     # Check for the EIGEN header files
     AC_CHECK_HEADERS([Eigen/Dense Eigen/LU])
@@ -75,7 +74,7 @@
 else
    AC_MSG_NOTICE([not using Eigen for linear algebra])
 fi
-AM_CONDITIONAL([WITH_EIGEN], test "x$eigen" = "xyes")
+AM_CONDITIONAL([WITH_EIGEN], test "x$with_eigen" = "xyes")
 
 
 # Checks for typedefs, structures, and compiler characteristics.
@@ -125,11 +124,11 @@
 
 # Files to be generated by autotools
 AC_CONFIG_FILES([
-	Makefile
-	src/Makefile
-	doc/Makefile
-	examples/Makefile
-	tests/Makefile
+        Makefile
+        src/Makefile
+        doc/Makefile
+        examples/Makefile
+        tests/Makefile
 ])
 # Create output files
 AC_OUTPUT