--- Makefile.orig	Wed Oct  4 22:32:43 2006
+++ Makefile	Wed Oct  4 22:34:18 2006
@@ -9,9 +9,13 @@
 INSTALL_DIR=/usr/local/share
 INSTALL_BIN_DIR=/usr/local/bin
 
-CXX = g++
-CXXFLAGS = $(shell sdl-config --cflags) -O3
-LDFLAGS = $(shell sdl-config --libs) -lSDL_image -lSDL_mixer -lboost_filesystem
+CXX ?= g++
+CXXFLAGS += $(shell $(SDL_CONFIG) --cflags)
+LDFLAGS += $(shell $(SDL_CONFIG) --libs) -lSDL_image -lSDL_mixer -lboost_filesystem -lboost_system
+
+ifdef OPTIMIZED_CFLAGS
+CXXFLAGS += -O3
+endif
 
 OBJS = AIInterpreter.o AutoFireUnit.o BCCompiler.o DerivedGroups.o DragWindow.o \
 	ForceSelect.o ForceSelectWin.o GenWindow.o GenWindow_Base.o GFX.o Globals.o \