From f4e2f0ea339d0b2524dde28c6bf903c06e97c948 Mon Sep 17 00:00:00 2001
From: Ali Saidi <saidi@eecs.umich.edu>
Date: Mon, 14 Feb 2005 20:47:05 -0500
Subject: undoing change per nates request

--HG--
extra : convert_revision : c5c2fd88dfd8d893da51c2b80907260ec14a7593
---
 SConscript | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

(limited to 'SConscript')

diff --git a/SConscript b/SConscript
index 8f7899134..19f84f913 100644
--- a/SConscript
+++ b/SConscript
@@ -28,7 +28,6 @@
 
 import os
 import sys
-from os.path import isdir
 
 # This file defines how to build a particular configuration of M5
 # based on variable settings in the 'env' build environment.
@@ -337,16 +336,18 @@ else:
 
 extra_libraries = []
 env.Append(LIBS=['z'])
-if isdir('/usr/lib64/mysql') or isdir('/usr/lib/mysql') or \
-   isdir('/usr/local/lib/mysql'):
-    env.Append(LIBPATH=['/usr/lib64/mysql', '/usr/local/lib/mysql/',
-                        '/usr/lib/mysql'])
-    env.Append(CPPPATH=['/usr/local/include/mysql', '/usr/include/mysql'])
+if env['USE_MYSQL']:
     sources += mysql_sources
     env.Append(CPPDEFINES = 'USE_MYSQL')
     env.Append(CPPDEFINES = 'STATS_BINNING')
+    env.Append(CPPPATH=['/usr/local/include/mysql', '/usr/include/mysql'])
+    if os.path.isdir('/usr/lib64'):
+        env.Append(LIBPATH=['/usr/lib64/mysql'])
+    else:
+        env.Append(LIBPATH=['/usr/lib/mysql/'])
     env.Append(LIBS=['mysqlclient'])
 
+
 ###################################################
 #
 # Special build rules.
-- 
cgit v1.2.3