GRIB-179: Data representation template 5.42 (CCSDS). Python fixes

This commit is contained in:
Shahram Najm 2014-10-10 18:09:04 +01:00
parent ec36b55400
commit ec773964ed
3 changed files with 19 additions and 0 deletions

View File

@ -470,6 +470,11 @@ if test "x$with_aec" != xno ; then
AC_CHECK_LIB(aec, aec_encode, , [AC_MSG_FAILURE( AC_CHECK_LIB(aec, aec_encode, , [AC_MSG_FAILURE(
[aec test failed (--without-aec to disable)])]) [aec test failed (--without-aec to disable)])])
CCSDS_TEST="ccsds.sh" CCSDS_TEST="ccsds.sh"
LIB_AEC='-laec'
AC_SUBST(LIB_AEC)
AEC_DIR="$with_aec"
AC_SUBST(AEC_DIR)
fi fi
AC_SUBST(CCSDS_TEST) AC_SUBST(CCSDS_TEST)

View File

@ -84,6 +84,8 @@ do_subst = sed -e 's,[@]LIB_JASPER[@],$(LIB_JASPER),g' \
-e 's,[@]JASPER_DIR[@],$(JASPER_DIR),g' \ -e 's,[@]JASPER_DIR[@],$(JASPER_DIR),g' \
-e 's,[@]LIB_OPENJPEG[@],$(LIB_OPENJPEG),g' \ -e 's,[@]LIB_OPENJPEG[@],$(LIB_OPENJPEG),g' \
-e 's,[@]OPENJPEG_DIR[@],$(OPENJPEG_DIR),g' \ -e 's,[@]OPENJPEG_DIR[@],$(OPENJPEG_DIR),g' \
-e 's,[@]LIB_AEC[@],$(LIB_AEC),g' \
-e 's,[@]AEC_DIR[@],$(AEC_DIR),g' \
-e 's,[@]LIB_PNG[@],$(LIB_PNG),g' \ -e 's,[@]LIB_PNG[@],$(LIB_PNG),g' \
-e 's,[@]BUILD_DIR[@],$(top_builddir),g' \ -e 's,[@]BUILD_DIR[@],$(top_builddir),g' \
-e 's,[@]DATA_HANDLER[@],$(PYTHON_DATA_HANDLER),g' -e 's,[@]DATA_HANDLER[@],$(PYTHON_DATA_HANDLER),g'

View File

@ -46,6 +46,18 @@ png = '@LIB_PNG@'
if png: if png:
add_attribute(libraries = 'png') add_attribute(libraries = 'png')
with_aec = '@LIB_AEC@'
if with_aec:
aec_dir = '@AEC_DIR@'
if aec_dir and aec_dir != 'system':
add_attribute(
include_dirs = os.path.join(aec_dir,'include'),
library_dirs = os.path.join(aec_dir,'lib')
)
add_attribute(libraries = 'aec')
data_handler = '@DATA_HANDLER@' data_handler = '@DATA_HANDLER@'
if data_handler == "numpy": if data_handler == "numpy":
import numpy import numpy