Changeset 3126 for trunk

Timestamp:

05/16/17 15:13:24 (8 years ago)

Author:

Malte Marquarding

Message:

Remove redundant wcslib

File:

• trunk/SConstruct (modified) (2 diffs)

trunk/SConstruct

@@ -48 +48 @@
                 ("cfitsiolib", "The cfitsio library name", "cfitsio"),
                 ("cfitsioincdir", "The cfitsio include location", None),
-                ("wcslib", "The wcs library name", "wcs"),
-                ("wcsroot", 
-                 "The root directory where wcs is installed", None),
-                ("wcslibdir", "The wcs library location", None),
                 ("rpfitslib", "The rpfits library name", "rpfits"),
                 ("rpfitsroot", 
@@ -126 +122 @@
         if not conf.CheckLib(libname, language='c'):
             Exit(1)
-    conf.env.AddCustomPackage('wcs')
-    libname = conf.env["wcslib"]
-    if libname.find(".") > -1 and os.path.exists(libname):
-        conf.env.AppendUnique(LIBS=[env.File(libname)])
-    else:
-        if not conf.CheckLibWithHeader(libname, 
-                                       'wcslib/wcs.h', language='c'):
-            Exit(1)
 
     conf.env.AddCustomPackage('rpfits')