--- SConstruct.orig	2012-01-11 17:56:10 UTC
+++ SConstruct
@@ -162,22 +162,13 @@ if (len(COMMAND_LINE_TARGETS) == 0):
 
 # XXX TODO: Make initial CPPPATH/LIBPATH derive from
 # autodetected host system *or* command line.
-#env = Environment(
-#		  TOOLS = ['default', 'autotest', 'clntgen', 'tgtgen',
-#		           'TOOL_SUBST'],
-#		  ENV = os.environ,
-#		  BUILDDIR = builddir,
-#		  CPPPATH=['/usr/local/include', '$BUILDDIR'],
-#		  LIBPATH=['usr/lib', '/usr/local/lib'],
-#		  variables = vars)
-
 env = Environment(
 		  TOOLS = ['default', 'autotest', 'clntgen', 'tgtgen',
 		           'TOOL_SUBST'],
 		  ENV = os.environ,
 		  BUILDDIR = builddir,
-		  CPPPATH=['$BUILDDIR'],
-		  LIBPATH=['usr/lib'],
+		  CPPPATH=['/usr/local/include', '$BUILDDIR'],
+		  LIBPATH=['usr/lib', '/usr/local/lib'],
 		  variables = vars)
 
 prefix = env['prefix']
@@ -880,6 +871,7 @@ env.AppendUnique(CFLAGS = [
     '-Wcast-align',
     '-Wstrict-prototypes',
     '-Wnested-externs',
+    '-Wno-unused-function',
     '-pipe',
     ])