rpms/grads/devel NOTICE.wgrib, NONE, 1.1 grads-README.xorg, NONE, 1.1 grads-build_fixes.diff, NONE, 1.1 grads-conditionnal_lats.diff, NONE, 1.1 grads-copyright_summary, NONE, 1.1 grads-remove-files, NONE, 1.1 grads-removed-files-list, NONE, 1.1 grads.spec, NONE, 1.1 grads_dap-no_lats.patch, NONE, 1.1 libdap.m4, NONE, 1.1 libnc-dap.m4, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Patrice Dumas (pertusus)
fedora-extras-commits at redhat.com
Tue Dec 20 12:16:29 UTC 2005
Author: pertusus
Update of /cvs/extras/rpms/grads/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6550/devel
Modified Files:
.cvsignore sources
Added Files:
NOTICE.wgrib grads-README.xorg grads-build_fixes.diff
grads-conditionnal_lats.diff grads-copyright_summary
grads-remove-files grads-removed-files-list grads.spec
grads_dap-no_lats.patch libdap.m4 libnc-dap.m4
Log Message:
auto-import grads-1.9b4-4 on branch devel from grads-1.9b4-4.src.rpm
--- NEW FILE NOTICE.wgrib ---
The following files are placed into the public domain. While
you could legally do anything you want with the code, telling
the world that you wrote it would be uncool. Selling it would
be really uncool. The code was written for NMC/NCAR Reanalysis
and may not work GRIB files from other sources. The code,
as usual, is not warranteed to be fit for any purpose what so ever.
Use at your own risk.
Wesley Ebisuzaki November 25, 1995
BDS_unpack.c
bds.h
bms.h
cnames.c
cnames.h
gds.h
grib.h
ibm2flt.c
intpower.c
pds3.h
readgrib.c
seekgrib.c
testbin.c
wgrib.c
--- NEW FILE grads-README.xorg ---
You should enable the BackingStore capability of your X server if you want
to avoid that windows on top of the grads window erase the grads window
content. With xorg, you should put the following in the Device section of
xorg.conf:
Option "BackingStore" "True"
With this option, xorg will use more CPU.
grads-build_fixes.diff:
--- NEW FILE grads-build_fixes.diff ---
diff -u --recursive --exclude aclocal.m4 --exclude configure --exclude Makefile.in --exclude bootstrap grads-1.9b4-orig/acinclude.m4 grads-1.9b4/acinclude.m4
--- grads-1.9b4-orig/acinclude.m4 2003-10-02 16:01:15.000000000 +0200
+++ grads-1.9b4/acinclude.m4 2005-08-16 12:08:41.000000000 +0200
@@ -165,10 +165,10 @@
dnl enabled, just calls AC_CHECK_LIB. If not, checks for the presence
dnl of a file "libname.a" in the supplibs directory.
dnl args: library-name, extra-libs, action-if-found, action-if-not-found
-AC_DEFUN(GA_CHECK_LIB,
+AC_DEFUN([GA_CHECK_LIB],
[
if test "${ga_dyn_supplibs}" = "yes" ; then
- AC_CHECK_LIB($1, $2, $3, $4)
+ AC_CHECK_LIB([$1], [$2], [$3], [$4], [$5])
else
AC_MSG_CHECKING([for lib$1.a in supplibs])
if test -f "${ga_supplib_dir}/lib/lib$1.a" ; then
@@ -249,7 +249,39 @@
GA_UNSET_FLAGS
])
+dnl GA_CHECK_NEW_GUI : Checks whether GrADS can be built with GUI features
+dnl enabled. Check libsx without freq.
+dnl args : action-if-yes, action-if-no
+AC_DEFUN([GA_CHECK_NEW_GUI],
+[
+ # Check libs and headers for GUI widgets
+ GA_SET_FLAGS([$X_CFLAGS], [$X_LIBS])
+ ga_check_new_gui="no"
+ AC_CHECK_HEADER([libsx.h],
+ [ AC_CHECK_LIB([Xt],[main],
+ [ AC_CHECK_LIB([Xaw],[main],
+ [ AC_CHECK_LIB([Xmu],[main],
+ [ GA_CHECK_LIB([sx],[GetFile],
+ [ ga_check_new_gui="yes"
+ ],
+ [ ga_check_new_gui="no"
+ ],
+ [-lXaw -lXmu -lXt])
+ ])
+ ])
+ ])
+ ])
+ if test $ga_check_new_gui = "yes" ; then
+ $1
+ true #dummy command
+ else
+ $2
+ true #dummy command
+ fi
+
+ GA_UNSET_FLAGS
+])
dnl GA_CHECK_GD : Checks whether GrADS can be built with printim command
dnl enabled.
@@ -324,7 +356,7 @@
AC_DEFUN(GA_CHECK_NC,
[
# Check libs and headers for netCDF support
- GA_SET_FLAGS([-I{ga_supplib_dir}/include/nc])
+ GA_SET_FLAGS([-I${ga_supplib_dir}/include/nc])
ga_check_nc="no"
AC_CHECK_HEADER(udunits.h,
@@ -356,7 +388,7 @@
AC_DEFUN(GA_CHECK_HDF,
[
# Check libs and headers for HDF support
- GA_SET_FLAGS([-I{ga_supplib_dir}/include/hdf])
+ GA_SET_FLAGS([-I${ga_supplib_dir}/include/hdf])
ga_check_hdf="no"
AC_CHECK_HEADER(udunits.h,
@@ -394,7 +426,7 @@
AC_DEFUN(GA_CHECK_DODS,
[
# Check libs and headers for DODS support
- GA_SET_FLAGS([-I{ga_supplib_dir}/include/dods])
+ GA_SET_FLAGS([-I${ga_supplib_dir}/include/dods])
ga_check_dods="no"
AC_CHECK_HEADER(udunits.h,
Seulement dans grads-1.9b4: autom4te.cache
Seulement dans grads-1.9b4: autoscan.log
Seulement dans grads-1.9b4: config.h.in
Seulement dans grads-1.9b4: config.log
Seulement dans grads-1.9b4: config.status
diff -u --recursive --exclude aclocal.m4 --exclude configure --exclude Makefile.in --exclude bootstrap grads-1.9b4-orig/configure.in grads-1.9b4/configure.in
--- grads-1.9b4-orig/configure.in 2005-05-23 17:04:40.000000000 +0200
+++ grads-1.9b4/configure.in 2005-08-16 12:05:01.000000000 +0200
@@ -274,14 +274,24 @@
use_gui=no
+use_new_gui=no
if test "$with_gui" != "no" ; then
echo "Check GrADS GUI support..."
GA_CHECK_GUI([use_gui=yes])
+ if test $use_gui = no; then
+ GA_CHECK_NEW_GUI([use_new_gui=yes; use_gui=yes])
+ fi
fi
if test $use_gui = "yes" ; then
AC_DEFINE(USEGUI, 1, [Enable GUI widgets])
echo "+ GUI enabled"
- GA_SET_LIB_VAR(gui_libs, [sx freq])
+ if test $use_new_gui = no; then
+ GA_SET_LIB_VAR(gui_libs, [sx freq])
+ AC_DEFINE(USEFREQ, 1, [Use GetFile from freq])
+ else
+ GA_SET_LIB_VAR([gui_libs], [sx])
+ AC_DEFINE(USEFREQ, 0, [Use GetFile from freq])
+ fi
gui_libs="$gui_libs -lXaw -lXmu -lXt $guilibadd"
AC_SUBST(gui_libs)
else
@@ -383,15 +393,25 @@
use_dods=no
+dods_ncdap=no
if test "$with_dods" != "no" ; then
GA_CHECK_DODS([use_dods=yes])
+ if test "z$use_dods" = "zno" -a "${ga_dyn_supplibs}" = "yes" ; then
+ AC_CHECK_HEADER([udunits.h],
+ [ AC_CHECK_HEADER([netcdf.h],
+ [ GA_CHECK_LIB([udunits], [utInit],
+ [AC_CHECK_NC_DODS([dods_ncdap=yes; use_dods=yes])])
+ ])
+ ])
+ fi
fi
if test $use_dods = "yes" ; then
extra_bins="$extra_bins gradsdods"
- GA_SET_LIB_VAR(dods_libs, [udunits www rx z])
-
+ if test "z$dods_ncdap" = "zno" ; then
+ GA_SET_LIB_VAR(dods_libs, [udunits www rx z])
+ fi
GA_CHECK_LIB(gadods, main, [use_gadods=yes], [use_gadods=no])
if test $use_gadods = "yes" ; then
@@ -404,7 +424,11 @@
echo "+ gradsdods (OPeNDAP/netCDF) build enabled - gridded interface only"
fi
- dods_libs="$dods_rep_libs $dods_rep_libs $dods_libs"
+ if test "z$dods_ncdap" = "zyes" ; then
+ dods_libs="$NC_DAP_LIBS -ludunits"
+ else
+ dods_libs="$dods_rep_libs $dods_rep_libs $dods_libs"
+ fi
AC_SUBST(dods_libs)
AC_SUBST(gadods_def)
else
Seulement dans grads-1.9b4: configure.scan
Seulement dans grads-1.9b4: grads-1.9b4.tar.gz
Seulement dans grads-1.9b4: grads.spec
Seulement dans grads-1.9b4: libdap.m4
Seulement dans grads-1.9b4: libnc-dap.m4
Seulement dans grads-1.9b4: Makefile
Seulement dans grads-1.9b4/src: bufrscan
Seulement dans grads-1.9b4/src: bufrscan.o
Seulement dans grads-1.9b4/src: bufrstn.o
Seulement dans grads-1.9b4/src: buildinfo.h
Seulement dans grads-1.9b4/src: config.h
diff -u --recursive --exclude aclocal.m4 --exclude configure --exclude Makefile.in --exclude bootstrap grads-1.9b4-orig/src/config.h.in grads-1.9b4/src/config.h.in
--- grads-1.9b4-orig/src/config.h.in 2004-12-15 22:00:03.000000000 +0100
+++ grads-1.9b4/src/config.h.in 2005-08-16 12:05:39.000000000 +0200
@@ -88,6 +88,9 @@
/* Define to 1 if you have the ANSI C header files. */
#undef STDC_HEADERS
+/* Use GetFile from freq */
+#undef USEFREQ
+
/* Enable GUI widgets */
#undef USEGUI
Seulement dans grads-1.9b4/src: config.h.in~
Seulement dans grads-1.9b4/src: fgbds.o
Seulement dans grads-1.9b4/src: fgutil.o
Seulement dans grads-1.9b4/src: gabufr.o
Seulement dans grads-1.9b4/src: gabufrtbl.o
Seulement dans grads-1.9b4/src: gacfg-c.o
Seulement dans grads-1.9b4/src: gacfg-dods.o
Seulement dans grads-1.9b4/src: gacfg-hdf.o
Seulement dans grads-1.9b4/src: gacfg-nc.o
Seulement dans grads-1.9b4/src: gaddes-c.o
Seulement dans grads-1.9b4/src: gaddes-dods.o
Seulement dans grads-1.9b4/src: gaddes-hdf.o
Seulement dans grads-1.9b4/src: gaddes-nc.o
Seulement dans grads-1.9b4/src: gaddes.sa.o
Seulement dans grads-1.9b4/src: gaexpr.o
Seulement dans grads-1.9b4/src: gafunc.o
Seulement dans grads-1.9b4/src: gagmap.o
Seulement dans grads-1.9b4/src: gagui.o
Seulement dans grads-1.9b4/src: gagx.o
Seulement dans grads-1.9b4/src: gaio-c.o
Seulement dans grads-1.9b4/src: gaio-dods.o
Seulement dans grads-1.9b4/src: gaio-hdf.o
Seulement dans grads-1.9b4/src: gaio-nc.o
Seulement dans grads-1.9b4/src: galats.o
Seulement dans grads-1.9b4/src: gamach.o
Seulement dans grads-1.9b4/src: gasdf-dods.o
Seulement dans grads-1.9b4/src: gasdf-hdf.o
Seulement dans grads-1.9b4/src: gasdf-nc.o
diff -u --recursive --exclude aclocal.m4 --exclude configure --exclude Makefile.in --exclude bootstrap grads-1.9b4-orig/src/gauser.c grads-1.9b4/src/gauser.c
--- grads-1.9b4-orig/src/gauser.c 2005-05-18 20:51:01.000000000 +0200
+++ grads-1.9b4/src/gauser.c 2005-08-16 11:33:49.000000000 +0200
@@ -42,6 +42,7 @@
#endif
/* int gxhpng (char *, int, int, int, int); */
+int gxhpng (char *, int, int, int, int, char *, char *, int) ;
/*mf 971022 --- expose Mike Fiorino's global struct to these routines for warning level setting mf*/
extern struct gamfcmn mfcmn;
Seulement dans grads-1.9b4/src: gauser-c.o
Seulement dans grads-1.9b4/src: gauser-dods.o
Seulement dans grads-1.9b4/src: gauser-hdf.o
Seulement dans grads-1.9b4/src: gauser-nc.o
Seulement dans grads-1.9b4/src: gautil.o
Seulement dans grads-1.9b4/src: gautil.sa.o
Seulement dans grads-1.9b4/src: gd13gif.o
Seulement dans grads-1.9b4/src: gradsc
Seulement dans grads-1.9b4/src: gradsdods
Seulement dans grads-1.9b4/src: gradshdf
Seulement dans grads-1.9b4/src: gradsnc
Seulement dans grads-1.9b4/src: grads.o
Seulement dans grads-1.9b4/src: gribmap
Seulement dans grads-1.9b4/src: gribmap.o
Seulement dans grads-1.9b4/src: gribscan
Seulement dans grads-1.9b4/src: gribscan.o
Seulement dans grads-1.9b4/src: gscrpt.o
Seulement dans grads-1.9b4/src: gsgui.o
Seulement dans grads-1.9b4/src: gxchpl.o
Seulement dans grads-1.9b4/src: gxcntr.o
diff -u --recursive --exclude aclocal.m4 --exclude configure --exclude Makefile.in --exclude bootstrap grads-1.9b4-orig/src/gxdxwd.c grads-1.9b4/src/gxdxwd.c
--- grads-1.9b4-orig/src/gxdxwd.c 2002-10-28 20:08:33.000000000 +0100
+++ grads-1.9b4/src/gxdxwd.c 2005-08-16 11:33:49.000000000 +0200
@@ -6,6 +6,7 @@
#include <config.h>
#endif
+#include <stdlib.h>
#include <stdio.h>
#include <errno.h>
@@ -22,7 +23,7 @@
* writting.
*/
-char *calloc();
+/* char *calloc(); */
#include "X11/XWDFile.h"
Seulement dans grads-1.9b4/src: gxdxwd.o
Seulement dans grads-1.9b4/src: gxeps
Seulement dans grads-1.9b4/src: gxeps.o
diff -u --recursive --exclude aclocal.m4 --exclude configure --exclude Makefile.in --exclude bootstrap grads-1.9b4-orig/src/gxhpng.c grads-1.9b4/src/gxhpng.c
--- grads-1.9b4-orig/src/gxhpng.c 2004-03-12 17:14:04.000000000 +0100
+++ grads-1.9b4/src/gxhpng.c 2005-08-16 11:33:49.000000000 +0200
@@ -379,6 +379,11 @@
int gdCompareInt(const void *a, const void *b);
+int gdCompareInt(const void *a, const void *b)
+{
+ return (*(const int *)a) - (*(const int *)b);
+}
+
/* Version of gdImageFilledPolygon to invoke my local
version of gdImageLne. Nothing else changed... B.Doty 5/31/01 */
Seulement dans grads-1.9b4/src: gxmeta.o
Seulement dans grads-1.9b4/src: gxmeta.sa.o
Seulement dans grads-1.9b4/src: gxps
Seulement dans grads-1.9b4/src: gxps.o
Seulement dans grads-1.9b4/src: gxshad.o
Seulement dans grads-1.9b4/src: gxstrm.o
Seulement dans grads-1.9b4/src: gxsubs.o
Seulement dans grads-1.9b4/src: gxtran
Seulement dans grads-1.9b4/src: gxtran.o
Seulement dans grads-1.9b4/src: gxwmap.o
Seulement dans grads-1.9b4/src: gxX.o
Seulement dans grads-1.9b4/src: latsgribmap.o
Seulement dans grads-1.9b4/src: latsgrib.o
Seulement dans grads-1.9b4/src: latsint.o
Seulement dans grads-1.9b4/src: latsnc-nc.o
Seulement dans grads-1.9b4/src: latsnc.o
Seulement dans grads-1.9b4/src: lats.o
Seulement dans grads-1.9b4/src: latsstat.o
Seulement dans grads-1.9b4/src: latstime.o
Seulement dans grads-1.9b4/src: Makefile
Seulement dans grads-1.9b4/src: stamp-h
Seulement dans grads-1.9b4/src: stamp-h1
Seulement dans grads-1.9b4/src: stnmap
Seulement dans grads-1.9b4/src: stnmap.o
Seulement dans grads-1.9b4/src: wgrib
Seulement dans grads-1.9b4/src: wgrib.o
grads-conditionnal_lats.diff:
--- NEW FILE grads-conditionnal_lats.diff ---
--- grads-1.9b4/src/Makefile.am.old 2005-12-13 00:02:38.000000000 +0100
+++ grads-1.9b4/src/Makefile.am 2005-12-13 00:02:10.000000000 +0100
@@ -63,7 +67,7 @@
hdr_lats = lats.h latsint.h latsparm.h latstime.h \
fgrib.h fgrib_init.h
noinst_HEADERS = $(hdr_core) $(hdr_x11) $(hdr_sdf) $(hdr_png) $(hdr_gui) \
- $(hdr_lats) $(hdr_img) $(hdr_pc) $(hdr_bufr)
+ $(hdr_pc) $(hdr_bufr)
# Get rid of buildinfo.h on "make distclean"
DISTCLEANFILES = buildinfo.h
@@ -198,10 +198,13 @@
# Object files that should not be reused by the other GrADS binaries,
# plus libraries needed by this GrADS binary
-gradsnc_LDADD = latsnc-nc.o gaddes-nc.o gacfg-nc.o gaio-nc.o \
+gradsnc_LDADD = gaddes-nc.o gacfg-nc.o gaio-nc.o \
gauser-nc.o gasdf-nc.o \
$(common_ldadd) \
$(nc_libs)
+if USELATS
+gradsnc_LDADD += latsnc-nc.o
+endif
# Custom compilation for object files specific to this GrADS binary
COMPILE_NC = $(COMPILE) -I$(supp_include_dir)/nc \
@@ -296,11 +299,14 @@
# Object files that should not be reused by the other GrADS binaries,
# plus libraries needed by this GrADS binary
-gradsdods_LDADD = latsnc-nc.o gaddes-dods.o gacfg-dods.o gaio-dods.o \
+gradsdods_LDADD = gaddes-dods.o gacfg-dods.o gaio-dods.o \
gauser-dods.o gasdf-dods.o \
$(common_ldadd) \
$(dods_libs) \
$(dods_darwin_libs)
+if USELATS
+gradsdods_LDADD += latsnc-nc.o
+endif
# Custom compilation for object files specific to this GrADS binary
COMPILE_DODS = $(COMPILE) -I$(supp_include_dir)/dods \
--- NEW FILE grads-copyright_summary ---
Here is an analysis of grads copyrights and licences.
Free software licences (complying with the OSI definition of Open Source)
and files.
A: the GPL
B: the most common netpbm licence (similar with BSD/MIT)
** Permission to use, copy, modify, and distribute this software and its
** documentation for any purpose and without fee is hereby granted, provided
** that the above copyright notice appear in all copies and that both that
** copyright notice and this permission notice appear in supporting
** documentation. This software is provided "as is" without express or
** implied warranty.
C: miGIF licence (similar with BSD/MIT)
* Permission to use, copy, modify, and distribute this software and its
* documentation for any purpose and without fee is hereby granted, provided
* that the above copyright notice appear in all copies and that both that
* copyright notice and this permission notice appear in supporting
* documentation. This software is provided "AS IS." The Hutchison Avenue
* Software Corporation disclaims all warranties, either express or implied,
* including but not limited to implied warranties of merchantability and
* fitness for a particular purpose, with respect to this code and accompanying
* documentation.
D: gd.h permissive licence
Permission granted to use this code in any fashion provided
that this notice is retained and any alterations are
labeled as such. It is requested, but not required, that
you share extensions to this module with us so that we
can incorporate them into new versions. */
E: gd licence like of gxeps
* * Permission has been granted to copy and distribute gxeps in any
* context, including a commercial application, provided that this notice
* is present in user-accessible supporting documentation.
*
* This does not affect your ownership of the derived work itself, and
* the intent
* is to assure proper credit for the authors of gxeps, not to interfere
* with your productive use of gxeps. If you have questions, ask.
* "Derived works" includes all programs that utilize gxeps.
* Credit must be given in user-accessible documentation.
*
* Permission to use, copy, modify, and distribute this software and its
* documentation for any purpose and without fee is hereby granted, provided
* that the above copyright notice appear in all copies and that both that
* copyright notice and this permission notice appear in supporting
* documentation. This software is provided "as is" without express or
* implied warranty.
F: public domain, as said in a mail by Matthias Munnich
G: permissive licence (like BSD/MIT)
/* | Permission to use, copy, modify, and distribute this software | */
/* | and its documentation for any purpose and without fee is hereby | */
/* | granted, provided that the above copyright notice appear in all | */
/* | copies and that both that copyright notice and this permission | */
/* | notice appear in supporting documentation. This software is | */
/* | provided "as is" without express or implied warranty. | */
H: public domain for wgrib
The following files are placed into the public domain. While
you could legally do anything you want with the code, telling
the world that you wrote it would be uncool. Selling it would
be really uncool. The code was written for NMC/NCAR Reanalysis
and may not work GRIB files from other sources. The code,
as usual, is not warranteed to be fit for any purpose what so ever.
Use at your own risk.
I: public domain. From a mail sent by Don Hooper:
Julia Collins and I are University of Colorado employees stationed
at NOAA, a U.S. federal government agency. Thus, we do our work on
federal government computers. Thus, all of our work is in the public
domain. [...] I've no idea why there is no notation to this effect in
gasdf.c, gasdf.h, or gasdf_std_time.h. In any case, it's the same as
with wgrib.c, written by another person affilliated with NOAA. U.S.
federal government stuff is public domain, period.
IGES means Brian Doty and IGES for most if not all files (haven't verified).
bufrscan.c (A) IGES
bufrstn.c (A) IGES
dodstn.c (A) IGES
gabufr.c (A) IGES
gabufrtbl.c (A) IGES
gaddes.c (A) IGES
gaexpr.c (A) IGES
gafunc.c (A) IGES
gagmap.c (A) IGES
gagmap.h (A) IGES
gagx.c (A) IGES
gaio.c (A) IGES
gamach.c (A) IGES
gasdf.c (I) Don Hooper
gasdf.h (I) Julia Collins and Don Hooper
gasdf_std_time.h (I) Julia Collins
gauser.c (A) IGES
gautil.c (A) IGES
gd13gif.c (B) Jef Poskanzer
(C) Hutchison Avenue Software Corporation
gd13gif.h (D) Cold Spring Harbor Labs
grads.c (A) IGES
grads.h (A) IGES
gribmap.c (A) IGES
gscrpt.c (A) IGES
gs.h (A) IGES
gxchpl.c (A) IGES
gxcntr.c (A) IGES
gxeps.c (E) Matthias Munnich
gxgif.c (F) Matthias Munnich
(D) Cold Spring Harbor Labs
(B) Jef Poskanzer
(G) David Koblas
gx.h (A) IGES
gxhpng.c (A) Matthias Munnich and Brian Doty
gxmeta.c (A) IGES
gxps.c (A) IGES
gxshad.c (A) IGES
gxstrm.c (A) IGES
gxsubs.c (A) IGES
gxtran.c (A) IGES
gxwmap.c (A) IGES
gxX.c (A) IGES
wgrib.c (H) public domain
wx.h (A) IGES
gs-mode.el (A) Joe Wielgosz
ctl-mode.el (A) Joe Wielgosz
doc/* (A) IGES haven't checked all the files!
========================================================================
??: no copyright and no licence
fgrib.h (??)
fgrib_init.h (??)
galats.c (??)
gribscan.c (??)
gvt.h (??)
gxdxwd.c (??)
gxmap.h (??) small file
latsgribmap.c (??)
mtable.c (??) small file
pcx11e.h (??) small file
=======================================================================
The following are non free licences and non free files. Some parts of the
files may be under a free licence described above, though.
?: no licence. The file isn't free because there is no licence.
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
* profit, and provided this notice is retained.
Y: cannot be redistributed
* This software may not be distributed to others without
* permission of the author.
fgbds.c (?) Mike Fiorino
fgutil.c (?) Wesley Ebisuzaki
gacfg.c (A) IGES
(Z) Arlindo da Silva
gagui.c (Z) Arlindo da Silva
gaimg.c (Z) Arlindo da Silva
gaimg.h (Z) Arlindo da Silva small file
gsgui.c (Z) Arlindo da Silva
gstmp.c (?) Mike Fiorino and ?
lats.c (Y) Regents of the University of California
latsgrib.c (Y) Regents of the University of California
lats.h (Y) Regents of the University of California
latsint.c (Y) Regents of the University of California
latsint.h (Y) Regents of the University of California
latsnc.c (Y) Regents of the University of California
latsparm.h (Y) Regents of the University of California
latsstat.c (Y) Regents of the University of California
latstime.c (Y) Regents of the University of California
latstime.h (Y) Regents of the University of California
pcx11e.c (?) Arlindo da Silva based on Xlibemu
--- NEW FILE grads-remove-files ---
#!/bin/bash
set -e
cd .
name=grads
ver=1.9b4
package=$name-$ver
tar_file=$name-src-$ver.tar.gz
echo Unpacking compressed source from $tar_file
tar xzf $tar_file
for bad_file in `cat grads-removed-files-list`; do
rm -f $package/src/$bad_file
done
echo Repacking $tar_file
tar czf $tar_file $package
rm -rf $package
exit 0
--- NEW FILE grads-removed-files-list ---
fgbds.c
fgutil.c
gagui.c
gaimg.c
gaimg.h
gsgui.c
gstmp.c
lats.c
latsgrib.c
lats.h
latsint.c
latsint.h
latsnc.c
latsparm.h
latsstat.c
latstime.c
latstime.h
pcx11e.c
--- NEW FILE grads.spec ---
Name: grads
Version: 1.9b4
Release: 4
Summary: Tool for easy acces, manipulation, and visualization of data
Group: Applications/Engineering
License: GPL
URL: http://grads.iges.org/grads/grads.html
Source0: ftp://grads.iges.org/grads/1.9/grads-src-%{version}.tar.gz
# opendap/DODS detection
Source3: libdap.m4
Source4: libnc-dap.m4
# the copyright notice for wgrib
Source2: NOTICE.wgrib
# Copyrights explanation
Source6: grads-copyright_summary
# README telling to turn BackingStore true
Source5: grads-README.xorg
# Use these files to remove files with GPL incompatible licences. In the
# SOURCES directory with grads tarball and grads-removed-files-list, do
# sh grads-remove-files
Source100: grads-remove-files
Source101: grads-removed-files-list
Patch: grads-build_fixes.diff
Patch1: grads_dap-no_lats.patch
Patch2: grads-conditionnal_lats.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: hdf-devel udunits-devel netcdf-devel
#BuildRequires: opendap-devel
BuildRequires: libdap-devel libnc-dap-devel
BuildRequires: libsx-devel Xaw3d-devel zlib-devel libjpeg-devel gd-devel
BuildRequires: ncurses-devel libpng-devel
#Requires:
%description
The Grid Analysis and Display System (GrADS) is an interactive desktop tool
that is used for easy access, manipulation, and visualization of earth science
data. The format of the data may be either binary, GRIB, NetCDF, or HDF-SDS
(Scientific Data Sets). GrADS has been implemented worldwide on a variety of
commonly used operating systems and is freely distributed over the Internet.
%prep
%setup -q
%patch -p1
%patch -P 1 -p1
%patch -P 2 -p1
# change path to datas to %{_datadir}/%{name}
sed -i -e 's@/usr/local/lib/grads@%{_datadir}/%{name}@' src/gx.h
# copy grib notice
cp %{SOURCE2} .
cp %{SOURCE6} .
# concatenate autoconf m4 files
cat %{SOURCE3} %{SOURCE4} acinclude.m4 > acinclude.m4.new
cp acinclude.m4.new acinclude.m4
# README for use with xorg
cp %{SOURCE5} README.xorg
# fix perms
chmod a-x src/*.c src/*.h
chmod a-x COPYRIGHT
find doc -type f -exec chmod a-x \{\} \;
find data -type f -exec chmod a-x \{\} \;
%build
./bootstrap
%configure --without-gui --without-lats LDFLAGS="-L%{_libdir}/netcdf-3/ -L/usr/X11R6/lib/ -lXaw -L%{_libdir}/hdf/" CPPFLAGS="-I%{_includedir}/netcdf-3/ -I%{_includedir}/hdf/" --enable-dyn-supplibs
make %{?_smp_mflags}
cp -r doc html
%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
%{__install} -d -m755 $RPM_BUILD_ROOT%{_datadir}/%{name}
%{__install} -m644 data/*.dat data/*res $RPM_BUILD_ROOT%{_datadir}/%{name}
%clean
rm -rf $RPM_BUILD_ROOT
%files
%defattr(-,root,root,-)
%{_bindir}/bufrscan
%{_bindir}/gradsc
%{_bindir}/gradsdods
%{_bindir}/gradshdf
%{_bindir}/gradsnc
%{_bindir}/gribmap
%{_bindir}/gribscan
%{_bindir}/gxeps
%{_bindir}/gxps
%{_bindir}/gxtran
%{_bindir}/stnmap
%{_bindir}/wgrib
%{_datadir}/grads/
%doc COPYRIGHT NOTICE.wgrib html README.xorg grads-copyright_summary
%changelog
* Tue Dec 13 2005 Patrice Dumas <dumas at centre-cired.fr> 1.9b4-4
- simplify handling of data, as they are in the tarball
* Tue Dec 13 2005 Patrice Dumas <dumas at centre-cired.fr> 1.9b4-3
- remove files with GPL incompatible licences
* Tue Aug 16 2005 Patrice Dumas <dumas at centre-cired.fr> 1.9b4-2
- use libsx without freq
* Fri Aug 12 2005 Patrice Dumas <dumas at centre-cired.fr> 1.9b4-1
- initial release
grads_dap-no_lats.patch:
--- NEW FILE grads_dap-no_lats.patch ---
diff -Naur grads-1.9b4/src/gacfg.c grads-1.9b4_new/src/gacfg.c
--- grads-1.9b4/src/gacfg.c 2005-05-18 14:29:17.000000000 +0000
+++ grads-1.9b4_new/src/gacfg.c 2005-11-03 13:18:45.000000000 +0000
@@ -32,6 +32,7 @@
*/
#include <stdio.h>
+#include <string.h>
#include "grads.h"
#include "buildinfo.h"
diff -Naur grads-1.9b4/src/gaexpr.c grads-1.9b4_new/src/gaexpr.c
--- grads-1.9b4/src/gaexpr.c 2005-05-18 14:48:36.000000000 +0000
+++ grads-1.9b4_new/src/gaexpr.c 2005-11-03 11:22:27.000000000 +0000
@@ -13,6 +13,7 @@
#endif
#include <stdio.h>
+#include <string.h>
#include <math.h>
#include "grads.h"
diff -Naur grads-1.9b4/src/gaio.c grads-1.9b4_new/src/gaio.c
--- grads-1.9b4/src/gaio.c 2005-05-23 17:59:01.000000000 +0000
+++ grads-1.9b4_new/src/gaio.c 2005-11-03 11:37:35.000000000 +0000
@@ -22,6 +22,7 @@
#include "grads.h"
#include <math.h>
#include <stdio.h>
+#include <string.h>
#if USESDF == 1
#include <netcdf.h>
#if USEHDF == 1
diff -Naur grads-1.9b4/src/gasdf.c grads-1.9b4_new/src/gasdf.c
--- grads-1.9b4/src/gasdf.c 2005-05-18 14:29:17.000000000 +0000
+++ grads-1.9b4_new/src/gasdf.c 2005-11-04 10:02:05.000000000 +0000
@@ -5785,7 +5785,11 @@
/* Turn off automatic error handling. */
ncopts = 0;
+#if USEHDF == 1
if (ncattname (cdfid, varid, attnum, name) == -1) {
+#else
+ if (nc_inq_attname(cdfid, varid, attnum, name) == -1) {
+#endif
ncopts = oldncopts ;
return Failure;
}
@@ -5813,10 +5817,23 @@
/* Turn off automatic error handling. */
ncopts = 0;
+#if USEHDF == 1
if (ncattinq (cdfid, varid, aname, atype, alen) == -1) {
ncopts = oldncopts ;
return Failure;
}
+#else
+ if (nc_inq_atttype(cdfid, varid, aname, atype) != NC_NOERR) {
+ ncopts = oldncopts ;
+ return Failure;
+ }
+ size_t templen;
+ if (nc_inq_attlen(cdfid, varid, aname, &templen) != NC_NOERR) {
+ ncopts = oldncopts ;
+ return Failure;
+ }
+ *alen = (int) templen;
+#endif
/* Allocate space for values. */
if ((*atype == NC_BYTE) || (*atype == NC_CHAR)) {
@@ -5831,6 +5848,7 @@
*adata = (double *) malloc (sizeof (double) * *alen);
} else {
ncopts = oldncopts ;
+ printf("UNKNOWN TYPE HERE !\n");
return Failure;
}
@@ -5840,10 +5858,65 @@
}
/* Retrieve values. */
+#if USEHDF == 1
if (ncattget (cdfid, varid, aname, (void *) (*adata)) == -1) {
ncopts = oldncopts ;
return Failure;
}
+#else
+ switch (*atype)
+ {
+ case NC_BYTE:
+ if (nc_get_att_uchar(cdfid, varid, aname, (unsigned char *) *adata) != NC_NOERR)
+ {
+ ncopts = oldncopts ;
+ return Failure;
+ }
+ break;
+ case NC_CHAR:
+ if (nc_get_att_text(cdfid, varid, aname, (char *) *adata) != NC_NOERR)
+ {
+ ncopts = oldncopts ;
+ return Failure;
+ }
+ break;
+ case NC_SHORT:
+ if (nc_get_att_short(cdfid, varid, aname, (short *) *adata) != NC_NOERR)
+ {
+ ncopts = oldncopts ;
+ return Failure;
+ }
+ break;
+ case NC_LONG:
+ if (nc_get_att_int(cdfid, varid, aname, (int *) *adata) != NC_NOERR)
+ {
+ ncopts = oldncopts ;
+ return Failure;
+ }
+ break;
+ case NC_FLOAT:
+ if (nc_get_att_float(cdfid, varid, aname, (float *) *adata) != NC_NOERR)
+ {
+ ncopts = oldncopts ;
+ return Failure;
+ }
+ break;
+ case NC_DOUBLE:
+ if (nc_get_att_double(cdfid, varid, aname, (double *) *adata) != NC_NOERR)
+ {
+ ncopts = oldncopts ;
+ return Failure;
+ }
+ break;
+ default:
+ if (nc_get_att_text(cdfid, varid, aname, (char *) *adata) != NC_NOERR)
+ {
+ ncopts = oldncopts ;
+ return Failure;
+ }
+ break;
+ }
+#endif
/* If character, set last byte to null. */
if (*atype == NC_CHAR) {
diff -Naur grads-1.9b4/src/gxdxwd.c grads-1.9b4_new/src/gxdxwd.c
--- grads-1.9b4/src/gxdxwd.c 2002-10-28 19:08:33.000000000 +0000
+++ grads-1.9b4_new/src/gxdxwd.c 2005-11-03 13:37:45.000000000 +0000
@@ -7,6 +7,7 @@
#endif
#include <stdio.h>
+#include <stdlib.h>
#include <errno.h>
#include <X11/Xos.h>
@@ -92,6 +91,7 @@
int bw;
Window dummywin;
XWDFileHeader header;
+ char mytmp[64];
/*
@@ -232,7 +232,8 @@
* Write out the color maps, if any
*/
- if (debug) outl("xwd: Dumping %d colors.\n", ncolors);
+ sprintf(mytmp, "xwd: Dumping %d colors.\n", ncolors);
+ if (debug) outl(mytmp);
/*
{
int icineca=0;
diff -Naur grads-1.9b4/src/gxeps.c grads-1.9b4_new/src/gxeps.c
--- grads-1.9b4/src/gxeps.c 2004-02-27 14:42:11.000000000 +0000
+++ grads-1.9b4_new/src/gxeps.c 2005-11-03 14:45:16.000000000 +0000
@@ -6,6 +6,8 @@
#include <config.h>
#endif
+#include <stdlib.h>
+
/***********************************************************
* GXEPS a grads metafile to PostScript converter
* Copyright (c) 1999 - 2001 Matthias Munnich
diff -Naur grads-1.9b4/src/gxhpng.c grads-1.9b4_new/src/gxhpng.c
--- grads-1.9b4/src/gxhpng.c 2004-03-12 16:14:04.000000000 +0000
+++ grads-1.9b4_new/src/gxhpng.c 2005-11-03 11:56:53.000000000 +0000
@@ -6,7 +6,6 @@
#include <config.h>
#endif
-
/* Rasterize current metafile buffer via gd library. Loosly based
on the gxpng utility:
@@ -455,7 +452,7 @@
im->polyInts[ints++] = (y-y1) * (x2-x1) / (y2-y1) + x1;
}
}
- qsort(im->polyInts, ints, sizeof(int), gdCompareInt);
+ qsort(im->polyInts, ints, sizeof(int), (void *) gdCompareInt);
for (i=0; (i < (ints)); i+=2) {
gdImageLne(im, im->polyInts[i], y,
diff -Naur grads-1.9b4/src/gxX.c grads-1.9b4_new/src/gxX.c
--- grads-1.9b4/src/gxX.c 2005-05-18 14:29:17.000000000 +0000
+++ grads-1.9b4_new/src/gxX.c 2005-11-03 11:28:15.000000000 +0000
@@ -270,7 +270,7 @@
/* Set up icon pixmap */
- icon_pixmap = XCreateBitmapFromData(display, win, icon_bitmap_bits,
+ icon_pixmap = XCreateBitmapFromData(display, win, (char *) icon_bitmap_bits,
icon_bitmap_width, icon_bitmap_height);
/* Set standard properties */
@@ -402,7 +402,7 @@
if (xfnam) flist = XListFonts (display, xfnam, 1, &i);
else flist = NULL;
if (flist==NULL) {
- flist = XListFonts (display, "-adobe-helvetica-bold-r-normal--??-100*", 1, &i);
+ flist = XListFonts (display, "-adobe-helvetica-bold-r-normal-*-100*", 1, &i);
}
if (flist==NULL) {
flist = XListFonts (display, "-adobe-helvetica-bold-r-normal-*-120*", 1, &i);
@@ -418,7 +418,7 @@
if (xfnam) flist = XListFonts (display, xfnam, 1, &i);
else flist = NULL;
if (flist==NULL) {
- flist = XListFonts (display, "-adobe-helvetica-bold-o-normal--??-100*", 1, &i);
+ flist = XListFonts (display, "-adobe-helvetica-bold-o-normal-*-100*", 1, &i);
}
if (flist==NULL) {
flist = XListFonts (display, "-adobe-helvetica-bold-o-normal-*-120*", 1, &i);
@@ -3267,7 +3267,7 @@
}
if (typ>1) {
- stipple_pixmap = XCreateBitmapFromData(display, win, bitmap_bits,
+ stipple_pixmap = XCreateBitmapFromData(display, win, (char *) bitmap_bits,
bitmap_width, bitmap_height);
XSetStipple(display, gc, stipple_pixmap);
XSetFillStyle(display, gc, FillStippled);
--- NEW FILE libdap.m4 ---
# Configure macros for Libdap
# Patrice Dumas 2005 based on freetype2.m4 from Marcelo Magallon 2001-10-26,
# based on gtk.m4 by Owen Taylor
# AC_CHECK_DODS is also based on code from gdal configure.in
# AC_CHECK_LIBDAP([MINIMUM-VERSION [, ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]])
# Test for Libdap and define DAP_CFLAGS and DAP_LIBS.
# Check that the version is above MINIMUM-VERSION
# use when linking with a c++ aware linker, with a c linker you may also
# need -lstdc++
AC_DEFUN([AC_CHECK_LIBDAP],
[
AC_PATH_PROG([DAP_CONFIG], [dap-config], [no])
dap_min_version=m4_if([$1], [], [3.5.0], [$1])
AC_MSG_CHECKING([for libdap version >= $dap_min_version])
dap_no=""
if test "$DAP_CONFIG" = "no" ; then
dap_no=yes
else
dap_config_major_version=`$DAP_CONFIG --version | sed 's/^libdap \([[0-9]]\)*\.\([[0-9]]*\)\.\([[0-9]]*\)$/\1/'`
dap_config_minor_version=`$DAP_CONFIG --version | sed 's/^libdap \([[0-9]]\)*\.\([[0-9]]*\)\.\([[0-9]]*\)$/\2/'`
dap_config_micro_version=`$DAP_CONFIG --version | sed 's/^libdap \([[0-9]]\)*\.\([[0-9]]*\)\.\([[0-9]]*\)$/\2/'`
dap_min_major_version=`echo $dap_min_version | sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
dap_min_minor_version=`echo $dap_min_version | sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
dap_min_micro_version=`echo $dap_min_version | sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
dap_config_is_lt=""
if test $dap_config_major_version -lt $dap_min_major_version ; then
dap_config_is_lt=yes
else
if test $dap_config_major_version -eq $dap_min_major_version ; then
if test $dap_config_minor_version -lt $dap_min_minor_version ; then
dap_config_is_lt=yes
else
if test $dap_config_minor_version -eq $dap_min_minor_version ; then
if test $dap_config_micro_version -lt $dap_min_micro_version ; then
dap_config_is_lt=yes
fi
fi
fi
fi
fi
if test x$dap_config_is_lt = xyes ; then
dap_no=yes
else
DAP_LIBS="`$DAP_CONFIG --libs`"
DAP_CFLAGS="`$DAP_CONFIG --cflags`"
fi
fi
if test x$dap_no = x ; then
AC_MSG_RESULT([yes])
m4_if([$2], [], [:], [$2])
else
AC_MSG_RESULT([no])
if test "$DAP_CONFIG" = "no" ; then
AC_MSG_NOTICE([The dap-config script could not be found.])
else
if test x$dap_config_is_lt = xyes ; then
AC_MSG_NOTICE([the installed libdap library is too old.])
fi
fi
DAP_LIBS=""
DAP_CFLAGS=""
m4_if([$3], [], [:], [$3])
fi
AC_SUBST([DAP_CFLAGS])
AC_SUBST([DAP_LIBS])
])
# AC_CHECK_DODS([ ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]])
# Test for Libdap or older versions. Define DAP_CFLAGS and DAP_LIBS and
# optionnaly DAP_ROOT
AC_DEFUN([AC_CHECK_DODS],
[
AC_ARG_WITH(dods_root,
[ --with-dods-root[=ARG] DODS root fallback ],
,,)
ac_dods_ok='no'
AC_CHECK_LIBDAP([],[ac_dods_ok='yes'],[ac_dods_ok='no'])
if test "z$ac_dods_ok" = "zno" ; then
AC_PATH_PROG([OPENDAP_CONFIG], [opendap-config], [no])
AC_MSG_CHECKING([for libdap with opendap-config])
if test "$OPENDAP_CONFIG" = "no" ; then
ac_dods_ok='no'
AC_MSG_RESULT([no])
else
DAP_LIBS="`$OPENDAP_CONFIG --libs`"
DAP_CFLAGS="`$OPENDAP_CONFIG --cflags`"
ac_dods_ok='yes'
AC_MSG_RESULT([yes])
fi
fi
DAP_ROOT=
if test "z$ac_dods_ok" = "zno" ; then
AC_MSG_CHECKING(DODS specific root)
if test -z "$with_dods_root" -o "$with_dods_root" = "no"; then
AC_MSG_RESULT(disabled)
else
AC_MSG_RESULT([$with_dods_root])
DODS_ROOT=$with_dods_root
DODS_LIB=$with_dods_root/lib
DODS_INC=$with_dods_root/include
DODS_BIN=$with_dods_root/bin
dnl Add the DODS libraries to LIBS
if test -x $DODS_BIN/opendap-config ; then
dnl OPeNDAP 3.4 and earlier lack opendap-config, but use it if avail.
DAP_LIBS="`$DODS_BIN/opendap-config --libs`"
DAP_CFLAGS="`$DODS_BIN/opendap-config --cflags`"
ac_dods_ok='yes'
else
dnl Otherwise try to put things together in a more primitive way.
DAP_LIBS="-L$DODS_LIB -ldap++ -lpthread"
DAP_CFLAGS="-I$DODS_INC"
ac_dods_curl='yes'
dnl Add curl to LIBS; it might be local to DODS or generally installed
AC_MSG_CHECKING([For curl and libxml2])
if test -x $DODS_BIN/curl-config; then
DAP_LIBS="$DAP_LIBS `$DODS_BIN/curl-config --libs`"
elif which curl-config > /dev/null 2>&1; then
DAP_LIBS="$DAP_LIBS `curl-config --libs`"
else
AC_MSG_WARN([You gave a dods root, but I can't find curl!])
ac_dods_curl='no'
fi
ac_dods_xml2='yes'
if test -x $DODS_BIN/xml2-config; then
DAP_LIBS="$DAP_LIBS `$DODS_BIN/xml2-config --libs`"
elif which xml2-config > /dev/null 2>&1; then
DAP_LIBS="$DAP_LIBS `xml2-config --libs`"
else
AC_MSG_WARN([You gave a dods root, but I can't find xml2!])
ac_dods_xml2='no'
fi
AC_LANG_PUSH([C++])
if test $ac_dods_xml2 = 'yes' -a $ac_dods_curl = 'yes'; then
AC_MSG_RESULT([yes])
dnl We check that linking is succesfull
ac_save_LIBS="$LIBS"
ac_save_CFLAGS="$CFLAGS"
LIBS="$LIBS $DAP_LIBS"
CFLAGS="$CFLAGS $DAP_CFLAGS"
AC_MSG_NOTICE([Checking for DODS with curl and libxml2])
AC_CHECK_LIB([dap++],[main],[ac_dods_ok='yes'],[ac_dods_ok='no'])
LIBS=$ac_save_LIBS
CFLAGS=$ac_save_CFLAGS
if test "z$ac_dods_ok" = "zno"; then
DAP_LIBS="$DAP_LIBS -lrx"
ac_save_LIBS="$LIBS"
ac_save_CFLAGS="$CFLAGS"
LIBS="$LIBS $DAP_LIBS"
CFLAGS="$CFLAGS $DAP_CFLAGS"
AC_MSG_NOTICE([Checking for DODS with curl, libxml2 and librx])
AC_CHECK_LIB([dap++],[main],[ac_dods_ok='yes'],[ac_dods_ok='no'])
LIBS=$ac_save_LIBS
CFLAGS=$ac_save_CFLAGS
fi
else
AC_MSG_RESULT([no])
fi
if test $ac_dods_ok = 'no'; then
dnl assume it is an old version of DODS
AC_MSG_NOTICE([Checking for DODS with libwww and librx])
DAP_LIBS="-L$DODS_LIB -lwww -ldap++ -lpthread -lrx"
DAP_CFLAGS="-I$DODS_INC"
ac_save_LIBS="$LIBS"
ac_save_CFLAGS="$CFLAGS"
LIBS="$LIBS $DAP_LIBS"
CFLAGS="$CFLAGS $DAP_CFLAGS"
AC_CHECK_LIB([dap++],[main],[ac_dods_ok='yes'],[ac_dods_ok='no'])
LIBS=$ac_save_LIBS
CFLAGS=$ac_save_CFLAGS
fi
AC_LANG_POP
fi
AC_MSG_CHECKING([for DODS in a specific root])
if test "z$ac_dods_ok" = "zyes"; then
AC_MSG_RESULT([yes])
AC_MSG_NOTICE([setting DAP_ROOT directory to $DODS_ROOT])
DAP_ROOT="$DODS_ROOT"
else
AC_MSG_RESULT([no])
fi
fi
fi
if test "x$ac_dods_ok" = "xyes" ; then
m4_if([$1], [], [:], [$1])
else
DAP_LIBS=""
DAP_CFLAGS=""
m4_if([$2], [], [:], [$2])
fi
AC_SUBST([DAP_CFLAGS])
AC_SUBST([DAP_LIBS])
AC_SUBST([DAP_ROOT])
])
--- NEW FILE libnc-dap.m4 ---
# Configure macro for Libnc-dap
# Patrice Dumas 2005 based on freetype2.m4 from Marcelo Magallon 2001-10-26,
# based on gtk.m4 by Owen Taylor
# AC_CHECK_LIBNC_DAP([MINIMUM-VERSION [, ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]])
# Test for Libnc-dap and define NC_DAP_CFLAGS and NC_DAP_LIBS.
# Check that the version is above MINIMUM-VERSION
AC_DEFUN([AC_CHECK_LIBNC_DAP],
[
AC_PATH_PROG([NC_DAP_CONFIG], [ncdap-config], [no])
ncdap_min_version=m4_if([$1], [], [3.5.0], [$1])
AC_MSG_CHECKING([for libnc-dap version >= $ncdap_min_version])
ncdap_no=""
if test "$NC_DAP_CONFIG" = "no" ; then
ncdap_no=yes
else
ncdap_config_major_version=`$NC_DAP_CONFIG --version | sed 's/^libnc-dap \([[0-9]]\)*\.\([[0-9]]*\)\.\([[0-9]]*\)$/\1/'`
ncdap_config_minor_version=`$NC_DAP_CONFIG --version | sed 's/^libnc-dap \([[0-9]]\)*\.\([[0-9]]*\)\.\([[0-9]]*\)$/\2/'`
ncdap_config_micro_version=`$NC_DAP_CONFIG --version | sed 's/^libnc-dap \([[0-9]]\)*\.\([[0-9]]*\)\.\([[0-9]]*\)$/\2/'`
ncdap_min_major_version=`echo $ncdap_min_version | sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
ncdap_min_minor_version=`echo $ncdap_min_version | sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
ncdap_min_micro_version=`echo $ncdap_min_version | sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
ncdap_config_is_lt=""
if test $ncdap_config_major_version -lt $ncdap_min_major_version ; then
ncdap_config_is_lt=yes
else
if test $ncdap_config_major_version -eq $ncdap_min_major_version ; then
if test $ncdap_config_minor_version -lt $ncdap_min_minor_version ; then
ncdap_config_is_lt=yes
else
if test $ncdap_config_minor_version -eq $ncdap_min_minor_version ; then
if test $ncdap_config_micro_version -lt $ncdap_min_micro_version ; then
ncdap_config_is_lt=yes
fi
fi
fi
fi
fi
if test x$ncdap_config_is_lt = xyes ; then
ncdap_no=yes
else
NC_DAP_LIBS="`$NC_DAP_CONFIG --libs`"
NC_DAP_CFLAGS="`$NC_DAP_CONFIG --cflags`"
fi
fi
if test x$ncdap_no = x ; then
AC_MSG_RESULT([yes])
m4_if([$2], [], [:], [$2])
else
AC_MSG_RESULT([no])
if test "$NC_DAP_CONFIG" = "no" ; then
AC_MSG_NOTICE([The ncdap-config script could not be found.])
else
if test x$ncdap_config_is_lt = xyes ; then
AC_MSG_NOTICE([the installed libnc-dap library is too old.])
fi
fi
NC_DAP_LIBS=""
NC_DAP_CFLAGS=""
m4_if([$3], [], [:], [$3])
fi
AC_SUBST([NC_DAP_CFLAGS])
AC_SUBST([NC_DAP_LIBS])
])
# AC_FC_CHECK_LIBNC_DAP([MINIMUM-VERSION [, ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]])
# Test for Libnc-dap and define NC_DAP_FFLAGS and NC_DAP_FLIBS with flags
# for fortran.
# Check that the version is above MINIMUM-VERSION
AC_DEFUN([AC_FC_CHECK_LIBNC_DAP],
[
libnc_fc_dap_ok="no"
AC_CHECK_LIBNC_DAP([$1],[libnc_fc_dap_ok="yes"],[libnc_fc_dap_ok="no"])
if test $libnc_fc_dap_ok = "yes"; then
NC_DAP_FLIBS="`$NC_DAP_CONFIG --flibs`"
NC_DAP_FFLAGS="$NC_DAP_CFLAGS"
m4_if([$2], [], [:], [$2])
else
m4_if([$3], [], [:], [$3])
NC_DAP_FLIBS=""
NC_DAP_FFLAGS=""
fi
AC_SUBST([NC_DAP_FFLAGS])
AC_SUBST([NC_DAP_FLIBS])
])
# AC_CHECK_NC_DODS([ ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]])
# Test for Libnc-dap or older versions. Define NC_DAP_CFLAGS and NC_DAP_LIBS.
# use AC_CHECK_DODS if the flags cannot be found easily
AC_DEFUN([AC_CHECK_NC_DODS],
[
ac_ncdods_ok='no'
AC_CHECK_LIBNC_DAP([],[ac_ncdods_ok='yes'],[ac_ncdods_ok='no'])
if test "z$ac_ncdods_ok" = "zno" ; then
AC_PATH_PROG([OPENNC_DAP_CONFIG], [opendap-config], [no])
AC_MSG_CHECKING([for libnc-dap with opendap-config])
if test "$OPENNC_DAP_CONFIG" = "no" ; then
ac_ncdods_ok='no'
AC_MSG_RESULT([no])
else
NC_DAP_LIBS="`$OPENNC_DAP_CONFIG --libs-nc`"
NC_DAP_CFLAGS="`$OPENNC_DAP_CONFIG --cflags`"
ac_ncdods_ok='yes'
AC_MSG_RESULT([yes])
fi
fi
if test "z$ac_ncdods_ok" = "zno" ; then
ac_ncdods_dap_ok='no'
AC_CHECK_DODS([ac_ncdods_dap_ok='yes'],[ac_ncdods_dap_ok='no'])
if test "z$ac_ncdods_dap_ok" = 'zyes'; then
NC_DAP_LIBS="$DAP_LIBS -lnc-dods -ldap++"
NC_DAP_CFLAGS="$DAP_CFLAGS"
AC_LANG_PUSH([C++])
dnl We check that linking is succesfull
ac_save_LIBS="$LIBS"
ac_save_CFLAGS="$CFLAGS"
LIBS="$LIBS $NC_DAP_LIBS"
CFLAGS="$CFLAGS $NC_DAP_CFLAGS"
AC_CHECK_FUNC([nc_open],[ac_ncdods_ok='yes'],[ac_ncdods_ok='no'])
LIBS=$ac_save_LIBS
CFLAGS=$ac_save_CFLAGS
AC_LANG_POP
fi
fi
if test "x$ac_ncdods_ok" = "xyes" ; then
m4_if([$1], [], [:], [$1])
else
NC_DAP_LIBS=""
NC_DAP_CFLAGS=""
m4_if([$2], [], [:], [$2])
fi
AC_SUBST([NC_DAP_CFLAGS])
AC_SUBST([NC_DAP_LIBS])
])
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/grads/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore 20 Dec 2005 12:11:41 -0000 1.1
+++ .cvsignore 20 Dec 2005 12:16:26 -0000 1.2
@@ -0,0 +1 @@
+grads-src-1.9b4.tar.gz
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/grads/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources 20 Dec 2005 12:11:41 -0000 1.1
+++ sources 20 Dec 2005 12:16:26 -0000 1.2
@@ -0,0 +1 @@
+22e04f84df73d4aa72fe468c7f43b1c3 grads-src-1.9b4.tar.gz
More information about the scm-commits
mailing list