Changeset 1138

Timestamp:

08/15/06 13:34:21 (18 years ago)

Author:

mar637

Message:

enabled custom library directories. Multiple level check for cfitsio

File:

• trunk/SConstruct (modified) (3 diffs)

trunk/SConstruct

@@ -20 +20 @@
                             moduledir),
                 ("rpfitsdir", "Alternative rpfits location.", ""),
+                ("cfitsioincdir", "Alternative cfitsio include dir", ""),
                 ("casadir", "Alternative casa location", ""),
                 EnumOption("mode", "The type of build.", "debug",
@@ -38 +39 @@
 env.SConsignFile()
 env.Append(CASAARCH = '', CASAROOT = '')
-
+if (os.path.exists(env["cfitsioincdir"])):
+    env.Append(CPPPATH=[env["cfitsioincdir"]])
+env.AddCustomPath(env["rpfitsdir"])
 if not env.GetOption('clean'):
     conf = Configure(env)
@@ -54 +57 @@
     conf.env.AddCustomPath(env["rpfitsdir"])
     if not conf.CheckLib('rpfits'): Exit(1)
-    if not conf.CheckLibWithHeader('cfitsio', 'fitsio.h', 'c'): Exit(1)
+    # cfitsio is either in include/ or /include/cfitsio
+    # handle this
+    if not conf.CheckLib(library='cfitsio', language='c'): Exit(1)
+    if not conf.CheckHeader('fitsio.h', language='c'):
+        if not conf.CheckHeader('cfitsio/fitsio.h', language='c'):
+            Exit(1)
+        else:
+            conf.env.Append(CPPPATH=['/usr/include/cfitsio'])
     if (sys.platform == "darwin"):
         conf.env.Append(LIBS = ['-framework vecLib'])