From 7b7e915237f657e30788885ce23ec5ea771deefe Mon Sep 17 00:00:00 2001
From: cdfrey <cdfrey>
Date: Sat, 23 Feb 2008 03:53:33 +0000
Subject: [PATCH] - fixed configure.ac's --with-boost option, so that without
 args, 	it defaults to using --includedir and --libdir settings, 
 instead of hardcoding /usr/include and /usr/lib... this 	should allow
 smarter compiling on 64 bit systems

---
 ChangeLog    | 5 +++++
 configure.ac | 6 +++---
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 40f05bcb..8aadf5bf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 Release: version 0.12 - 2008/02/??
 ------------------------------------------------------------------------------
+2008/02/22
+	- fixed configure.ac's --with-boost option, so that without args,
+		it defaults to using --includedir and --libdir settings,
+		instead of hardcoding /usr/include and /usr/lib... this
+		should allow smarter compiling on 64 bit systems
 2008/01/25
 	- fixed locale issues in src/data.cc
 	- updated copyright statments for 2008
diff --git a/configure.ac b/configure.ac
index dc283ebb..b6c052f1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -31,7 +31,7 @@ AC_ARG_WITH(libusb,
 
 AC_ARG_WITH(boost,
 	AC_HELP_STRING(--with-boost[=path],
-		[root path of boost installation (no arg defaults to 'yes' and uses system path]),
+		[root path of boost installation (no arg defaults to 'yes' and uses --includedir and --libdir)]),
 	use_boost=$withval,  use_boost=no ) 
 
 if test x"$use_boost" != "xyes" ; then
@@ -41,8 +41,8 @@ if test x"$use_boost" != "xyes" ; then
 		BOOST_ENABLED="true"
 	fi
 else
-	BOOST_LIB_PATH="/usr/lib"
-	BOOST_INC_PATH="/usr/include"
+	BOOST_LIB_PATH="${libdir}"
+	BOOST_INC_PATH="${includedir}"
 	BOOST_ENABLED="true"	
 fi
 
-- 
2.11.4.GIT