Changeset 1327

Timestamp:

04/12/07 13:28:19 (17 years ago)

Author:

mar637

Message:

enabled customisable lib names

File:

• trunk/SConstruct (modified) (4 diffs)

trunk/SConstruct

@@ -33 +33 @@
                 ("lapacklib",
                  "The lapack library name (e.g. for specialized AMD libraries",
-                 None),
+                 "lapack"),
                 ("blasroot", 
                  "The root directory where blas is installed", None),
@@ -39 +39 @@
                 ("blaslib",
                  "The blas library name (e.g. for specialized AMD libraries",
-                 None),
+                 "blas"),
                 ("cfitsioroot", 
                  "The root directory where cfistio is installed", None),
                 ("cfitsiolibdir", "The cfitsio library location", None),
+                ("cfitsiolib", "The cfitsio library name", "cfitsio"),
                 ("cfitsioincdir", "The cfitsio include location", None),
                 ("wcsroot", 
@@ -106 +107 @@
     if not conf.CheckLib("m"): Exit(1)
     conf.env.AddCustomPackage('cfitsio')
-    if not conf.CheckLibWithHeader('cfitsio', 'fitsio.h', language='c'):
+    if not conf.CheckLibWithHeader(conf.env["cfitsiolib"], 
+                                   'fitsio.h', language='c'):
         Exit(1)
     conf.env.AddCustomPackage('wcs')
@@ -117 +119 @@
     blasname = conf.env.get("blaslib", "blas")
     conf.env.AddCustomPackage("blas")
-    if not conf.CheckLib(blasname): Exit(1)
-    lapackname = conf.env.get("lapacklib", "lapack")
+    if not conf.CheckLib(conf.env["blaslib"]): Exit(1)
     conf.env.AddCustomPackage("lapack")
-    if not conf.CheckLib(lapackname): Exit(1)
+    if not conf.CheckLib(conf.env["lapacklib"]): Exit(1)
     conf.env.CheckFortran(conf)
     if not conf.CheckLib('stdc++', language='c++'): Exit(1)