build: remove dead cruft and simplify bootstrap script.

.gitignore

@@ -88,7 +88,6 @@ test/sandbox/sample
 test/math/pi
 test/math/poly
 test/nacl_phystest
-test/xolotl/xolotl
 tools/make-font
 demos/lol.js/lol.js
 demos/tutorial/01_triangle

bootstrap

@@ -59,29 +59,15 @@ aclocalflags="`sed -ne 's/^[ \t]*ACLOCAL_AMFLAGS[ \t]*=//p' Makefile.am 2>/dev/n
 
 # Check for automake
 amvers="no"
-v=20; vend=5
-while [ "$v" -gt "$vend" ]; do
-  if automake-1.${v} --version >/dev/null 2>&1; then
-    amvers="-1.${v}"
-    break
-  elif automake1.${v} --version >/dev/null 2>&1; then
-    amvers="1.${v}"
+for v in "" "-1.15" "-1.14" "-1.13" "-1.12" "-1.11"; do
+  if automake${v} --version > /dev/null 2>&1; then
+    amvers=${v}
     break
   fi
-  v="`expr "$v" - 1`"
 done
 
-if test "${amvers}" = "no" && automake --version > /dev/null 2>&1; then
-  amvers="`automake --version | sed -e '1s/[^0-9]*//' -e q`"
-  if expr "$amvers" "<" "1.5" > /dev/null 2>&1; then
-    amvers="no"
-  else
-    amvers=""
-  fi
-fi
-
 if test "$amvers" = "no"; then
-  echo "$0: you need automake version 1.5 or later"
+  echo "$0: automake not found"
   exit 1
 fi
 
@@ -95,7 +81,7 @@ for v in "" "259" "253"; do
 done
 
 if test "$acvers" = "no"; then
-  echo "$0: you need autoconf"
+  echo "$0: autoconf not found"
   exit 1
 fi
 
@@ -114,7 +100,7 @@ if test "$libtool" = "yes"; then
   fi
 
   if test "$libtoolize" = "no"; then
-    echo "$0: you need libtool"
+    echo "$0: libtool not found"
     exit 1
   fi
 fi
@@ -122,7 +108,7 @@ fi
 # Check for pkg-config
 if test "$pkgconfig" = "yes"; then
   if ! pkg-config --version >/dev/null 2>&1; then
-    echo "$0: you need pkg-config"
+    echo "$0: pkg-config not found"
     exit 1
   fi
 fi

configure.ac

@@ -502,7 +502,6 @@ AC_CONFIG_FILES(
   test/Makefile
   test/math/Makefile
   test/sandbox/Makefile
-  test/xolotl/Makefile
   build/Makefile
   binaries/Makefile
   people/Makefile

test/Makefile.am

@@ -1,7 +1,7 @@
 
 include $(top_srcdir)/build/autotools/common.am
 
-SUBDIRS = math sandbox xolotl
+SUBDIRS = math sandbox
 
 bench: benchsuite$(EXEEXT)
 	./benchsuite$(EXEEXT)

test/xolotl/Makefile.am

@@ -1,9 +0,0 @@
-
-include $(top_srcdir)/build/autotools/common.am
-
-bin_PROGRAMS = xolotl
-
-xolotl_SOURCES = xolotl.cpp xolotl.h
-xolotl_CPPFLAGS = $(AM_CPPFLAGS)
-xolotl_DEPENDENCIES = @LOL_DEPS@
-

test/xolotl/xolotl.cpp

@@ -1,70 +0,0 @@
-//
-// Lol Engine - Xolotl algorithm test
-//
-// Copyright: (c) 2011 Soren Renner
-//            (c) 2011-2012 Sam Hocevar <sam@hocevar.net>
-//   This program is free software; you can redistribute it and/or
-//   modify it under the terms of the Do What The Fuck You Want To
-//   Public License, Version 2, as published by Sam Hocevar. See
-//   http://www.wtfpl.net/ for more details.
-//
-
-#if defined HAVE_CONFIG_H
-#   include "config.h"
-#endif
-
-#include <lol/main.h>
-#include "loldebug.h"
-
-using namespace lol;
-
-#include "xolotl.h"
-
-class Xolotl : public WorldEntity
-{
-public:
-    Xolotl()
-    {
-        for(int i = 0; i < 2000; i++) {
-          float x = (i - 1000.0) / 100.0;
-          graph[i].x = x;
-          graph[i].y = lol::sin(x * 10.0) / (1.0 + x * x);
-        }
-    }
-
-    virtual ~Xolotl()
-    {
-
-    }
-
-    virtual char const *GetName() { return "Xolotl"; }
-
-    virtual void TickGame(float seconds)
-    {
-
-    }
-
-    virtual void TickDraw(float seconds, Scene &scene)
-    {
-
-    }
-
-private:
-    vec2 graph[2000];
-};
-
-int main(int argc, char **argv)
-{
-    System::Init(argc, argv);
-
-    Application app("Xolotl", ivec2(640, 480), 60.0f);
-
-    /* Register some debug stuff */
-    new DebugFps(5, 5);
-
-    Cell<3> c;
-    app.Run();
-
-    return EXIT_SUCCESS;
-}
-

test/xolotl/xolotl.h

@@ -1,58 +0,0 @@
-//
-// Lol Engine - Xolotl algorithm test
-//
-// Copyright: (c) 2011 Soren Renner
-//            (c) 2011 Sam Hocevar <sam@hocevar.net>
-//   This program is free software; you can redistribute it and/or
-//   modify it under the terms of the Do What The Fuck You Want To
-//   Public License, Version 2, as published by Sam Hocevar. See
-//   http://www.wtfpl.net/ for more details.
-//
-
-using namespace lol;
-
-struct Voxel
-{
-    bool passable, lock, copymarker;
-    struct Voxel *imposter;
-};
-
-struct MSV : public Voxel
-{
-};
-
-struct Ray
-{
-    float theta, phi;
-    vec3 origin, xyz, dxyz, ddxyz, lxyz, popdelta;
-    struct Voxel *terminalvoxel;
-    bool terminate;
-    ivec3 counter;
-    int scale;
-    float length;
-    bool di, dj, dk, changed, traced, far;
-    int face;
-    vec3 normal, bloxnorm, corner;
-    int dtl;
-};
-
-template <int M> struct Cell : public MSV
-{
-    Voxel blox[M * M * M];
-    vec3 bloxnorm[M * M * M];
-    int m;
-
-    void Serp(Voxel v, Voxel w)
-    {
-        for (int i = 0; i < M; i++)
-        for (int j = 0; j < M; j++)
-        for (int k = 0; k < M; k++)
-            if ((i == M_2) + (j == M_2) + (k == M_2) >= 2)
-                blox[(i * M + j) * M + k] = v;
-            else
-                blox[(i * M + j) * M + k] = w;
-    }
-
-    static const int M_2 = M / 2;
-};
-