[Genabel-commits] r1097 - branches/ProbABEL-pacox/v.0.3.0/ProbABEL

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

Author: lckarssen
Date: 2013-02-12 18:42:11 +0100 (Tue, 12 Feb 2013)
New Revision: 1097

Modified:
   branches/ProbABEL-pacox/v.0.3.0/ProbABEL/configure.ac
Log:
In configure.ac: 
- build pacoxph by default (at least in this branch)
- Replaced tabs with spaces
- set new version number (for this branch)


Modified: branches/ProbABEL-pacox/v.0.3.0/ProbABEL/configure.ac
===================================================================
--- branches/ProbABEL-pacox/v.0.3.0/ProbABEL/configure.ac	2013-02-11 22:20:11 UTC (rev 1096)
+++ branches/ProbABEL-pacox/v.0.3.0/ProbABEL/configure.ac	2013-02-12 17:42:11 UTC (rev 1097)
@@ -2,7 +2,7 @@
 # Process this file with autoconf to produce a configure script.
 
 AC_PREREQ([2.67])
-AC_INIT(ProbABEL, 0.3.0, genabel-devel at r-forge.wu-wien.ac.at)
+AC_INIT(ProbABEL, 0.3.0-pacox-beta-1, genabel-devel at r-forge.wu-wien.ac.at)
 AM_INIT_AUTOMAKE([silent-rules])
 AM_SILENT_RULES
 AC_CONFIG_SRCDIR([src/data.h])
@@ -40,16 +40,16 @@
 # 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])],
+                                    linear algebra (Eigen can be downloaded \
+                                    from eigen.tuxfamily.org); this is enabled \
+                                    by default])],
  [eigen=${enableval}],
  [eigen=yes])
 
@@ -57,11 +57,11 @@
     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'])
+        [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])
 
     # Check for the EIGEN header files
@@ -112,10 +112,9 @@
 
 # Since pacoxph is buggy it needs to be enabled explixitly
 AC_ARG_ENABLE([pacoxph],
-    [AS_HELP_STRING([--enable-pacoxph], [build the pacoxph binary (still \
-contains lots of bugs)])],
-    [pacoxph=${enableval}],
-    [pacoxph=no])
+    [AS_HELP_STRING([--disable-pacoxph], [disable building the pacoxph program])],
+    [pacoxph=no],
+    [pacoxph=${enableval}])
 
 if test "x$pacoxph" = "xyes"; then
    AC_MSG_NOTICE([building of pacoxph is enabled])
@@ -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