Look for Boost in /opt/local before /usr/local

1 files changed, 38 insertions, 37 deletions

diff --git a/acprep b/acprep
index 27c15c0f..12236302 100755
--- a/acprep
+++ b/acprep
@@ -929,15 +929,7 @@ class PrepareBuild(CommandLineApp):
     #########################################################################
 
     def setup_flavor_default(self):
-        if exists('/usr/local/lib/libboost_regex-xgcc44-s-1_40.a'):
-            self.envvars['BOOST_HOME']   = '/usr/local'
-            self.envvars['BOOST_SUFFIX'] = '-xgcc44-s-1_40'
-            self.log.info('Setting BOOST_SUFFIX  => %s' %
-                           self.envvars['BOOST_SUFFIX'])
-
-            self.sys_include_dirs.append('/usr/local/include/boost-1_40')
-
-        elif exists('/opt/local/lib/libboost_regex.a'):
+        if exists('/opt/local/lib/libboost_regex.a'):
             self.envvars['BOOST_HOME']   = '/opt/local'
             self.envvars['BOOST_SUFFIX'] = ''
 
@@ -946,6 +938,14 @@ class PrepareBuild(CommandLineApp):
 
             self.sys_include_dirs.append('/opt/local/include/boost')
 
+        elif exists('/usr/local/lib/libboost_regex-xgcc44-s-1_40.a'):
+            self.envvars['BOOST_HOME']   = '/usr/local'
+            self.envvars['BOOST_SUFFIX'] = '-xgcc44-s-1_40'
+            self.log.info('Setting BOOST_SUFFIX  => %s' %
+                          self.envvars['BOOST_SUFFIX'])
+
+            self.sys_include_dirs.append('/usr/local/include/boost-1_40')
+
     def setup_flavor_debug(self):
         self.configure_args.append('--enable-debug')
 
@@ -962,35 +962,28 @@ class PrepareBuild(CommandLineApp):
                     self.sys_include_dirs.remove('/usr/local/stow/cppunit/include')
                     self.sys_library_dirs.remove('/usr/local/stow/cppunit/lib')
 
-                self.sys_include_dirs.insert(0, '/usr/local/stow/cppunit-debug/include')
-                self.sys_library_dirs.insert(0, '/usr/local/stow/cppunit-debug/lib')
-
-            if exists('/usr/local/lib/libboost_regex-xgcc44-sd-1_40.a'):
-                self.envvars['BOOST_HOME']   = '/usr/local'
-                self.envvars['BOOST_SUFFIX'] = '-xgcc44-sd-1_40'
-                self.log.info('Setting BOOST_SUFFIX  => %s' %
-                               self.envvars['BOOST_SUFFIX'])
-
-                self.sys_include_dirs.append('/usr/local/include/boost-1_40')
+                if exists('/usr/local/stow/cppunit-debug/include'):
+                    self.sys_include_dirs.insert(0, '/usr/local/stow/cppunit-debug/include')
+                    self.sys_library_dirs.insert(0, '/usr/local/stow/cppunit-debug/lib')
 
-            elif exists('/opt/local/lib/libboost_regex-d.a'):
+            if exists('/opt/local/lib/libboost_regex-d.a'):
                 self.envvars['BOOST_HOME']   = '/opt/local'
                 self.envvars['BOOST_SUFFIX'] = '-d'
 
                 self.log.info('Setting BOOST_SUFFIX  => %s' %
-                               self.envvars['BOOST_SUFFIX'])
+                              self.envvars['BOOST_SUFFIX'])
 
                 self.sys_include_dirs.append('/opt/local/include/boost')
-        else:
-            if exists('/usr/local/lib/libboost_regex-xgcc44-s-1_40.a'):
+
+            elif exists('/usr/local/lib/libboost_regex-xgcc44-sd-1_40.a'):
                 self.envvars['BOOST_HOME']   = '/usr/local'
-                self.envvars['BOOST_SUFFIX'] = '-xgcc44-s-1_40'
+                self.envvars['BOOST_SUFFIX'] = '-xgcc44-sd-1_40'
                 self.log.info('Setting BOOST_SUFFIX  => %s' %
-                               self.envvars['BOOST_SUFFIX'])
+                              self.envvars['BOOST_SUFFIX'])
 
                 self.sys_include_dirs.append('/usr/local/include/boost-1_40')
-
-            elif exists('/opt/local/lib/libboost_regex.a'):
+        else:
+            if exists('/opt/local/lib/libboost_regex.a'):
                 self.envvars['BOOST_HOME']   = '/opt/local'
                 self.envvars['BOOST_SUFFIX'] = ''
 
@@ -999,27 +992,35 @@ class PrepareBuild(CommandLineApp):
 
                 self.sys_include_dirs.append('/opt/local/include/boost')
 
+            elif exists('/usr/local/lib/libboost_regex-xgcc44-s-1_40.a'):
+                self.envvars['BOOST_HOME']   = '/usr/local'
+                self.envvars['BOOST_SUFFIX'] = '-xgcc44-s-1_40'
+                self.log.info('Setting BOOST_SUFFIX  => %s' %
+                              self.envvars['BOOST_SUFFIX'])
+
+                self.sys_include_dirs.append('/usr/local/include/boost-1_40')
+
     def setup_flavor_opt(self):
         self.CXXFLAGS.append('-O3')
         self.CXXFLAGS.append('-fomit-frame-pointer')
 
-        if exists('/usr/local/lib/libboost_regex-xgcc44-s-1_40.a'):
-            self.envvars['BOOST_HOME']   = '/usr/local'
-            self.envvars['BOOST_SUFFIX'] = '-xgcc44-s-1_40'
-            self.log.info('Setting BOOST_SUFFIX  => %s' %
-                           self.envvars['BOOST_SUFFIX'])
-
-            self.sys_include_dirs.append('/usr/local/include/boost-1_40')
-
-        elif exists('/opt/local/lib/libboost_regex.a'):
+        if exists('/opt/local/lib/libboost_regex.a'):
             self.envvars['BOOST_HOME']   = '/opt/local'
             self.envvars['BOOST_SUFFIX'] = ''
 
             self.log.info('Setting BOOST_SUFFIX  => %s' %
-                           self.envvars['BOOST_SUFFIX'])
+                          self.envvars['BOOST_SUFFIX'])
 
             self.sys_include_dirs.append('/opt/local/include/boost')
 
+        elif exists('/usr/local/lib/libboost_regex-xgcc44-s-1_40.a'):
+            self.envvars['BOOST_HOME']   = '/usr/local'
+            self.envvars['BOOST_SUFFIX'] = '-xgcc44-s-1_40'
+            self.log.info('Setting BOOST_SUFFIX  => %s' %
+                          self.envvars['BOOST_SUFFIX'])
+
+            self.sys_include_dirs.append('/usr/local/include/boost-1_40')
+
     def setup_flavor_gcov(self):
         self.CXXFLAGS.append('-g')
         self.CXXFLAGS.append('-fprofile-arcs')