diff options
| author | Albert Cheng <acheng@hdfgroup.org> | 2009-09-19 23:55:44 (GMT) |
|---|---|---|
| committer | Albert Cheng <acheng@hdfgroup.org> | 2009-09-19 23:55:44 (GMT) |
| commit | ef2aa6be0b8dd385a7092ae1b055335afbe91a6b (patch) | |
| tree | 0cf1ef47d14af103362a9b11ff05638622b0342e /src/H5detect.c | |
| parent | 3a83be48fb88572d675507a5d5cfbacb302f1ad7 (diff) | |
| download | hdf5-ef2aa6be0b8dd385a7092ae1b055335afbe91a6b.zip hdf5-ef2aa6be0b8dd385a7092ae1b055335afbe91a6b.tar.gz hdf5-ef2aa6be0b8dd385a7092ae1b055335afbe91a6b.tar.bz2 | |
[svn-r17500] Bug fix and improvement.
Description:
Build failed when embedded-info is not enabled. Fixed.
testlibinfo.sh output was ugly, did not prepare the case of embedded-info
not enabled. Fixed. Also changed NOT to test test binary even if static-exec
is enabled.
Tested:
jam (with and without embedded-info enabled). Did not test in other
platforms since these were script changes that are platform independent.
Diffstat (limited to 'src/H5detect.c')
| -rw-r--r-- | src/H5detect.c | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/src/H5detect.c b/src/H5detect.c index 4dae076..d5801ef 100644 --- a/src/H5detect.c +++ b/src/H5detect.c @@ -508,6 +508,8 @@ sigbus_handler(int UNUSED signo) * * Purpose: insert the contents of libhdf5.settings into a file * represented by flibinfo. + * Make it an empty string if H5_HAVE_EMBEDDED_LIBINFO is not + * defined, i.e., not enabled. * * Return: void * @@ -522,6 +524,7 @@ sigbus_handler(int UNUSED signo) static void insert_libhdf5_settings(FILE *flibinfo) { +#ifdef H5_HAVE_EMBEDDED_LIBINFO FILE *fsettings; /* for files libhdf5.settings */ int inchar; int bol=0; /* indicates the beginning of a new line */ @@ -562,6 +565,10 @@ insert_libhdf5_settings(FILE *flibinfo) perror(LIBSETTINGSFNAME); exit(1); } +#else + /* print variable definition and an empty string */ + fprintf(flibinfo, "char H5libhdf5_settings[]=\"\";\n"); +#endif } @@ -670,10 +677,8 @@ print_results(int nd, detected_t *d, int na, malign_t *misc_align) /*******************/\n\ \n"); -#ifdef H5_HAVE_EMBEDDED_LIBINFO - /* Generate embedded library information files */ + /* Generate embedded library information variable definition */ make_libinfo(); -#endif /* The interface initialization function */ printf("\n\ |