--- ./glkloader-0.3.2/xpconfig/internal-build-script~	2001-06-23 22:06:17.000000000 +0100
+++ ./glkloader-0.3.2/xpconfig/internal-build-script	2007-07-11 15:39:40.000000000 +0100
@@ -1,5 +1,5 @@
 #!/bin/sh
 if [ ! -f Makefile ]; then
-  ./configure --with-method=rcfile --disable-shared
+  ./configure --with-method=rcfile --disable-shared || exit $?
 fi
 make
--- ./glkloader-0.3.2/xpconfig/xpconfig.c~	2001-06-23 10:24:55.000000000 +0100
+++ ./glkloader-0.3.2/xpconfig/xpconfig.c	2007-07-11 15:39:17.000000000 +0100
@@ -33,6 +33,8 @@
 
 #include <assert.h>
 #include <string.h>
+#include <stdio.h>
+#include <stdlib.h>
 
 #include "xpconfig.h"
 
--- ./glkloader-0.3.2/Makefile~	2007-07-11 15:32:34.000000000 +0100
+++ ./glkloader-0.3.2/Makefile	2007-07-11 15:33:28.000000000 +0100
@@ -13,8 +13,8 @@
 # and glk.h, glkstart.h, and Make.glkloader in the include directory.
 
 GLKNAME = glkloader
-GLKINCLUDEDIR = /usr/local/include/glk/
-GLKLIBDIR = /usr/local/lib/
+GLKINCLUDEDIR = /usr/include/glk/
+GLKLIBDIR = /usr/lib/
 
 # Pick a C compiler.
 #CC = cc
@@ -22,10 +22,10 @@
 LINK = gcc
 INSTALL = install -g 0 -o 0
 
-OPTIONS = -g -Wall -fPIC -DLINUX
-INCLUDEDIRS = -I$(GLKINCLUDEDIR)
+OPTIONS = -Wall -fPIC -DLINUX
+INCLUDEDIRS = -I$(GLKINCLUDEDIR) -I.
 
-CFLAGS = $(OPTIONS) $(INCLUDEDIRS)
+CFLAGS = $(MYCFLAGS) $(OPTIONS) $(INCLUDEDIRS)
 LDFLAGS = -rdynamic
 LIBDIRS =
 LIBS = -ldl
@@ -45,15 +45,16 @@
 
 all: $(GLKLIBSTATIC) $(GLKLIBSHARED) $(GLKMAKEFILE)
 
-$(GLKLIBSTATIC): $(OBJS)
-	cd xpconfig && ./internal-build-script 
+$(GLKLIBSTATIC): $(OBJS) xpconfig/libxpconfig.la
 	ar r $(GLKLIBSTATIC) $(OBJS)
 	ranlib $(GLKLIBSTATIC)
 
-$(GLKLIBSHARED): $(OBJS)
-	cd xpconfig && ./internal-build-script 
+$(GLKLIBSHARED): $(OBJS) xpconfig/libxpconfig.la
 	$(LINK) $(LDFLAGS) -shared -Wl,-soname,$(GLKLIBSHARED).$(MAJOR) -o $(GLKLIBSHARED).$(MAJOR).$(MINOR).$(MICRO) $(OBJS) $(LIBDIRS) $(LIBS) $(XPCONFIG)
 
+xpconfig/libxpconfig.la:
+	cd xpconfig && ./internal-build-script
+
 $(GLKMAKEFILE):
 	echo LINKLIBS = $(LIBDIRS) $(LIBS) > $(GLKMAKEFILE)
 	echo GLKLIB = -l$(GLKNAME) >> $(GLKMAKEFILE)
