[cig-commits] commit: Making HDF5 a requirement of Magma.

[Mercurial]

changeset:   36:2b49f13a6025
user:        LukeHodkinson
date:        Fri Feb 15 02:26:37 2008 +0000
files:       SConfigure
description:
Making HDF5 a requirement of Magma.


diff -r 8d1e080db00d -r 2b49f13a6025 SConfigure
--- a/SConfigure	Fri Feb 15 02:21:17 2008 +0000
+++ b/SConfigure	Fri Feb 15 02:26:37 2008 +0000
@@ -203,6 +203,7 @@ petscext.require_shared = True
 petscext.require_shared = True
 petscext.func_src = """PetscInitialize(&argc, &argv, NULL, NULL);
 PetscFinalize();"""
+petscext.add_options(opts)
 
 libxml = env.Package('libXML2', env)
 libxml.pkg_dirs = ['libxml2', 'libXML2']
@@ -264,7 +265,7 @@ hdf = env.Package('HDF5', env)
 hdf = env.Package('HDF5', env)
 hdf.hdrs = ['hdf5.h']
 hdf.libs = ['hdf5']
-avc.add_options(opts)
+hdf.add_options(opts)
 
 # Add other options.
 opts.AddOptions(
@@ -388,8 +389,10 @@ if not 'help' in COMMAND_LINE_TARGETS:
         env.Append(CPPDEFINES=['HAVE_AVCODEC'])
 
     # Setup HDF5.
-    if cfg.CheckPackage(hdf):
-        env.Append(CPPDEFINES=['HAVE_HDF5'])
+    if not cfg.CheckPackage(hdf):
+        hdf.print_opts_help()
+        env.Exit()
+    env.Append(CPPDEFINES=['HAVE_HDF5'])
 
     # Check Fortran symbol type.
     if not cfg.CheckFortranSymbol():