rpms/grads/devel grads-find-system-libs.patch, NONE, 1.1 hdf5.m4, NONE, 1.1 grads-copyright_summary, 1.2, 1.3 grads-find-geotiff.patch, 1.1, NONE
Deji Akingunola
deji at fedoraproject.org
Mon Jul 26 02:05:52 UTC 2010
Author: deji
Update of /cvs/pkgs/rpms/grads/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv3508
Modified Files:
grads-copyright_summary
Added Files:
grads-find-system-libs.patch hdf5.m4
Removed Files:
grads-find-geotiff.patch
Log Message:
Commit new files
grads-find-system-libs.patch:
aclocal.m4 | 2 ++
configure.ac | 51 ++++++++++++++++++++++++++++++++++++++++++++++++---
2 files changed, 50 insertions(+), 3 deletions(-)
--- NEW FILE grads-find-system-libs.patch ---
--- configure.ac 2010-03-26 10:06:25.000000000 -0400
+++ configure.ac.new 2010-04-27 15:51:26.354116875 -0400
@@ -383,6 +383,16 @@
fi
fi
# if we haven't got what we need, add a macro to look outside supplibs
+ if test $use_geotiff != "yes" -a "$ga_dyn_supplibs" = "yes" ; then
+ echo
+ echo "Checking in system locations for libraries to support geotiff ..."
+ AC_CHECK_GEOTIFF([
+ LDFLAGS="$LDFLAGS $GEOTIFF_LDFLAGS"
+ geotiff_libs="$GEOTIFF_LIBS"
+ geotiff_inc=$GEOTIFF_CFLAGS
+ use_geotiff='yes'
+ ])
+ fi
fi
if test "$use_geotiff" != "yes" ; then
AC_DEFINE(GEOTIFF, 0, [Enable geotiff])
@@ -411,6 +421,17 @@
GA_UNSET_FLAGS
fi
# if we haven't got what we need, add a macro to look outside supplibs
+ if test "$use_shp" != "yes" -a "$ga_dyn_supplibs" = "yes" ; then
+ echo
+ echo "Checking in system locations for libraries to support shapefiles ..."
+ AC_CHECK_HEADERS([shapefil.h],
+ [ AC_CHECK_LIB([shp], [main],
+ [ use_shp=yes
+ shp_inc=""
+ shp_libs="-lshp"
+ ])
+ ])
+ fi
fi
if test "$use_shp" != "yes" ; then
AC_DEFINE(USESHP, 0, [Enable shapefile])
@@ -665,6 +686,17 @@
fi
fi
# here's where you would add code for looking outside of supplibs
+ if test $use_hdf5 != "yes" -a "$ga_dyn_supplibs" = "yes" ; then
+ echo
+ echo "Checking in system locations for libraries to support hdf5 ..."
+ AC_CHECK_HDF5([
+ LDFLAGS="$LDFLAGS $HDF5_LDFLAGS"
+ hdf5_libs="$HDF5_LIBS"
+ hdf5_inc=$HDF5_CFLAGS
+ use_hdf5='yes'
+ ])
+ fi
+
if test $use_hdf5 != "yes" ; then
AC_DEFINE(USEHDF5, 0, [Enable hdf5])
echo "- hdf5 disabled"
@@ -704,21 +736,34 @@
])
])
GA_UNSET_FLAGS
+ AC_SUBST(nc_inc)
+ AC_SUBST(nc_libs)
+ NC_CONFIG=${ga_supplib_dir}/bin/nc-config
fi
fi
# here's where you would add code for looking outside of supplibs
+ if test $use_nc4 != "yes" -a "$ga_dyn_supplibs" = "yes" ; then
+ GA_CHECK_UDUNITS(
+ [ AC_CHECK_NETCDF(
+ [ use_nc4=yes
+ LDFLAGS="$LDFLAGS $NC_LDFLAGS"
+ nc_libs="$NC_LIBS $UDUNITS_LIBS"
+ nc_inc="$NC_CFLAGS $UDUNITS_CFLAGS"
+ ],,
+ [])
+ ])
+ NC_CONFIG="`pkg-config --variable=prefix netcdf`/bin/nc-config"
+ fi
+
if test $use_nc4 != "yes" ; then
AC_DEFINE(USENETCDF, 0, [Enable netcdf])
AC_DEFINE(HAVENETCDF4, 0, [Enable netcdf4])
echo "- netcdf-4 disabled"
else
- AC_SUBST(nc_inc)
- AC_SUBST(nc_libs)
AC_DEFINE(USENETCDF, 1, [Enable netcdf])
AC_DEFINE(HAVENETCDF4, 1, [Enable netcdf4])
echo "+ netcdf-4 enabled"
# find out if it is dap-enabled
- NC_CONFIG=${ga_supplib_dir}/bin/nc-config
use_dap=`$NC_CONFIG --has-dap`
if test $use_dap = "yes" ; then
AC_DEFINE(USEDAP, 1, [Enable OPeNDAP for grids])
--- aclocal.m4 2010-03-08 09:54:40.000000000 -0500
+++ aclocal.m4.new 2010-04-27 14:22:05.295832365 -0400
@@ -633,4 +633,6 @@
m4_include([m4/netcdf_header.m4])
m4_include([m4/pkg.m4])
m4_include([m4/udunits.m4])
+m4_include([m4/geotiff.m4])
+m4_include([m4/hdf5.m4])
m4_include([acinclude.m4])
--- NEW FILE hdf5.m4 ---
dnl AC_CHECK_HDF5 : Check for hdf5
dnl args : action-if-yes, action-if-no
AC_DEFUN([AC_CHECK_HDF5],
[
AC_ARG_WITH([hdf5],
[AS_HELP_STRING([--with-hdf5=ARG],[hdf5 directory])],
[HDF5_PATH=$withval],
[HDF5_PATH=""])
AC_ARG_WITH([hdf5_include],
[AS_HELP_STRING([--with-hdf5-include=ARG],[hdf5 include directory])],
[HDF5_PATH_INC=$withval],
[HDF5_PATH_INC=""])
AC_ARG_WITH([hdf5_libdir],
[AS_HELP_STRING([--with-hdf5-libdir=ARG],[hdf5 library directory])],
[HDF5_PATH_LIBDIR=$withval],
[HDF5_PATH_LIBDIR=""])
AS_IF([test "z$HDF5_PATH" != "z"],
[
AS_IF([test "z$HDF5_PATH_LIBDIR" = "z"],
[HDF5_PATH_LIBDIR="$HDF5_PATH/lib"])
AS_IF([test "z$HDF5_PATH_INC" = "z"],
[HDF5_PATH_INC="$HDF5_PATH/include"])
])
ac_hdf5_lib_ok='no'
ac_hdf5_save_LDFLAGS=$LDFLAGS
HDF5_LIBS=
AS_IF([test "z$HDF5_PATH_LIBDIR" != "z"],
[
HDF5_LDFLAGS="-L$HDF5_PATH_LIBDIR"
LDFLAGS="$LDFLAGS $HDF5_LDFLAGS"
AC_CHECK_HDF5_LIB([ac_hdf5_lib_ok='yes'])
],
[
for ac_hdf5_libdir in "" /usr/local/hdf5/lib64/ /opt/hdf5/lib64 /usr/hdf5/lib64 \
/usr/local/lib64/hdf5 /opt/lib64/hdf5 /usr/lib64/hdf5 /usr/lib64 \
/usr/local/hdf5/lib/ /opt/hdf5/lib /usr/hdf5/lib \
/usr/local/lib/hdf5 /opt/lib/hdf5 /usr/lib/hdf5 /usr/lib ; do
AS_IF([test "z$ac_hdf5_libdir" = 'z'],
[HDF5_LDFLAGS=],
[
AC_MSG_NOTICE([searching hdf5 libraries in $ac_hdf5_libdir])
HDF5_LDFLAGS="-L$ac_hdf5_libdir"
])
LDFLAGS="$LDFLAGS $HDF5_LDFLAGS"
AC_CHECK_HDF5_LIB([ac_hdf5_lib_ok='yes'])
AS_IF([test $ac_hdf5_lib_ok = 'yes'],[break])
LDFLAGS=$ac_hdf5_save_LDFLAGS
done
])
LDFLAGS=$ac_hdf5_save_LDFLAGS
ac_hdf5_h='no'
HDF5_CFLAGS=
ac_hdf5_save_CPPFLAGS=$CPPFLAGS
AS_IF([test "z$HDF5_PATH_INC" != "z"],
[
HDF5_CFLAGS="-I$HDF5_PATH_INC"
CPPFLAGS="$CPPFLAGS $HDF5_CFLAGS"
AC_CHECK_HEADER_NOCACHE_HDF5([hdf5.h],[ac_hdf5_h='yes'])
],
[
for ac_hdf5_incdir in "" /usr/include /usr/local/hdf5/include \
/opt/hdf5/include /usr/hdf5/include /usr/local/include/hdf5 \
/opt/include/hdf5 /usr/include/hdf5 ; do
AS_IF([test "z$ac_hdf5_incdir" = 'z'],
[HDF5_CFLAGS=],
[
AC_MSG_NOTICE([searching hdf5 includes in $ac_hdf5_incdir])
HDF5_CFLAGS="-I$ac_hdf5_incdir"
])
CPPFLAGS="$CPPFLAGS $HDF5_CFLAGS"
AC_CHECK_HEADER_NOCACHE_HDF5([hdf5.h],[ac_hdf5_h='yes'])
AS_IF([test $ac_hdf5_h = 'yes'],[break])
CPPFLAGS=$ac_hdf5_save_CPPFLAGS
done
])
CPPFLAGS=$ac_hdf5_save_CPPFLAGS
AS_IF([test "$ac_hdf5_h" = 'yes' -a "$ac_hdf5_lib_ok" = 'yes'],
[m4_if([$1], [], [:], [$1])],
[m4_if([$2], [], [:], [$2])])
AC_SUBST([HDF5_LIBS])
AC_SUBST([HDF5_CFLAGS])
AC_SUBST([HDF5_LDFLAGS])
])
AC_DEFUN([AC_CHECK_HDF5_LIB],
[
HDF5_LIBS=
ac_hdf5_save_LIBS=$LIBS
AC_CHECK_LIB_NOCACHE_HDF5([sz], [main],
[
LIBS="$LIBS -lsz"
HDF5_LIBS='-lsz'
])
dnl -lsz is not required because due to licencing it may not be present
dnl nor required everywhere
ac_hdf5_lib='no'
AC_CHECK_LIB_NOCACHE_HDF5([z],[compress],
[ AC_CHECK_LIB_NOCACHE_HDF5([jpeg],[main],
[ AC_CHECK_LIB_NOCACHE_HDF5([hdf5],[H5Fopen],
[ ac_hdf5_lib="yes"
HDF5_LIBS="-lhdf5 -ljpeg -lz $HDF5_LIBS"
],[],[-lhdf5 -ljpeg -lz])
])
])
LIBS=$ac_hdf5_save_LIBS
AS_IF([test "$ac_hdf5_lib" = 'yes'],
[m4_if([$1], [], [:], [$1])],
[m4_if([$2], [], [:], [$2])])
])
AC_DEFUN([AC_CHECK_LIB_NOCACHE_HDF5],
[
AS_TR_SH([ac_check_lib_nocache_ok_$1_$2])='no'
AS_TR_SH([ac_check_lib_nocache_$1_$2_LIBS])=$LIBS
LIBS="-l$1 $5 $LIBS"
AC_MSG_CHECKING([for $2 in -l$1])
AC_LINK_IFELSE([AC_LANG_CALL([], [$2])],
[
AS_TR_SH([ac_check_lib_nocache_ok_$1_$2])='yes'
AC_MSG_RESULT([yes])
],[
AC_MSG_RESULT([no])
])
LIBS=$AS_TR_SH([ac_check_lib_nocache_$1_$2_LIBS])
AS_IF([test $AS_TR_SH([ac_check_lib_nocache_ok_$1_$2]) = 'yes'],
[m4_if([$3], [], [:], [$3])],
[m4_if([$4], [], [:], [$4])])
])
AC_DEFUN([AC_CHECK_HEADER_NOCACHE_HDF5],
[
AS_TR_SH([ac_check_header_nocache_compile_$1])='no'
AC_MSG_CHECKING([for $1 with compiler])
AC_COMPILE_IFELSE([AC_LANG_SOURCE([[#include <$1>]])],
[
AC_MSG_RESULT([yes])
AS_TR_SH([ac_check_header_nocache_compile_$1])='yes'
],
[
AC_MSG_RESULT([no])
])
AS_IF([test "$AS_TR_SH([ac_check_header_nocache_compile_$1])" = 'yes'],
[m4_if([$2], [], [:], [$2])],
[m4_if([$3], [], [:], [$3])])
])
Index: grads-copyright_summary
===================================================================
RCS file: /cvs/pkgs/rpms/grads/devel/grads-copyright_summary,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- grads-copyright_summary 27 Nov 2009 15:30:43 -0000 1.2
+++ grads-copyright_summary 26 Jul 2010 02:05:52 -0000 1.3
@@ -159,7 +159,7 @@ files may be under a free licence descri
?: no licence. The file isn't free because there is no licence.
-Z: cannot be sold for profit - Now provided as GPL in opengrads
+Z: cannot be sold for profit
* Permission is granted to any individual or institution to use,
* copy, or redistribute this software so long as it is not sold for
@@ -168,6 +168,3 @@ Z: cannot be sold for profit - Now provi
gacfg.c (Z) IGES
gagui.h (Z) Arlindo da Silva
-The 'not for profit' clause in these files have been removed by original author,
-Arlindo da Silva. They are now pure GPLv2 licensed, changes have been sent
-upstream.
--- grads-find-geotiff.patch DELETED ---
More information about the scm-commits
mailing list