[cig-commits] r6361 - in long/3D/Gale/trunk: . python/Gale/packages

[walter at geodynamics.org]

Author: walter
Date: 2007-03-22 22:17:30 -0700 (Thu, 22 Mar 2007)
New Revision: 6361

Modified:
   long/3D/Gale/trunk/
   long/3D/Gale/trunk/python/Gale/packages/libxml2.py
Log:
 r1735 at earth:  boo | 2007-03-22 22:16:26 -0700
 Fix a bug where libxml2 libdir is not set correctly



Property changes on: long/3D/Gale/trunk
___________________________________________________________________
Name: svk:merge
   - 3a629746-de10-0410-b17b-fd6ecaaa963e:/cig:1733
   + 3a629746-de10-0410-b17b-fd6ecaaa963e:/cig:1735

Modified: long/3D/Gale/trunk/python/Gale/packages/libxml2.py
===================================================================
--- long/3D/Gale/trunk/python/Gale/packages/libxml2.py	2007-03-23 04:17:29 UTC (rev 6360)
+++ long/3D/Gale/trunk/python/Gale/packages/libxml2.py	2007-03-23 05:17:30 UTC (rev 6361)
@@ -33,7 +33,7 @@
     return
 
   def configureLibrary(self):
-    '''Checks for libxml2 and defines LIBXML2_CPPPATH, LIBXML2_LIBSPATH, and LIBXML2_LIBS'''
+    '''Checks for libxml2 and defines LIBXML2_CPPPATH, LIBXML2_LIBPATH, and LIBXML2_LIBS'''
 
     foundInclude = 0
     includeDirs  = ['/usr/include/libxml2',
@@ -66,7 +66,7 @@
     if self.framework.argDB.has_key('with-libxml2-libdir'):
       if not os.path.isdir(self.framework.argDB['with-libxml2-libdir']):
         raise RuntimeError('Invalid libxml2 library specified by --with-libxml2-libdir='+os.path.abspath(self.framework.argDB['with-libxml2-libdir']))
-      libraryDir = os.path.dirname(self.framework.argDB['with-libxml2-libdir'])
+      libraryDir = self.framework.argDB['with-libxml2-libdir']
       foundLibrary = 1
     else:
       testLibrary  = 'xml2'