Merge branch 'master' of git://github.com/stevengj/libctl

ahoenselaar · Apr 18, 2018 · 4f1a3a0 · 4f1a3a0
2 parents d1ed131 + dd0d39c
commit 4f1a3a0
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/autogen.sh b/autogen.sh
@@ -1,5 +1,7 @@
 #!/bin/sh
 
+mkdir -p m4
+
 # paranoia: sometimes autoconf doesn't get things right the first time
 autoreconf --verbose --install --symlink --force
 autoreconf --verbose --install --symlink --force

diff --git a/configure.ac b/configure.ac
@@ -54,7 +54,7 @@ AC_HEADER_STDC
 
 # Find Guile library, flags, etcetera:
 
-AC_ARG_WITH(guile, [AC_HELP_STRING([--without-mpi],[disable use of Guile])],
+AC_ARG_WITH(guile, [AC_HELP_STRING([--without-guile],[disable use of Guile])],
                    with_guile=$withval, with_guile=yes)
 
 if test x"$with_guile" = xyes; then

diff --git a/utils/geom.c b/utils/geom.c
@@ -1467,7 +1467,7 @@ static void find_best_partition(int nobjects, const geom_box_object *objects,
 	low end of an object. */
 
      for (i = 0; i < nobjects; ++i) {
-	  cur_partition = VEC_I(objects[i].box.high, divide_axis) + SMALL;
+         cur_partition = VEC_I(objects[i].box.high, divide_axis) * (1 + SMALL);
 	  cur_n1 = cur_n2 = 0;
 	  for (j = 0; j < nobjects; ++j) {
 	       if (VEC_I(objects[j].box.low, divide_axis) <= cur_partition)
@@ -1483,7 +1483,7 @@ static void find_best_partition(int nobjects, const geom_box_object *objects,
 	  }
      }
      for (i = 0; i < nobjects; ++i) {
-	  cur_partition = VEC_I(objects[i].box.low, divide_axis) - SMALL;
+         cur_partition = VEC_I(objects[i].box.low, divide_axis) * (1 - SMALL);
 	  cur_n1 = cur_n2 = 0;
 	  for (j = 0; j < nobjects; ++j) {
 	       if (VEC_I(objects[j].box.low, divide_axis) <= cur_partition)