Index: SConstruct
===================================================================
--- a/SConstruct	(revision 1653)
+++ b/SConstruct	(working copy)
@@ -16,7 +16,11 @@
 opts.Add(BoolOption('perfexe', 'Build native perf test version of fife engine', 0))
 opts.Add(BoolOption('log', 'Enables logging for the engine', 1))
 
-env = Environment(options = opts, ENV = {'PATH' : os.environ['PATH']})
+env = Environment(options = opts, ENV = os.environ)
+
+env['CXX'] = os.environ['CXX']
+env['LD'] = os.environ['LD']
+
 env.Replace(SCONS_ROOT_PATH=str(upath('.').abspath()))
 rootp = env['SCONS_ROOT_PATH']
 

Index: trunk/build/linux2-config.py
===================================================================
--- /dev/null	1970-01-01 00:00:00.000000000 +0000
+++ trunk/build/linux2-config.py	2007-09-28 19:54:47.000000000 +0200
@@ -0,0 +1,30 @@
+def initEnvironment(env):
+	return env
+
+def addExtras(context):
+	context.env.Append(LIBS = 'm')
+	context.env.Replace(LIBPATH = ['%s/ext/install/lib' % context.env['SCONS_ROOT_PATH']])
+	context.env.Append(CPPPATH = ['%s/ext/install/include' % context.env['SCONS_ROOT_PATH']])
+	context.env.Append(CPPPATH = [])
+
+	context.env.ParseConfig('pkg-config --libs --cflags vorbisfile')
+	context.env.ParseConfig('pkg-config --libs --cflags openal')
+	context.env.ParseConfig('python2.5-config --cflags')
+	context.env.ParseConfig('python2.5-config --libs')
+	if context.env['script'] == 'lua':
+		context.checkSimpleLib(['lua5.1', 'lua-5.1', 'lua'], 'lua.h')
+	context.env.ParseConfig('sdl-config --libs --cflags')
+	context.env.ParseConfig('pkg-config --libs --cflags sdl_ttf')
+	context.env.ParseConfig('pkg-config --libs --cflags sdl_image')
+	context.env.ParseConfig('pkg-config --libs --cflags guichan')
+	context.env.ParseConfig('pkg-config --libs --cflags guichan_sdl')
+	context.env.ParseConfig('pkg-config --libs --cflags boost_filesystem')
+	context.env.ParseConfig('pkg-config --libs --cflags boost_regex')
+
+	if context.env['opengl']:
+		context.env.Append(LIBS = ['GL', 'GLU'])
+		context.env.Append(LIBPATH = ['/usr/X11R6/lib'])
+		context.checkSimpleLib(['guichan_opengl'])
+
+	if context.env['zip']:
+		context.checkSimpleLib(['minizip'])
Index: trunk/build/linux/pkgconfig_files/sdl_image.pc
===================================================================
--- /dev/null	1970-01-01 00:00:00.000000000 +0000
+++ trunk/build/linux/pkgconfig_files/sdl_image.pc	2007-09-28 19:51:38.000000000 +0200
@@ -0,0 +1,21 @@
+# sdl_ttf.pc -- pkg-config data for SDL_image
+
+# grep '^INSTALL_.*=' ../Makefile | sed 's/INSTALL_TOP/prefix/'
+prefix = /usr/local
+INSTALL_BIN= ${prefix}/bin
+INSTALL_INC= ${prefix}/include
+INSTALL_LIB= ${prefix}/lib
+INSTALL_MAN= ${prefix}/man/man1
+
+# canonical vars
+exec_prefix=${prefix}
+libdir=${exec_prefix}/lib
+includedir=${prefix}/include
+
+Name: SDL_image
+Description: Simple DirectMedia Layer image library.
+Version: 1.2.3
+Libs: -L${libdir} -lSDL_image
+Cflags: -I${includedir}
+
+# (end of sdl_image.pc)
Index: trunk/build/linux/pkgconfig_files/sdl_ttf.pc
===================================================================
--- /dev/null	1970-01-01 00:00:00.000000000 +0000
+++ trunk/build/linux/pkgconfig_files/sdl_ttf.pc	2007-09-28 19:51:48.000000000 +0200
@@ -0,0 +1,21 @@
+# sdl_ttf.pc -- pkg-config data for SDL_ttf
+
+# grep '^INSTALL_.*=' ../Makefile | sed 's/INSTALL_TOP/prefix/'
+prefix = /usr/local
+INSTALL_BIN= ${prefix}/bin
+INSTALL_INC= ${prefix}/include
+INSTALL_LIB= ${prefix}/lib
+INSTALL_MAN= ${prefix}/man/man1
+
+# canonical vars
+exec_prefix=${prefix}
+libdir=${exec_prefix}/lib
+includedir=${prefix}/include
+
+Name: SDL_ttf
+Description: Simple DirectMedia Layer truetype font library.
+Version: 2.0.3
+Libs: -L${libdir} -lSDL_ttf
+Cflags: -I${includedir}
+
+# (end of sdl_ttf.pc)
Index: engine/core/audio/decoder_oggvorbis.h
===================================================================
--- a/engine/core/audio/decoder_oggvorbis.h	(revision 1653)
+++ b/engine/core/audio/decoder_oggvorbis.h	(working copy)
@@ -26,7 +26,7 @@
 
 // 3rd party library includes
 #include <boost/shared_ptr.hpp>
-#include <vorbisfile.h>
+#include <vorbis/vorbisfile.h>
 
 // FIFE includes
 // These includes are split up in two parts, separated by one empty line
Index: engine/core/audio/audiomanager.cpp
===================================================================
--- a/engine/core/audio/audiomanager.cpp	(revision 1653)
+++ b/engine/core/audio/audiomanager.cpp	(working copy)
@@ -23,7 +23,7 @@
 #include <cstdio>
 
 // 3rd party library includes
-#include <vorbisfile.h>
+#include <vorbis/vorbisfile.h>
 
 // FIFE includes
 // These includes are split up in two parts, separated by one empty line