@@ -72,7 +72,6 @@
 	ln -s -f $(GLKLIBDIR)/$(GLKLIBSHARED).$(MAJOR).$(MINOR).$(MICRO) $(GLKLIBDIR)/$(GLKLIBSHARED).$(MAJOR).$(MINOR)
 	ln -s -f $(GLKLIBDIR)/$(GLKLIBSHARED).$(MAJOR).$(MINOR).$(MICRO) $(GLKLIBDIR)/$(GLKLIBSHARED).$(MAJOR)
 	ln -s -f $(GLKLIBDIR)/$(GLKLIBSHARED).$(MAJOR).$(MINOR).$(MICRO) $(GLKLIBDIR)/$(GLKLIBSHARED)
-	ldconfig
 
 uninstall:
 	rm -f $(GLKINCLUDEDIR)/$(GLKMAKEFILE)
--- ./glkloader-0.3.2/glkloader.c~	2001-06-23 21:54:17.000000000 +0100
+++ ./glkloader-0.3.2/glkloader.c	2007-07-11 15:34:16.000000000 +0100
@@ -29,6 +29,7 @@
 
 #include <stdlib.h>
 #include <stdio.h>
+#include <string.h>
 #include <glk.h>
 
 #include "defines.h"
--- ./glkloader-0.3.2/generate_glkfuncs.pl~	2001-03-14 03:07:59.000000000 +0000
+++ ./glkloader-0.3.2/generate_glkfuncs.pl	2007-07-11 15:35:41.000000000 +0100
@@ -282,6 +282,7 @@
 
 # Global definitions 
 print OUT_FILE "#include <stdio.h>\n";
+print OUT_FILE "#include <stdlib.h>\n";
 print OUT_FILE "#include <glk.h>\n";
 print OUT_FILE "\n";
 print OUT_FILE "#include \"defines.h\"\n";
--- ./glkloader-0.3.2/xpconfig/applist.c~	2001-06-23 10:24:55.000000000 +0100
+++ ./glkloader-0.3.2/xpconfig/applist.c	2007-07-11 15:44:42.000000000 +0100
@@ -32,6 +32,7 @@
 #endif
 
 #include <string.h>
+#include <stdlib.h>
 
 #include "applist.h"
 #include "sectionlist.h"
--- ./glkloader-0.3.2/xpconfig/sectionlist.c~	2001-06-23 10:24:55.000000000 +0100
+++ ./glkloader-0.3.2/xpconfig/sectionlist.c	2007-07-11 15:44:56.000000000 +0100
@@ -32,6 +32,7 @@
 #endif
 
 #include <string.h>
+#include <stdlib.h>
 
 #include "sectionlist.h"
 #include "keylist.h"
--- ./glkloader-0.3.2/xpconfig/keylist.c~	2001-06-23 10:24:55.000000000 +0100
+++ ./glkloader-0.3.2/xpconfig/keylist.c	2007-07-11 15:45:14.000000000 +0100
@@ -32,6 +32,8 @@
 #endif
 
 #include <string.h>
+#include <stdio.h>
+#include <stdlib.h>
 
 #include "keylist.h"
 
--- ./glkloader-0.3.2/xpconfig/platform_rcfile.c~	2001-06-23 21:54:23.000000000 +0100
+++ ./glkloader-0.3.2/xpconfig/platform_rcfile.c	2007-07-11 15:57:54.000000000 +0100
@@ -405,7 +405,6 @@
 			sprintf( filename, "%s/.%src", dirname, application );
 			parseConfigFile( filename, application );
 			free( filename );
-			free( dirname );
 		}
 	}
 
--- ./glkloader-0.3.2/glk.h~	2001-03-14 03:07:59.000000000 +0000
+++ ./glkloader-0.3.2/glk.h	2007-07-11 16:00:42.000000000 +0100
@@ -17,8 +17,9 @@
 /* You may have to edit the definition of glui32 to make sure it's really a
     32-bit unsigned integer type, and glsi32 to make sure it's really a
     32-bit signed integer type. If they're not, horrible things will happen. */
-typedef unsigned long glui32; 
-typedef signed long glsi32; 
+#include <stdint.h>
+typedef uint32_t glui32; 
+typedef int32_t glsi32; 
 
 /* These are the compile-time conditionals that reveal various Glk optional
     modules. */