From c76dc0b4d8202ed125c99c6151a8628c206513c4 Mon Sep 17 00:00:00 2001
From: Alexandre Bique <alexandre.bique@citrix.com>
Date: Tue, 12 May 2009 19:18:47 +0100
Subject: [PATCH] [build] added more flexibility to build system

---
 configure                      | 14 ++++++++++----
 src/ozulis/CMakeLists.txt      |  9 ++++-----
 src/ozulis/core/CMakeLists.txt |  6 +++++-
 3 files changed, 19 insertions(+), 10 deletions(-)

diff --git a/configure b/configure
index 251dfae..76bbf41 100755
--- a/configure
+++ b/configure
@@ -7,16 +7,17 @@ COLOR=ON
 CCACHE=ON
 DEBUG=1
 MAKEOPT="--quiet -j$(($(grep processor /proc/cpuinfo | wc -l) + 1))"
-CPPFLAGS="-DYYENABLE_NLS=1 -DENABLE_NLS=1"
-CFLAGS="-W -Wall -Wstrict-prototypes -pipe"
+CPPFLAGS="$CPPFLAGS -DYYENABLE_NLS=1 -DENABLE_NLS=1"
+CFLAGS="$CFLAGS -W -Wall -Wstrict-prototypes -pipe"
 CFLAGS="$CFLAGS -Wfloat-equal -Wundef -Wshadow -Wpointer-arith"
 CFLAGS="$CFLAGS -Wmissing-declarations -Wnested-externs"
 CFLAGS="$CFLAGS -Wmissing-prototypes -fPIC"
-CXXFLAGS="-W -Wall -pipe -Wundef -Wshadow -Wpointer-arith -Wabi -std=c++0x -fPIC"
-LDFLAGS=""
+CXXFLAGS="$CXXFLAGS -W -Wall -pipe -Wundef -Wshadow -Wpointer-arith -Wabi -std=c++0x -fPIC"
+LDFLAGS="$LDFLAGS"
 PREFIX="/usr/local"
 QTCREATOR=0
 DOXYGEN=doxygen
+BOOST_LIB_SUFFIX=""
 
 function usage()
 {
@@ -27,6 +28,7 @@ function usage()
   --debug		enables debug
   --qt-creator          generate build dir for qt-creator
   --doxygen=<path>      specify which binary use for doxygen
+  --boost-lib-suffix=<suffix>
 
   --builddir=<dir>      the build directory
   --prefix=<dir>        the installation prefix path
@@ -73,6 +75,9 @@ do
 	--doxygen=*)
 	    DOXYGEN="${1/--doxygen=/}"
             ;;
+	--boost-lib-suffix=*)
+	    BOOST_LIB_SUFFIX="${1/--boost-lib-suffix=/}"
+            ;;
 	--build-dir=*)
 	    BUILDDIR="${1/--build-dir=/}"
             ;;
@@ -170,6 +175,7 @@ cmake \
     -DCMAKE_VERBOSE_MAKEFILE=$VERBOSE \
     -DCMAKE_COLOR_MAKEFILE=$COLOR \
     -DCMAKE_INSTALL_PREFIX="$PREFIX" \
+    -DBOOST_LIB_SUFFIX="$BOOST_LIB_SUFFIX" \
     .
 
 cd "$ROOTDIR" &&
diff --git a/src/ozulis/CMakeLists.txt b/src/ozulis/CMakeLists.txt
index cbd93dc..294f19b 100644
--- a/src/ozulis/CMakeLists.txt
+++ b/src/ozulis/CMakeLists.txt
@@ -19,11 +19,10 @@ ADD_EXECUTABLE(ozulis
 TARGET_LINK_LIBRARIES(ozulis
   gc
 
-  # can be changed to boost_*-mt
-  boost_program_options
-  boost_iostreams
-  boost_system
-  boost_filesystem
+  boost_program_options${BOOST_LIB_SUFFIX}
+  boost_iostreams${BOOST_LIB_SUFFIX}
+  boost_system${BOOST_LIB_SUFFIX}
+  boost_filesystem${BOOST_LIB_SUFFIX}
 
   ozulis-core
   ozulis-ast
diff --git a/src/ozulis/core/CMakeLists.txt b/src/ozulis/core/CMakeLists.txt
index 8ec9796..3e38837 100644
--- a/src/ozulis/core/CMakeLists.txt
+++ b/src/ozulis/core/CMakeLists.txt
@@ -16,5 +16,9 @@ ENDIF(UNIX)
 
 ADD_LIBRARY(ozulis-core SHARED ${CORE_SRCS})
 SET_TARGET_PROPERTIES(ozulis-core PROPERTIES VERSION 1.0.0 SOVERSION 1)
-TARGET_LINK_LIBRARIES(ozulis-core boost_iostreams boost_filesystem)
+TARGET_LINK_LIBRARIES(ozulis-core
+  boost_iostreams${BOOST_LIB_SUFFIX}
+  boost_filesystem${BOOST_LIB_SUFFIX}
+  boost_system${BOOST_LIB_SUFFIX}
+  )
 INSTALL(TARGETS ozulis-core DESTINATION lib)
-- 
2.11.4.GIT