1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
| | Allow shared build.
---
Makefile.am | 6 ------
configure.ac | 12 ------------
include/HE5_HdfEosDef.h | 1 +
src/Makefile.am | 3 ++-
4 files changed, 3 insertions(+), 19 deletions(-)
diff --git a/Makefile.am b/Makefile.am
index 363bcfb..01ed024 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -3,13 +3,7 @@
# Include boilerplate
include $(top_srcdir)/config/include.am
-# List of subdirectories.
-# Only build the testdrivers directory if configure detected that it's present.
-if TESTDRIVERS_CONDITIONAL
-TESTDRIVERS=testdrivers
-else
TESTDRIVERS=
-endif
if INSTALL_INCLUDE_CONDITIONAL
INCLUDE=include
diff --git a/configure.ac b/configure.ac
index 5d48b43..cfa9d4e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -13,9 +13,6 @@ AC_CONFIG_AUX_DIR([config])
AM_INIT_AUTOMAKE([foreign])
AM_MAINTAINER_MODE
-# Disable shared libraries (for now)
-AC_DISABLE_SHARED
-
AM_PROG_LIBTOOL
dnl ----------------------------------------------------------------------
@@ -597,13 +594,4 @@ AC_CONFIG_FILES([Makefile
gctp/src/Makefile
samples/Makefile])
-if test "X$TESTDRIVERS_DIR" = "Xyes"; then
- AC_CONFIG_FILES([ testdrivers/Makefile
- testdrivers/grid/Makefile
- testdrivers/point/Makefile
- testdrivers/swath/Makefile
- testdrivers/threads/Makefile
- testdrivers/za/Makefile])
-fi
-
AC_OUTPUT
diff --git a/include/HE5_HdfEosDef.h b/include/HE5_HdfEosDef.h
index 9ed7881..abf0a90 100755
--- a/include/HE5_HdfEosDef.h
+++ b/include/HE5_HdfEosDef.h
@@ -24,6 +24,7 @@
#ifndef HE5_HDFEOSDEF_H_
#define HE5_HDFEOSDEF_H_
+#define H5_USE_16_API 1
#include <hdf5.h>
#ifdef H5_USE_16_API
diff --git a/src/Makefile.am b/src/Makefile.am
index 76b1d4c..daf7ad8 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -10,7 +10,8 @@ INCLUDES=-I$(top_srcdir)/include/
# Set LDFLAGS to allow the HDF-EOS library to use extern variables from
# HDF5
-LDFLAGS=-Wl,-single_module
+LDFLAGS+= -shrext .so
+LIBS+= -lhdf5_hl -lhdf5 -lm
# Build HDF-EOS5
lib_LTLIBRARIES=libhe5_hdfeos.la
--
2.5.0
|