Whoops, bug fix

7 files changed, 8 insertions, 8 deletions

diff --git a/autogen.sh b/autogen.sh
index 30409ef..c514e1e 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -3,7 +3,7 @@
 echo Running gettextize...
 gettextize -c --intl --no-changelog
 echo Running libtoolize...
-libtoolize -c --automake
+libtoolize -c -f --automake
 echo Running aclocal...
 aclocal -I m4
 echo Running autoscan...
diff --git a/configure.ac b/configure.ac
index 91643d2..c2be4fd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,7 +1,7 @@
 #                                               -*- Autoconf -*-
 # Process this file with autoconf to produce a configure script.
 
-AC_PREREQ(2.56)
+AC_PREREQ(2.50)
 AC_INIT([mogltk], [0.0.1], [pixel@nobis-crew.org])
 AC_CANONICAL_TARGET
 AM_INIT_AUTOMAKE(mogltk, 0.0.1)
@@ -18,7 +18,6 @@ AC_PROG_CPP
 AC_PROG_INSTALL
 AC_PROG_LN_S
 AC_PROG_MAKE_SET
-AC_PROG_RANLIB
 AC_PROG_YACC
 AM_PROG_LIBTOOL
 AC_C_BIGENDIAN
diff --git a/include/Makefile.am b/include/Makefile.am
index 1e67880..94a85e3 100644
--- a/include/Makefile.am
+++ b/include/Makefile.am
@@ -1,5 +1,5 @@
 pkginclude_HEADERS = \
 engine.h glbase.h glfont.h glshape.h glwidgets.h sprite.h \
-base.h font.h shape.h mcolor.h glsprite.h texture.h
+base.h font.h shape.h mcolor.h glsprite.h texture.h widgets.h
 
 noinst_HEADERS = gettext.h
diff --git a/include/engine.h b/include/engine.h
index 6bd2697..8634f6a 100644
--- a/include/engine.h
+++ b/include/engine.h
@@ -20,7 +20,7 @@ namespace mogltk {
         static int postsetup() throw(GeneralException);
         static int GetInited();
 	static SDL_RWops * RWFromHandle(Handle *) throw (GeneralException);
-	static void pollevents();
+	static void pollevents() throw (GeneralException);
 	static void setappactive(bool);
 	static bool getappactive();
 	static void setcursorvisible(bool);
diff --git a/lib/Makefile.am b/lib/Makefile.am
index f7fd3be..efef19c 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -6,4 +6,5 @@ INCLUDES = -I.. -I../include -I$(includedir)
 lib_LTLIBRARIES = libmogltk.la
 
 libmogltk_la_SOURCES = engine.cc glbase.cc glfont.cc glsprite.cc \
-glshape.cc glwidgets.cc sprite.cc base.cc font.cc shape.cc mcolor.cc texture.cc
+glshape.cc glwidgets.cc sprite.cc base.cc font.cc shape.cc mcolor.cc \
+texture.cc widgets.cc
diff --git a/lib/base.cc b/lib/base.cc
index 5282617..7a6c854 100644
--- a/lib/base.cc
+++ b/lib/base.cc
@@ -18,7 +18,7 @@ mogltk::base::base(int w, int h, int flags) throw(GeneralException) : surface(0)
     }
 
     if (!(surface = SDL_SetVideoMode(width, height, 0, flags))) {
-        throw GeneralException(String("Couldn't set GL mode: ") + SDL_GetError());
+        throw GeneralException(String("Couldn't set SDL mode: ") + SDL_GetError());
     }
 
     mogltk::engine::base_o = this;
diff --git a/src/Makefile.am b/src/Makefile.am
index a2693d4..77ce6da 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -3,7 +3,7 @@ DEFS = -DLOCALEDIR=\"$(localedir)\" @DEFS@
 AM_CPPFLAGS = -Wall -Wstrict-prototypes @SDL_CFLAGS@ @BALTISOT_CFLAGS@
 INCLUDES = -I.. -I../include -I$(includedir)
 
-noinst_PROGRAMS = test
+# noinst_PROGRAMS = test
 
 test_SOURCES = test.cc