Changeset 1354

Timestamp:

04/26/07 15:00:04 (18 years ago)

Author:

mar637

Message:

tidy up; added custom rpfits lib name

File:

• trunk/SConstruct (modified) (3 diffs)

trunk/SConstruct

@@ -48 +48 @@
                  "The root directory where wcs is installed", None),
                 ("wcslibdir", "The wcs library location", None),
+                ("rpfitslib", "The rpfits library name", "rpfits"),
                 ("rpfitsroot", 
                  "The root directory where rpfits is installed", None),
                 ("rpfitslibdir", "The rpfits library location", None),
-                
+#               ("rpfitsincdir", "The rpfits include location", None),
                 EnumOption("mode", "The type of build.", "debug",
                            ["release","debug"], ignorecase=1),
@@ -92 +93 @@
                                                "include", "casacore"))
     if not conf.CheckLib("casa_casa", language='c++'): Exit(1)
-    conf.env.PrependUnique(LIBS=["casa_ms", "casa_components",  "casa_coordinates", "casa_lattices", "casa_fits", "casa_measures", "casa_scimath", "casa_scimath_f", "casa_tables", "casa_mirlib"])
+    conf.env.PrependUnique(LIBS=["casa_ms", "casa_components", 
+                                 "casa_coordinates", "casa_lattices", 
+                                 "casa_fits", "casa_measures", "casa_scimath",
+                                 "casa_scimath_f", "casa_tables", 
+                                 "casa_mirlib"])
     conf.env.Append(CPPPATH=[distutils.sysconfig.get_python_inc()])
     if not conf.CheckHeader("Python.h", language='c'):
@@ -116 +121 @@
         Exit(1)
     conf.env.AddCustomPackage('rpfits')
-    if not conf.CheckLib("rpfits"): Exit(1)
+    if not conf.CheckLib(conf.env["rpfitslib"], language="c"):
+        Exit(1)
 
     # test for blas/lapack