Index: autogen.sh
===================================================================
RCS file: /cvsroot/fluid/fluidgui/autogen.sh,v
retrieving revision 1.4
diff -u -r1.4 autogen.sh
--- autogen.sh	19 May 2004 13:50:10 -0000	1.4
+++ autogen.sh	16 Sep 2005 23:58:31 -0000
@@ -14,12 +14,12 @@
 
 echo Running:                       \
  && echo "* $LIBTOOLIZE"            \
- && $LIBTOOLIZE -f --automake       \
+ && $LIBTOOLIZE --force --copy --automake \
  && echo "* aclocal"                \
- && aclocal                     \
+ && aclocal                         \
  && echo "* autoheader"             \
  && autoheader                      \
- && echo "* autoconf"               \
- && autoconf                        \
  && echo "* automake"               \
- && automake -a
+ && automake --add-missing --copy   \
+ && echo "* autoconf"               \
+ && autoconf
Index: configure.ac
===================================================================
RCS file: /cvsroot/fluid/fluidgui/configure.ac,v
retrieving revision 1.10
diff -u -r1.10 configure.ac
--- configure.ac	6 Feb 2004 11:22:35 -0000	1.10
+++ configure.ac	16 Sep 2005 23:58:31 -0000
@@ -1,5 +1,6 @@
 
 AC_INIT(include/fluidgui.h)
+AC_PREREQ(2.57)
 
 FLUIDGUI_VERSION_MAJOR=1
 FLUIDGUI_VERSION_MINOR=1
@@ -12,6 +13,7 @@
 AC_SUBST(FLUIDGUI_VERSION)
 
 AM_INIT_AUTOMAKE(fluidgui, $FLUIDGUI_VERSION)
+AM_MAINTAINER_MODE
 
 dnl Convert to quoted string for version.h substitution
 FLUIDGUI_VERSION="\"$VERSION\""
@@ -72,7 +74,7 @@
     echo "Compiling for Apple: Using Carbon library"
     NATIVE_GUI_LIBADD="carbon/libfluidcarbon.la"
     ;;
-  *-*-mingw32)
+  *mingw32*)
     echo "Compiling for MinGW: Using Windows libraries"
     AC_DEFINE([WITH_WIN], [1], [Define for Windows driver])
     NATIVE_GUI_SUBDIRS="win"
Index: include/fluidgui.h
===================================================================
RCS file: /cvsroot/fluid/fluidgui/include/fluidgui.h,v
retrieving revision 1.16
diff -u -r1.16 fluidgui.h
--- include/fluidgui.h	6 Feb 2004 11:22:35 -0000	1.16
+++ include/fluidgui.h	16 Sep 2005 23:58:31 -0000
@@ -46,7 +46,7 @@
 #include "fluidgui/imageloader.hh"
 #include "fluidgui/imagewriter.hh"
 #include "fluidgui/button.hh"
-#include "fluidgui/moviewidget.hh"
+#include "fluidgui/moviecontainer.hh"
 #include "fluidgui/listwidget.hh"
 #include "fluidgui/font.hh"
 #include "fluidgui/fontmanager.hh"
Index: include/fluidgui/widget.hh
===================================================================
RCS file: /cvsroot/fluid/fluidgui/include/fluidgui/widget.hh,v
retrieving revision 1.3
diff -u -r1.3 widget.hh
--- include/fluidgui/widget.hh	6 Feb 2004 11:22:35 -0000	1.3
+++ include/fluidgui/widget.hh	16 Sep 2005 23:58:31 -0000
@@ -106,11 +106,11 @@
 			_bgcolor = c;    
 		}
 	
-		virtual void setFgColor(uint8 r, uint8 g, uint8 b, uint a = 255) {
+		virtual void setFgColor(uint8 r, uint8 g, uint8 b, uint8 a = 255) {
 			_fgcolor.set(r, g, b, a);
 		}
 	
-		virtual void setBgColor(uint8 r, uint8 g, uint8 b, uint a = 255) {
+		virtual void setBgColor(uint8 r, uint8 g, uint8 b, uint8 a = 255) {
 			_bgcolor.set(r, g, b, a);
 		}
 
Index: src/gui.cpp
===================================================================
RCS file: /cvsroot/fluid/fluidgui/src/gui.cpp,v
retrieving revision 1.12
diff -u -r1.12 gui.cpp
--- src/gui.cpp	10 Feb 2004 13:35:16 -0000	1.12
+++ src/gui.cpp	16 Sep 2005 23:58:31 -0000
@@ -18,6 +18,10 @@
 #include "svga/svga_gui.hh"
 #endif
 
+#if WITH_WIN
+#include "win/win_gui.h"
+#endif
+
 namespace Fluid {
 
 	static Gui* _gui = 0;
@@ -31,6 +35,9 @@
 #elif defined(WITH_SVGA)
 	static char* _defaultDriver = "svga";
 
+#elif defined(WITH_WIN)
+	static char* _defaultDriver = "win";
+
 #else 
 #warning No graphics driver specified!
 	static char* _defaultDriver = "unspecified";
@@ -68,11 +75,11 @@
 		} 
 #endif
 
-#ifdef _WIN32
+#ifdef WITH_WIN
 		if (strcmp(driver, "win") == 0) {
 			printf("Using Win\n");
 			_gui = new Fluid::WinGui(options);
-		} 
+		}
 #endif
 
 		if (_gui == 0) {