rpms/opendap/devel opendap-3.4.4-dap-gcc4.patch, NONE, 1.1 opendap-3.4.4-gcc4.patch, NONE, 1.1 opendap-3.4.4-includedir.patch, NONE, 1.1 opendap-3.4.4-nc3-dods-f95.patch, NONE, 1.1 opendap-3.4.4-rpmoptflags.patch, NONE, 1.1 opendap-3.4.4-shared.patch, NONE, 1.1 opendap-3.4.4-systemlibs.patch, NONE, 1.1 opendap.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Tom Callaway (spot)
fedora-extras-commits at redhat.com
Sat Jul 9 00:14:59 UTC 2005
Author: spot
Update of /cvs/extras/rpms/opendap/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15318/devel
Modified Files:
.cvsignore sources
Added Files:
opendap-3.4.4-dap-gcc4.patch opendap-3.4.4-gcc4.patch
opendap-3.4.4-includedir.patch
opendap-3.4.4-nc3-dods-f95.patch
opendap-3.4.4-rpmoptflags.patch opendap-3.4.4-shared.patch
opendap-3.4.4-systemlibs.patch opendap.spec
Log Message:
auto-import opendap-3.4.4-5 on branch devel from opendap-3.4.4-5.src.rpm
opendap-3.4.4-dap-gcc4.patch:
--- NEW FILE opendap-3.4.4-dap-gcc4.patch ---
--- opendap-3.4.4/DODS/src/dap-3.4.8/RValue.cc.BAD 2005-04-22 13:43:25.000000000 -0500
+++ opendap-3.4.4/DODS/src/dap-3.4.8/RValue.cc 2005-04-22 13:43:33.000000000 -0500
@@ -110,7 +110,7 @@
#ifdef WIN32
BaseType **argv = (new (BaseType*)) + argc + 1;
#else
- BaseType **argv = new (BaseType*)[argc + 1];
+ BaseType **argv = new BaseType* [argc + 1];
#endif
int index = 0;
--- opendap-3.4.4/DODS/src/dap-3.4.8/Operators.h.BAD 2005-04-22 13:39:30.000000000 -0500
+++ opendap-3.4.4/DODS/src/dap-3.4.8/Operators.h 2005-04-22 13:39:45.000000000 -0500
@@ -36,8 +36,12 @@
#ifndef _operators_h
#define _operators_h
+#include <stdlib.h>
#include <Regex.h> // GNU Regex class used for string =~ op.
+using std::cerr;
+using std::endl;
+
static unsigned
dods_max(int i1, int i2)
{
opendap-3.4.4-gcc4.patch:
--- NEW FILE opendap-3.4.4-gcc4.patch ---
--- opendap-3.4.4/DODS/src/dap-3.4.8/configure.BAD 2005-04-22 13:15:04.000000000 -0500
+++ opendap-3.4.4/DODS/src/dap-3.4.8/configure 2005-04-22 13:15:38.000000000 -0500
@@ -3303,6 +3303,8 @@
echo "${ECHO_T}Found gcc/g++ version ${GCC_VER}" >&6 ;;
3.[0-9]*) echo "$as_me:$LINENO: result: Found gcc/g++ version ${GCC_VER}" >&5
echo "${ECHO_T}Found gcc/g++ version ${GCC_VER}" >&6 ;;
+ 4.[0-9]*) echo "$as_me:$LINENO: result: Found gcc/g++ version ${GCC_VER}" >&5
+echo "${ECHO_T}Found gcc/g++ version ${GCC_VER}" >&6 ;;
*) { { echo "$as_me:$LINENO: error: must be at least version 2.7.x" >&5
echo "$as_me: error: must be at least version 2.7.x" >&2;}
{ (exit 1); exit 1; }; } ;;
--- opendap-3.4.4/DODS/src/nc3-dods-3.4.7/configure.BAD 2005-04-22 13:13:54.000000000 -0500
+++ opendap-3.4.4/DODS/src/nc3-dods-3.4.7/configure 2005-04-22 13:14:33.000000000 -0500
@@ -4531,6 +4531,8 @@
echo "${ECHO_T}Found gcc/g++ version ${GCC_VER}" >&6 ;;
3.[0-9]*) echo "$as_me:$LINENO: result: Found gcc/g++ version ${GCC_VER}" >&5
echo "${ECHO_T}Found gcc/g++ version ${GCC_VER}" >&6 ;;
+ 4.[0-9]*) echo "$as_me:$LINENO: result: Found gcc/g++ version ${GCC_VER}" >&5
+echo "${ECHO_T}Found gcc/g++ version ${GCC_VER}" >&6 ;;
*) { { echo "$as_me:$LINENO: error: must be at least version 2.7.x" >&5
echo "$as_me: error: must be at least version 2.7.x" >&2;}
{ (exit 1); exit 1; }; } ;;
--- opendap-3.4.4/DODS/src/tools/www-interface-3.4.3/configure.BAD 2005-04-22 13:58:22.000000000 -0500
+++ opendap-3.4.4/DODS/src/tools/www-interface-3.4.3/configure 2005-04-22 13:58:31.000000000 -0500
@@ -3081,6 +3081,8 @@
echo "${ECHO_T}Found gcc/g++ version ${GCC_VER}" >&6 ;;
3.[0-9]*) echo "$as_me:$LINENO: result: Found gcc/g++ version ${GCC_VER}" >&5
echo "${ECHO_T}Found gcc/g++ version ${GCC_VER}" >&6 ;;
+ 4.[0-9]*) echo "$as_me:$LINENO: result: Found gcc/g++ version ${GCC_VER}" >&5
+echo "${ECHO_T}Found gcc/g++ version ${GCC_VER}" >&6 ;;
*) { { echo "$as_me:$LINENO: error: must be at least version 2.7.x" >&5
echo "$as_me: error: must be at least version 2.7.x" >&2;}
{ (exit 1); exit 1; }; } ;;
--- opendap-3.4.4/DODS/src/tools/asciival-3.4.3/configure.BAD 2005-04-22 13:58:46.000000000 -0500
+++ opendap-3.4.4/DODS/src/tools/asciival-3.4.3/configure 2005-04-22 13:58:56.000000000 -0500
@@ -3199,6 +3199,8 @@
echo "${ECHO_T}Found gcc/g++ version ${GCC_VER}" >&6 ;;
3.[0-9]*) echo "$as_me:$LINENO: result: Found gcc/g++ version ${GCC_VER}" >&5
echo "${ECHO_T}Found gcc/g++ version ${GCC_VER}" >&6 ;;
+ 4.[0-9]*) echo "$as_me:$LINENO: result: Found gcc/g++ version ${GCC_VER}" >&5
+echo "${ECHO_T}Found gcc/g++ version ${GCC_VER}" >&6 ;;
*) { { echo "$as_me:$LINENO: error: must be at least version 2.7.x" >&5
echo "$as_me: error: must be at least version 2.7.x" >&2;}
{ (exit 1); exit 1; }; } ;;
opendap-3.4.4-includedir.patch:
--- NEW FILE opendap-3.4.4-includedir.patch ---
--- opendap-3.4.4/DODS/src/dap-3.4.8/opendap-config.in.BAD 2005-07-05 14:39:45.000000000 -0500
+++ opendap-3.4.4/DODS/src/dap-3.4.8/opendap-config.in 2005-07-05 14:40:18.000000000 -0500
@@ -2,10 +2,10 @@
#
# Borrowed the idea for this script (and some code) from libcurl.
#
-prefix=@dods_root@
+prefix=/usr
exec_prefix=${prefix}
libdir=${exec_prefix}/lib
-includedir=${prefix}/include
+includedir=${prefix}/include/opendap
usage()
{
opendap-3.4.4-nc3-dods-f95.patch:
--- NEW FILE opendap-3.4.4-nc3-dods-f95.patch ---
--- opendap-3.4.4/DODS/src/nc3-dods-3.4.7/configure.BAD 2005-04-22 14:00:37.000000000 -0500
+++ opendap-3.4.4/DODS/src/nc3-dods-3.4.7/configure 2005-04-22 14:00:57.000000000 -0500
@@ -3159,7 +3159,7 @@
forts='f77 g77 fort77'
;;
Linux*)
- forts="f77 fort77 g77"
+ forts="f77 fort77 g77 f95"
;;
OSF1*)
# The use of f90(1) results in the following for
opendap-3.4.4-rpmoptflags.patch:
--- NEW FILE opendap-3.4.4-rpmoptflags.patch ---
--- opendap-3.4.4/DODS/src/dap-3.4.8/regex-0.12/Makefile.in.BAD 2005-07-05 16:51:18.000000000 -0500
+++ opendap-3.4.4/DODS/src/dap-3.4.8/regex-0.12/Makefile.in 2005-07-05 16:51:51.000000000 -0500
@@ -26,7 +26,7 @@
# -DEXTRACT_MACROS to use the macros EXTRACT_* (as opposed to
# the corresponding C procedures). If not -DDEBUG, the macros
# are used.
-CPPFLAGS =
+CPPFLAGS = $(RPM_OPT_FLAGS) -fPIC
# Likewise, you can override CFLAGS to optimize, use -Wall, etc.
CFLAGS = -g
opendap-3.4.4-shared.patch:
--- NEW FILE opendap-3.4.4-shared.patch ---
--- opendap-3.4.4/DODS/src/dap-3.4.8/Makefile.in.BAD 2005-07-05 14:46:00.000000000 -0500
+++ opendap-3.4.4/DODS/src/dap-3.4.8/Makefile.in 2005-07-05 14:53:01.000000000 -0500
@@ -13,7 +13,7 @@
# a url. In addition it can read and process DAS and DDS objects, displaying
# the print representation on the screen.
-PROG = libdap++.a geturl usage deflate
+PROG = libdap++.a libdap++.so.0.0.0 geturl usage deflate
# dods_relative ends in a slash. 5/14/2001 jhrg
DODS_ROOT = @dods_relative@
@@ -181,55 +181,59 @@
$(AR) cru $@ $?
$(RANLIB) $@
+libdap++.so.0.0.0: $(DASOBJS) $(DDSOBJS) $(TYPEOBJS) $(GNUOBJS) $(ERROROBJS) \
+ $(EXPROBJS) $(UTILOBJS) $(CLIENTOBJS) $(AISOBJS)
+ $(CC) $(CPPFLAGS) -shared -Wl,-soname,libdap++.so.0 -o $@ $?
+
deflate: deflate.o
$(CC) $(LDFLAGS) -o deflate deflate.o -lz
# geturl is really a test driver, but it is so useful in other contexts that
# I have decided to build it as part of the `all' target. jhrg 7/11/96
-geturl: libdap++.a geturl.o
+geturl: libdap++.so.0.0.0 geturl.o
$(CXX) $(LDFLAGS) -o geturl geturl.o -ldap++ $(LIBS)
# The program named usage is the filter that is run by the CGI dispatch
# script as the `usage server'. This filter is the same for all different
# server types so it does not need to be specialized for each API.
-usage: libdap++.a usage.o
- $(CXX) $(LDFLAGS) -o usage usage.o libdap++.a $(LIBS)
+usage: libdap++.so.0.0.0 usage.o
+ $(CXX) $(LDFLAGS) -o usage usage.o -ldap++ $(LIBS)
# Build the test drivers
-das-test: libdap++.a das-test.o das.tab.h
- $(CXX) $(LDFLAGS) -o das-test das-test.o libdap++.a $(LIBS)
+das-test: libdap++.so.0.0.0 das-test.o das.tab.h
+ $(CXX) $(LDFLAGS) -o das-test das-test.o -ldap++ $(LIBS)
-dds-test: libdap++.a dds-test.o dds.tab.h
- $(CXX) $(LDFLAGS) -o dds-test dds-test.o libdap++.a $(LIBS)
+dds-test: libdap++.so.0.0.0 dds-test.o dds.tab.h
+ $(CXX) $(LDFLAGS) -o dds-test dds-test.o -ldap++ $(LIBS)
-gse-test: libdap++.a lex.gse.o gse-test.o \
+gse-test: libdap++.so.0.0.0 lex.gse.o gse-test.o \
gse.tab.o
$(CXX) $(LDFLAGS) -o gse-test lex.gse.o gse-test.o gse.tab.o \
- libdap++.a $(LIBS)
+ -ldap++ $(LIBS)
-expr-test: libdap++.a $(TESTOBJS) expr-test.o expr.tab.h
+expr-test: libdap++.so.0.0.0 $(TESTOBJS) expr-test.o expr.tab.h
$(CXX) $(LDFLAGS) -o expr-test expr-test.o lex.expr.o \
- $(TESTOBJS) libdap++.a $(LIBS)
+ $(TESTOBJS) -ldap++ $(LIBS)
error-test: error-test.o Error.tab.h $(ERROROBJS)
$(CXX) $(LDFLAGS) -o error-test error-test.o $(ERROROBJS) \
- libdap++.a $(LIBS)
+ -ldap++ $(LIBS)
# Build a summary test for Dods running in a Multi-threaded mode
ThreadTest: ThreadTest.o
- $(CXX) $(LDFLAGS) -o ThreadTest ThreadTest.o libdap++.a $(LIBS)
+ $(CXX) $(LDFLAGS) -o ThreadTest ThreadTest.o -ldap++ $(LIBS)
-server_handler: server_handler.o $(TESTOBJS) libdap++.a
- $(CXX) $(LDFLAGS) -o $@ $^ $(LIBS)
+server_handler: server_handler.o $(TESTOBJS)
+ $(CXX) $(LDFLAGS) -o $@ $^ -ldap++ $(LIBS)
# *** Remove this when we're done hacking the idl client Pix code. 04/14/03
# *** jhrg
-tryme: tryme.o LongIterAdapter.o libdap++.a
- $(CXX) $(LDFLAGS) -o $@ $^ $(LIBS)
+tryme: tryme.o LongIterAdapter.o
+ $(CXX) $(LDFLAGS) -o $@ $^ -ldap++ $(LIBS)
# The grammar targets.
@@ -320,6 +324,7 @@
install: all install-headers install-geturl install-opendap-config install-usage install-deflate
-mkdir -p $(libdir)
$(INSTALL_DATA) libdap++.a $(libdir)
+ $(INSTALL_DATA) libdap++.so* $(libdir)
$(RANLIB) $(libdir)/libdap++.a
install-headers:
@@ -360,7 +365,7 @@
./configure; \
fi
-check: libdap++.a das-check dds-check expr-check
+check: libdap++.so.0.0.0 das-check dds-check expr-check
test-coverage: clean
$(MAKE) $(MFLAGS) CXXFLAGS="$(CXXFLAGS) $(TEST_COV_FLAGS)" check
@@ -428,52 +433,52 @@
# Build the unit tests. Requires CppUnit be installed.
-RCReaderTest: RCReaderTest.o libdap++.a
+RCReaderTest: RCReaderTest.o
$(CXX) -o $@ $(LDFLAGS) $< -lcppunit -ldap++ $(LIBS)
-SignalHandlerTest: SignalHandlerTest.o libdap++.a
+SignalHandlerTest: SignalHandlerTest.o
$(CXX) -o $@ $(LDFLAGS) $< -lcppunit -ldap++ $(LIBS)
-DODSFilterTest: DODSFilterTest.o libdap++.a
+DODSFilterTest: DODSFilterTest.o
$(CXX) -o $@ $(LDFLAGS) $< -lcppunit -ldap++ $(LIBS)
-AISMergeTest: AISMergeTest.o libdap++.a
+AISMergeTest: AISMergeTest.o
$(CXX) -o $@ $(LDFLAGS) $< -lcppunit -ldap++ $(LIBS)
-AISDatabaseParserTest: AISDatabaseParserTest.o libdap++.a
+AISDatabaseParserTest: AISDatabaseParserTest.o
$(CXX) -o $@ $(LDFLAGS) $< -lcppunit -ldap++ $(LIBS)
-AISResourcesTest: AISResourcesTest.o libdap++.a
+AISResourcesTest: AISResourcesTest.o
$(CXX) -o $@ $(LDFLAGS) $< -lcppunit -ldap++ $(LIBS)
-parserUtilTest: parserUtilTest.o libdap++.a
+parserUtilTest: parserUtilTest.o
$(CXX) -o $@ $(LDFLAGS) $< -lcppunit -ldap++ $(LIBS)
-generalUtilTest: generalUtilTest.o libdap++.a
+generalUtilTest: generalUtilTest.o
$(CXX) -o $@ $(LDFLAGS) $< -lcppunit -ldap++ $(LIBS)
-DASTest: DASTest.o libdap++.a
+DASTest: DASTest.o
$(CXX) -o $@ $(LDFLAGS) $< -lcppunit -ldap++ $(LIBS)
-ByteTest: ByteTest.o libdap++.a
+ByteTest: ByteTest.o
$(CXX) -o $@ $(LDFLAGS) $< -lcppunit -ldap++ $(LIBS)
-SequenceTest: SequenceTest.o libdap++.a
+SequenceTest: SequenceTest.o
$(CXX) -o $@ $(LDFLAGS) $< -lcppunit -ldap++ $(LIBS)
-AttrTableTest: AttrTableTest.o libdap++.a
+AttrTableTest: AttrTableTest.o
$(CXX) -o $@ $(LDFLAGS) $< -lcppunit -ldap++ $(LIBS)
-DDSTest: DDSTest.o libdap++.a
+DDSTest: DDSTest.o
$(CXX) -o $@ $(LDFLAGS) $< -lcppunit -ldap++ $(LIBS)
-cgiUtilTest: cgiUtilTest.o libdap++.a
+cgiUtilTest: cgiUtilTest.o
$(CXX) -o $@ $(LDFLAGS) $< -lcppunit -ldap++ $(LIBS)
-HTTPCacheTest: HTTPCacheTest.o libdap++.a
+HTTPCacheTest: HTTPCacheTest.o
$(CXX) -o $@ $(LDFLAGS) $< -lcppunit -ldap++ $(LIBS)
-HTTPConnectTest: HTTPConnectTest.o libdap++.a
+HTTPConnectTest: HTTPConnectTest.o
$(CXX) -o $@ $(LDFLAGS) $< -lcppunit -ldap++ $(LIBS)
unit-check: $(UNIT_TEST_PROGS)
--- opendap-3.4.4/DODS/src/nc3-dods-3.4.7/Makefile.in.BAD 2005-07-05 14:53:39.000000000 -0500
+++ opendap-3.4.4/DODS/src/nc3-dods-3.4.7/Makefile.in 2005-07-05 14:59:57.000000000 -0500
@@ -7,7 +7,7 @@
# DEFS gets the `-D' defines that describe what a particular system has
# or doesn't have.
-PROG = libnc-dods.a nc_das nc_dds nc_dods
+PROG = libnc-dods.a libnc-doda.so.0.0.0 nc_das nc_dds nc_dods
DODS_ROOT = @dods_relative@
INCS = -I./lnetcdf @INCS@
@@ -25,7 +25,7 @@
LDFLAGS = -L. -L./lnetcdf @LDFLAGS@
LFLAGS=-8
YFLAGS=-d
-NCDODS = -lnc-dods -ldap++ -lnc-dods -ldap++
+NCDODS = -lnc-dods -ldap++
LIBS = @LIBS@
# Set the instalation directories; prefix can be set on the command line
@@ -107,15 +107,15 @@
fortran/fort-geninq.o fortran/fort-var1io.o
# Matlab client can be suppressed by a switch to configure.
-all: libnc-dods.a nc_das nc_dds nc_dods ncdump
+all: libnc-dods.a libnc-dods.so.0.0.0 nc_das nc_dds nc_dods ncdump
-nc_das: $(DASOBJS) libnc-dods.a
+nc_das: $(DASOBJS) libnc-dods.so.0.0.0
$(CXX) $(LDFLAGS) -o nc_das $(DASOBJS) $(NCDODS) $(LIBS)
-nc_dds: $(DDSOBJS) libnc-dods.a
+nc_dds: $(DDSOBJS) libnc-dods.so.0.0.0
$(CXX) $(LDFLAGS) -o nc_dds $(DDSOBJS) $(NCDODS) $(LIBS)
-nc_dods: $(SRVOBJS) libnc-dods.a
+nc_dods: $(SRVOBJS) libnc-dods.so.0.0.0
$(CXX) $(LDFLAGS) -o nc_dods $(SRVOBJS) $(NCDODS) $(LIBS)
libnc-dods.a: $(LIBOBJS) $(NCOBJS)
@@ -123,6 +123,9 @@
$(AR) -cru $@ $(LIBOBJS) $(NCOBJS)
$(RANLIB) $@
+libnc-dods.so.0.0.0: $(LIBOBJS) $(NCOBJS)
+ $(CC) -shared -Wl,-soname,libnc-dods.so.0 -o $@ $?
+
.PHONY: fortran
fortran:
-(cd fortran && $(MAKE) $(MFLAGS) all)
@@ -163,8 +166,9 @@
gcov -l -o ../ $$f >> $$cov_dat; \
done)
-install: libnc-dods.a nc_das nc_dds nc_dods
+install: libnc-dods.a libnc-dods.so.0.0.0 nc_das nc_dds nc_dods
$(INSTALL_DATA) libnc-dods.a $(libdir)
+ $(INSTALL_DATA) libnc-dods.so.0.0.0 $(libdir)
$(RANLIB) $(libdir)/libnc-dods.a
$(INSTALL_DATA) lnetcdf/netcdf.h $(includedir)
$(INSTALL_DATA) fortran/netcdf.inc $(includedir)
@@ -179,14 +183,14 @@
clean:
-rm -f *.o *.sum *.log *~ core
- -rm -f $(PROG) libnc-dods.a
+ -rm -f $(PROG) libnc-dods.a libnc-dods.so.0.0.0
-(cd ncdump && $(MAKE) $(MFLAGS) clean)
-(cd fortran && $(MAKE) $(MFLAGS) clean)
-(cd nc_test && $(MAKE) $(MFLAGS) clean)
distclean:
-rm -f *.o *.sum *.log *~ core
- -rm -f $(PROG) libnc-dods.a
+ -rm -f $(PROG) libnc-dods.a libnc-dods.so.0.0.0
-rm -f config.status config.log config.cache
-rm -f site.exp config_nc.h lnetcdf/ncconfig.h
-(cd ncdump && $(MAKE) $(MFLAGS) distclean)
opendap-3.4.4-systemlibs.patch:
--- NEW FILE opendap-3.4.4-systemlibs.patch ---
--- opendap-3.4.4/DODS/src/ff-dods-3.4.3/configure.BAD 2005-04-23 16:30:59.000000000 -0500
+++ opendap-3.4.4/DODS/src/ff-dods-3.4.3/configure 2005-04-23 16:31:53.000000000 -0500
@@ -6521,19 +6521,6 @@
- echo "$as_me:$LINENO: checking for the packages directory" >&5
-echo $ECHO_N "checking for the packages directory... $ECHO_C" >&6
- # Where does DODS live?
-
- DODS_PACKAGES_DIR=`ls -1d ${dods_relative}src/packages* 2> /dev/null`
- if test -z "$DODS_PACKAGES_DIR"
- then
- { { echo "$as_me:$LINENO: error: Could not find the third-party packages!" >&5
-echo "$as_me: error: Could not find the third-party packages!" >&2;}
- { (exit 1); exit 1; }; }
- fi
- echo "$as_me:$LINENO: result: $DODS_PACKAGES_DIR" >&5
-echo "${ECHO_T}$DODS_PACKAGES_DIR" >&6
LDFLAGS="$LDFLAGS -L${dods_relative}lib"
INCS="$INCS -I${dods_relative}include"
# 09/20/02 jhrg
@@ -6551,13 +6538,10 @@
echo "$as_me:$LINENO: checking for libcurl and its headers" >&5
echo $ECHO_N "checking for libcurl and its headers... $ECHO_C" >&6
- if test -x $dods_root/bin/curl-config
+ if test -n "`which curl-config`"
then
- # We don't need to add libcurl's --cflgas stuff until we start using
- # the native OS's version of the library. 09/20/02 jhrg
- # INCS="`$dods_root/bin/curl-config --cflags` $INCS"
- # AC_SUBST(INCS) # 09/20/02 jhrg
- LIBS="`$dods_root/bin/curl-config --libs` $LIBS"
+ INCS="`curl-config --cflags` $INCS"
+ LIBS="`curl-config --libs` $LIBS"
# 2003/06/13 ERD - added result message
echo "$as_me:$LINENO: result: yes" >&5
echo "${ECHO_T}yes" >&6
--- opendap-3.4.4/DODS/src/dap-3.4.8/configure.BAD 2005-04-23 16:22:48.000000000 -0500
+++ opendap-3.4.4/DODS/src/dap-3.4.8/configure 2005-04-23 16:28:34.000000000 -0500
@@ -6597,13 +6597,10 @@
echo "$as_me:$LINENO: checking for libcurl and its headers" >&5
echo $ECHO_N "checking for libcurl and its headers... $ECHO_C" >&6
- if test -x $dods_root/bin/curl-config
+ if test -n "`which curl-config`"
then
- # We don't need to add libcurl's --cflgas stuff until we start using
- # the native OS's version of the library. 09/20/02 jhrg
- # INCS="`$dods_root/bin/curl-config --cflags` $INCS"
- # AC_SUBST(INCS) # 09/20/02 jhrg
- LIBS="`$dods_root/bin/curl-config --libs` $LIBS"
+ INCS="`curl-config --cflags` $INCS"
+ LIBS="`curl-config --libs` $LIBS"
# 2003/06/13 ERD - added result message
echo "$as_me:$LINENO: result: yes" >&5
echo "${ECHO_T}yes" >&6
@@ -6680,13 +6677,13 @@
echo $ECHO_N "checking for libxml2 and its headers... $ECHO_C" >&6
# 2003/06/13 ERD - chaged to handle libxml2 distrib w/ DODS
# libxml2 NOT part of DODS distribution
- #if test -n "`which xml2-config`"
+ if test -n "`which xml2-config`"
# libxml2 IS part of DODS distribution
- if test -x $dods_root/bin/xml2-config
+ #if test -x $dods_root/bin/xml2-config
then
# libxml2 NOT part of DODS distribution
- #INCS="`xml2-config --cflags` $INCS"
- #LIBS="`xml2-config --libs` $LIBS"
+ INCS="`xml2-config --cflags` $INCS"
+ LIBS="`xml2-config --libs` $LIBS"
# libxml2 IS part of DODS distribution
# INCS="`$dods_root/bin/xml2-config --cflags` $INCS"
#
@@ -6694,8 +6691,8 @@
# which makes its way into the Makefile. This, in turn, puts an
# absolute path in the dependencies (why I don't really know, -MM
# should not make dependencies for <> includes). 07/25/03 jhrg
- INCS="-I../../include/libxml2 $INCS"
- LIBS="`$dods_root/bin/xml2-config --libs` $LIBS"
+ #INCS="-I../../include/libxml2 $INCS"
+ #LIBS="`$dods_root/bin/xml2-config --libs` $LIBS"
echo "$as_me:$LINENO: result: yes" >&5
echo "${ECHO_T}yes" >&6
--- opendap-3.4.4/DODS/src/nc3-dods-3.4.7/configure.BAD 2005-04-23 16:25:20.000000000 -0500
+++ opendap-3.4.4/DODS/src/nc3-dods-3.4.7/configure 2005-04-23 16:28:00.000000000 -0500
@@ -8140,19 +8140,6 @@
- echo "$as_me:$LINENO: checking for the packages directory" >&5
-echo $ECHO_N "checking for the packages directory... $ECHO_C" >&6
- # Where does DODS live?
-
- DODS_PACKAGES_DIR=`ls -1d ${dods_relative}src/packages* 2> /dev/null`
- if test -z "$DODS_PACKAGES_DIR"
- then
- { { echo "$as_me:$LINENO: error: Could not find the third-party packages!" >&5
-echo "$as_me: error: Could not find the third-party packages!" >&2;}
- { (exit 1); exit 1; }; }
- fi
- echo "$as_me:$LINENO: result: $DODS_PACKAGES_DIR" >&5
-echo "${ECHO_T}$DODS_PACKAGES_DIR" >&6
LDFLAGS="$LDFLAGS -L${dods_relative}lib"
INCS="$INCS -I${dods_relative}include"
# 09/20/02 jhrg
@@ -8170,13 +8157,10 @@
echo "$as_me:$LINENO: checking for libcurl and its headers" >&5
echo $ECHO_N "checking for libcurl and its headers... $ECHO_C" >&6
- if test -x $dods_root/bin/curl-config
+ if test -n "`which curl-config`"
then
- # We don't need to add libcurl's --cflgas stuff until we start using
- # the native OS's version of the library. 09/20/02 jhrg
- # INCS="`$dods_root/bin/curl-config --cflags` $INCS"
- # AC_SUBST(INCS) # 09/20/02 jhrg
- LIBS="`$dods_root/bin/curl-config --libs` $LIBS"
+ INCS="`curl-config --cflags` $INCS"
+ LIBS="`curl-config --libs` $LIBS"
# 2003/06/13 ERD - added result message
echo "$as_me:$LINENO: result: yes" >&5
echo "${ECHO_T}yes" >&6
@@ -8253,13 +8237,13 @@
echo $ECHO_N "checking for libxml2 and its headers... $ECHO_C" >&6
# 2003/06/13 ERD - chaged to handle libxml2 distrib w/ DODS
# libxml2 NOT part of DODS distribution
- #if test -n "`which xml2-config`"
+ if test -n "`which xml2-config`"
# libxml2 IS part of DODS distribution
- if test -x $dods_root/bin/xml2-config
+ #if test -x $dods_root/bin/xml2-config
then
# libxml2 NOT part of DODS distribution
- #INCS="`xml2-config --cflags` $INCS"
- #LIBS="`xml2-config --libs` $LIBS"
+ INCS="`xml2-config --cflags` $INCS"
+ LIBS="`xml2-config --libs` $LIBS"
# libxml2 IS part of DODS distribution
# INCS="`$dods_root/bin/xml2-config --cflags` $INCS"
#
@@ -8267,8 +8251,8 @@
# which makes its way into the Makefile. This, in turn, puts an
# absolute path in the dependencies (why I don't really know, -MM
# should not make dependencies for <> includes). 07/25/03 jhrg
- INCS="-I../../include/libxml2 $INCS"
- LIBS="`$dods_root/bin/xml2-config --libs` $LIBS"
+ #INCS="-I../../include/libxml2 $INCS"
+ #LIBS="`$dods_root/bin/xml2-config --libs` $LIBS"
echo "$as_me:$LINENO: result: yes" >&5
echo "${ECHO_T}yes" >&6
--- opendap-3.4.4/DODS/src/tools/www-interface-3.4.3/configure.BAD 2005-04-23 16:35:27.000000000 -0500
+++ opendap-3.4.4/DODS/src/tools/www-interface-3.4.3/configure 2005-04-23 16:36:03.000000000 -0500
@@ -6343,19 +6343,6 @@
_ACEOF
- echo "$as_me:$LINENO: checking for the packages directory" >&5
-echo $ECHO_N "checking for the packages directory... $ECHO_C" >&6
- # Where does DODS live?
-
- DODS_PACKAGES_DIR=`ls -1d ${dods_relative}src/packages* 2> /dev/null`
- if test -z "$DODS_PACKAGES_DIR"
- then
- { { echo "$as_me:$LINENO: error: Could not find the third-party packages!" >&5
-echo "$as_me: error: Could not find the third-party packages!" >&2;}
- { (exit 1); exit 1; }; }
- fi
- echo "$as_me:$LINENO: result: $DODS_PACKAGES_DIR" >&5
-echo "${ECHO_T}$DODS_PACKAGES_DIR" >&6
LDFLAGS="$LDFLAGS -L${dods_relative}lib"
INCS="$INCS -I${dods_relative}include"
# 09/20/02 jhrg
@@ -6436,13 +6423,10 @@
echo "$as_me:$LINENO: checking for libcurl and its headers" >&5
echo $ECHO_N "checking for libcurl and its headers... $ECHO_C" >&6
- if test -x $dods_root/bin/curl-config
+ if test -n "`which curl-config`"
then
- # We don't need to add libcurl's --cflgas stuff until we start using
- # the native OS's version of the library. 09/20/02 jhrg
- # INCS="`$dods_root/bin/curl-config --cflags` $INCS"
- # AC_SUBST(INCS) # 09/20/02 jhrg
- LIBS="`$dods_root/bin/curl-config --libs` $LIBS"
+ INCS="`curl-config --cflags` $INCS"
+ LIBS="`curl-config --libs` $LIBS"
# 2003/06/13 ERD - added result message
echo "$as_me:$LINENO: result: yes" >&5
echo "${ECHO_T}yes" >&6
--- opendap-3.4.4/DODS/src/tools/asciival-3.4.3/configure.BAD 2005-04-23 16:34:22.000000000 -0500
+++ opendap-3.4.4/DODS/src/tools/asciival-3.4.3/configure 2005-04-23 16:35:17.000000000 -0500
@@ -6404,19 +6404,6 @@
_ACEOF
- echo "$as_me:$LINENO: checking for the packages directory" >&5
-echo $ECHO_N "checking for the packages directory... $ECHO_C" >&6
- # Where does DODS live?
-
- DODS_PACKAGES_DIR=`ls -1d ${dods_relative}src/packages* 2> /dev/null`
- if test -z "$DODS_PACKAGES_DIR"
- then
- { { echo "$as_me:$LINENO: error: Could not find the third-party packages!" >&5
-echo "$as_me: error: Could not find the third-party packages!" >&2;}
- { (exit 1); exit 1; }; }
- fi
- echo "$as_me:$LINENO: result: $DODS_PACKAGES_DIR" >&5
-echo "${ECHO_T}$DODS_PACKAGES_DIR" >&6
LDFLAGS="$LDFLAGS -L${dods_relative}lib"
INCS="$INCS -I${dods_relative}include"
# 09/20/02 jhrg
@@ -6497,13 +6484,10 @@
echo "$as_me:$LINENO: checking for libcurl and its headers" >&5
echo $ECHO_N "checking for libcurl and its headers... $ECHO_C" >&6
- if test -x $dods_root/bin/curl-config
+ if test -n "`which curl-config`"
then
- # We don't need to add libcurl's --cflgas stuff until we start using
- # the native OS's version of the library. 09/20/02 jhrg
- # INCS="`$dods_root/bin/curl-config --cflags` $INCS"
- # AC_SUBST(INCS) # 09/20/02 jhrg
- LIBS="`$dods_root/bin/curl-config --libs` $LIBS"
+ INCS="`curl-config --cflags` $INCS"
+ LIBS="`curl-config --libs` $LIBS"
# 2003/06/13 ERD - added result message
echo "$as_me:$LINENO: result: yes" >&5
echo "${ECHO_T}yes" >&6
--- opendap-3.4.4/DODS/src/jg-dods-3.4.3/configure.BAD 2005-04-23 16:29:06.000000000 -0500
+++ opendap-3.4.4/DODS/src/jg-dods-3.4.3/configure 2005-04-23 16:30:15.000000000 -0500
@@ -7212,19 +7212,6 @@
_ACEOF
- echo "$as_me:$LINENO: checking for the packages directory" >&5
-echo $ECHO_N "checking for the packages directory... $ECHO_C" >&6
- # Where does DODS live?
-
- DODS_PACKAGES_DIR=`ls -1d ${dods_relative}src/packages* 2> /dev/null`
- if test -z "$DODS_PACKAGES_DIR"
- then
- { { echo "$as_me:$LINENO: error: Could not find the third-party packages!" >&5
-echo "$as_me: error: Could not find the third-party packages!" >&2;}
- { (exit 1); exit 1; }; }
- fi
- echo "$as_me:$LINENO: result: $DODS_PACKAGES_DIR" >&5
-echo "${ECHO_T}$DODS_PACKAGES_DIR" >&6
LDFLAGS="$LDFLAGS -L${dods_relative}lib"
INCS="$INCS -I${dods_relative}include"
# 09/20/02 jhrg
@@ -7305,13 +7292,10 @@
echo "$as_me:$LINENO: checking for libcurl and its headers" >&5
echo $ECHO_N "checking for libcurl and its headers... $ECHO_C" >&6
- if test -x $dods_root/bin/curl-config
+ if test -n "`which curl-config`"
then
- # We don't need to add libcurl's --cflgas stuff until we start using
- # the native OS's version of the library. 09/20/02 jhrg
- # INCS="`$dods_root/bin/curl-config --cflags` $INCS"
- # AC_SUBST(INCS) # 09/20/02 jhrg
- LIBS="`$dods_root/bin/curl-config --libs` $LIBS"
+ INCS="`curl-config --cflags` $INCS"
+ LIBS="`curl-config --libs` $LIBS"
# 2003/06/13 ERD - added result message
echo "$as_me:$LINENO: result: yes" >&5
echo "${ECHO_T}yes" >&6
--- opendap-3.4.4/DODS/Makefile.in.BAD 2005-04-23 16:18:57.000000000 -0500
+++ opendap-3.4.4/DODS/Makefile.in 2005-04-23 16:19:43.000000000 -0500
@@ -53,9 +53,11 @@
CLIENTS = src/clients/ncview* src/clients/ml-cmdln* \
src/clients/ml-structs*
-PACKAGES = src/packages*
+# Use system packages
+# PACKAGES = src/packages*
+PACKAGES =
-World: packages configure all
+World: configure all
# I'm not sure just how to handle the packages yet. For now, users/builders
# must cd to DODS_ROOT/packages and build there first. It is as if there are
--- opendap-3.4.4/DODS/src/dap-3.4.8/configure.BAD 2005-04-23 16:40:37.000000000 -0500
+++ opendap-3.4.4/DODS/src/dap-3.4.8/configure 2005-04-23 16:41:15.000000000 -0500
@@ -1332,19 +1332,6 @@
- echo "$as_me:$LINENO: checking for the packages directory" >&5
-echo $ECHO_N "checking for the packages directory... $ECHO_C" >&6
- # Where does DODS live?
-
- DODS_PACKAGES_DIR=`ls -1d ${dods_relative}src/packages* 2> /dev/null`
- if test -z "$DODS_PACKAGES_DIR"
- then
- { { echo "$as_me:$LINENO: error: Could not find the third-party packages!" >&5
-echo "$as_me: error: Could not find the third-party packages!" >&2;}
- { (exit 1); exit 1; }; }
- fi
- echo "$as_me:$LINENO: result: $DODS_PACKAGES_DIR" >&5
-echo "${ECHO_T}$DODS_PACKAGES_DIR" >&6
LDFLAGS="$LDFLAGS -L${dods_relative}lib"
INCS="$INCS -I${dods_relative}include"
# 09/20/02 jhrg
--- opendap-3.4.4/DODS/src/dap-3.4.8/Makefile.in.BAD 2005-04-23 16:43:49.000000000 -0500
+++ opendap-3.4.4/DODS/src/dap-3.4.8/Makefile.in 2005-04-23 16:47:16.000000000 -0500
@@ -661,9 +661,7 @@
util.h Byte.h Int16.h UInt16.h Int32.h UInt32.h Float32.h Float64.h \
Str.h dods-limits.h Url.h Array.h Vector.h List.h Structure.h \
Constructor.h Sequence.h Grid.h DataDDS.h HTTPConnect.h \
- ../../include/curl/curl.h ../../include/curl/curlver.h \
- ../../include/curl/easy.h ../../include/curl/multi.h \
- ../../include/curl/types.h RCReader.h ObjectType.h HTTPCache.h \
+ RCReader.h ObjectType.h HTTPCache.h \
ResponseTooBigErr.h HTTPCacheDisconnectedMode.h \
SignalHandlerRegisteredErr.h HTTPResponse.h Response.h
RCReader.o: RCReader.cc config_dap.h debug.h RCReader.h Error.h util.h \
@@ -676,16 +674,13 @@
Clause.h expr.h RValue.h Connect.h DAS.h AttrTable.h util.h Byte.h \
Int16.h UInt16.h Int32.h UInt32.h Float32.h Float64.h Str.h \
dods-limits.h Url.h Array.h Vector.h List.h Structure.h Constructor.h \
- Sequence.h Grid.h HTTPConnect.h ../../include/curl/curl.h \
- ../../include/curl/curlver.h ../../include/curl/easy.h \
- ../../include/curl/multi.h ../../include/curl/types.h RCReader.h \
+ Sequence.h Grid.h HTTPConnect.h \
+ RCReader.h \
ObjectType.h HTTPCache.h ResponseTooBigErr.h \
HTTPCacheDisconnectedMode.h SignalHandlerRegisteredErr.h HTTPResponse.h \
Response.h escaping.h
HTTPConnect.o: HTTPConnect.cc config_dap.h debug.h GNU/Regex.h \
- HTTPConnect.h ../../include/curl/curl.h ../../include/curl/curlver.h \
- ../../include/curl/easy.h ../../include/curl/multi.h \
- ../../include/curl/types.h RCReader.h Error.h util.h BaseType.h \
+ HTTPConnect.h RCReader.h Error.h util.h BaseType.h \
InternalErr.h dods-datatypes.h Byte.h Int16.h UInt16.h Int32.h UInt32.h \
Float32.h Float64.h Str.h dods-limits.h Url.h Array.h Vector.h DDS.h \
GNU/Pix.h IteratorAdapter.h Clause.h expr.h RValue.h List.h Structure.h \
@@ -886,41 +881,9 @@
ResponseTooBigErr.h Error.h
AISResources.o: AISResources.cc config_dap.h AISResources.h GNU/Regex.h \
Resource.h Error.h AISExceptions.h AISDatabaseParser.h \
- ../../include/libxml2/libxml/parserInternals.h \
- ../../include/libxml2/libxml/parser.h \
- ../../include/libxml2/libxml/tree.h \
- ../../include/libxml2/libxml/xmlversion.h \
- ../../include/libxml2/libxml/xmlregexp.h \
- ../../include/libxml2/libxml/valid.h \
- ../../include/libxml2/libxml/list.h \
- ../../include/libxml2/libxml/xmlautomata.h \
- ../../include/libxml2/libxml/entities.h \
- ../../include/libxml2/libxml/encoding.h \
- ../../include/libxml2/libxml/xmlIO.h \
- ../../include/libxml2/libxml/globals.h \
- ../../include/libxml2/libxml/xmlerror.h \
- ../../include/libxml2/libxml/SAX.h ../../include/libxml2/libxml/xlink.h \
- ../../include/libxml2/libxml/xmlmemory.h \
- ../../include/libxml2/libxml/threads.h \
- ../../include/libxml2/libxml/HTMLparser.h InternalErr.h
+ InternalErr.h
AISDatabaseParser.o: AISDatabaseParser.cc config_dap.h \
- AISDatabaseParser.h ../../include/libxml2/libxml/parserInternals.h \
- ../../include/libxml2/libxml/parser.h \
- ../../include/libxml2/libxml/tree.h \
- ../../include/libxml2/libxml/xmlversion.h \
- ../../include/libxml2/libxml/xmlregexp.h \
- ../../include/libxml2/libxml/valid.h \
- ../../include/libxml2/libxml/list.h \
- ../../include/libxml2/libxml/xmlautomata.h \
- ../../include/libxml2/libxml/entities.h \
- ../../include/libxml2/libxml/encoding.h \
- ../../include/libxml2/libxml/xmlIO.h \
- ../../include/libxml2/libxml/globals.h \
- ../../include/libxml2/libxml/xmlerror.h \
- ../../include/libxml2/libxml/SAX.h ../../include/libxml2/libxml/xlink.h \
- ../../include/libxml2/libxml/xmlmemory.h \
- ../../include/libxml2/libxml/threads.h \
- ../../include/libxml2/libxml/HTMLparser.h InternalErr.h Error.h \
+ AISDatabaseParser.h InternalErr.h Error.h \
AISExceptions.h AISResources.h GNU/Regex.h Resource.h util.h BaseType.h \
dods-datatypes.h Byte.h Int16.h UInt16.h Int32.h UInt32.h Float32.h \
Float64.h Str.h dods-limits.h Url.h Array.h Vector.h DDS.h GNU/Pix.h \
@@ -928,9 +891,7 @@
Constructor.h Sequence.h Grid.h debug.h
AISMerge.o: AISMerge.cc config_dap.h AISMerge.h DAS.h GNU/Pix.h \
IteratorAdapter.h AttrTable.h Error.h HTTPConnect.h \
- ../../include/curl/curl.h ../../include/curl/curlver.h \
- ../../include/curl/easy.h ../../include/curl/multi.h \
- ../../include/curl/types.h RCReader.h util.h BaseType.h InternalErr.h \
+ RCReader.h util.h BaseType.h InternalErr.h \
dods-datatypes.h Byte.h Int16.h UInt16.h Int32.h UInt32.h Float32.h \
Float64.h Str.h dods-limits.h Url.h Array.h Vector.h DDS.h Clause.h \
expr.h RValue.h List.h Structure.h Constructor.h Sequence.h Grid.h \
@@ -943,9 +904,7 @@
InternalErr.h dods-datatypes.h Clause.h expr.h RValue.h util.h Byte.h \
Int16.h UInt16.h Int32.h UInt32.h Float32.h Float64.h Str.h \
dods-limits.h Url.h Array.h Vector.h List.h Structure.h Constructor.h \
- Sequence.h Grid.h DataDDS.h HTTPConnect.h ../../include/curl/curl.h \
- ../../include/curl/curlver.h ../../include/curl/easy.h \
- ../../include/curl/multi.h ../../include/curl/types.h RCReader.h \
+ Sequence.h Grid.h DataDDS.h HTTPConnect.h RCReader.h \
ObjectType.h HTTPCache.h ResponseTooBigErr.h \
HTTPCacheDisconnectedMode.h SignalHandlerRegisteredErr.h HTTPResponse.h \
Response.h debug.h AISMerge.h AISResources.h GNU/Regex.h Resource.h \
@@ -1005,9 +964,7 @@
InternalErr.h dods-datatypes.h Clause.h expr.h RValue.h util.h Byte.h \
Int16.h UInt16.h Int32.h UInt32.h Float32.h Float64.h Str.h \
dods-limits.h Url.h Array.h Vector.h List.h Structure.h Constructor.h \
- Sequence.h Grid.h DataDDS.h HTTPConnect.h ../../include/curl/curl.h \
- ../../include/curl/curlver.h ../../include/curl/easy.h \
- ../../include/curl/multi.h ../../include/curl/types.h RCReader.h \
+ Sequence.h Grid.h DataDDS.h HTTPConnect.h RCReader.h \
ObjectType.h HTTPCache.h ResponseTooBigErr.h \
HTTPCacheDisconnectedMode.h SignalHandlerRegisteredErr.h HTTPResponse.h \
Response.h debug.h AISMerge.h AISResources.h GNU/Regex.h Resource.h \
@@ -1017,9 +974,7 @@
Clause.h expr.h RValue.h util.h Byte.h Int16.h UInt16.h Int32.h \
UInt32.h Float32.h Float64.h Str.h dods-limits.h Url.h Array.h Vector.h \
List.h Structure.h Constructor.h Sequence.h Grid.h DataDDS.h \
- HTTPConnect.h ../../include/curl/curl.h ../../include/curl/curlver.h \
- ../../include/curl/easy.h ../../include/curl/multi.h \
- ../../include/curl/types.h RCReader.h ObjectType.h HTTPCache.h \
+ HTTPConnect.h RCReader.h ObjectType.h HTTPCache.h \
config_dap.h ResponseTooBigErr.h HTTPCacheDisconnectedMode.h \
SignalHandlerRegisteredErr.h HTTPResponse.h Response.h debug.h
server_handler.o: server_handler.cc config_dap.h DODSFilter.h DAS.h \
@@ -1048,18 +1003,14 @@
List.h Structure.h Constructor.h Sequence.h Grid.h
HTTPCacheTest.o: HTTPCacheTest.cc HTTPCache.h config_dap.h Error.h \
InternalErr.h ResponseTooBigErr.h HTTPCacheDisconnectedMode.h \
- SignalHandlerRegisteredErr.h HTTPConnect.h ../../include/curl/curl.h \
- ../../include/curl/curlver.h ../../include/curl/easy.h \
- ../../include/curl/multi.h ../../include/curl/types.h RCReader.h util.h \
+ SignalHandlerRegisteredErr.h HTTPConnect.h RCReader.h util.h \
BaseType.h dods-datatypes.h Byte.h Int16.h UInt16.h Int32.h UInt32.h \
Float32.h Float64.h Str.h dods-limits.h Url.h Array.h Vector.h DDS.h \
GNU/Pix.h IteratorAdapter.h Clause.h expr.h RValue.h List.h Structure.h \
Constructor.h Sequence.h Grid.h ObjectType.h HTTPResponse.h Response.h \
debug.h SignalHandler.h EventHandler.h cgi_util.h EncodingType.h
HTTPConnectTest.o: HTTPConnectTest.cc GNU/Regex.h HTTPConnect.h \
- ../../include/curl/curl.h ../../include/curl/curlver.h \
- ../../include/curl/easy.h ../../include/curl/multi.h \
- ../../include/curl/types.h RCReader.h Error.h util.h BaseType.h \
+ RCReader.h Error.h util.h BaseType.h \
InternalErr.h dods-datatypes.h Byte.h Int16.h UInt16.h Int32.h UInt32.h \
Float32.h Float64.h Str.h dods-limits.h Url.h Array.h Vector.h DDS.h \
GNU/Pix.h IteratorAdapter.h Clause.h expr.h RValue.h List.h Structure.h \
@@ -1090,23 +1041,7 @@
Vector.h DDS.h GNU/Pix.h IteratorAdapter.h Clause.h expr.h RValue.h \
Grid.h Constructor.h
AISDatabaseParserTest.o: AISDatabaseParserTest.cc AISDatabaseParser.h \
- ../../include/libxml2/libxml/parserInternals.h \
- ../../include/libxml2/libxml/parser.h \
- ../../include/libxml2/libxml/tree.h \
- ../../include/libxml2/libxml/xmlversion.h \
- ../../include/libxml2/libxml/xmlregexp.h \
- ../../include/libxml2/libxml/valid.h \
- ../../include/libxml2/libxml/list.h \
- ../../include/libxml2/libxml/xmlautomata.h \
- ../../include/libxml2/libxml/entities.h \
- ../../include/libxml2/libxml/encoding.h \
- ../../include/libxml2/libxml/xmlIO.h \
- ../../include/libxml2/libxml/globals.h \
- ../../include/libxml2/libxml/xmlerror.h \
- ../../include/libxml2/libxml/SAX.h ../../include/libxml2/libxml/xlink.h \
- ../../include/libxml2/libxml/xmlmemory.h \
- ../../include/libxml2/libxml/threads.h \
- ../../include/libxml2/libxml/HTMLparser.h InternalErr.h Error.h \
+ InternalErr.h Error.h \
AISExceptions.h AISResources.h GNU/Regex.h Resource.h debug.h
AISResourcesTest.o: AISResourcesTest.cc AISResources.h GNU/Regex.h \
Resource.h Error.h AISExceptions.h debug.h
@@ -1115,9 +1050,7 @@
dods-datatypes.h Clause.h expr.h RValue.h util.h Byte.h Int16.h \
UInt16.h Int32.h UInt32.h Float32.h Float64.h Str.h dods-limits.h Url.h \
Array.h Vector.h List.h Structure.h Constructor.h Sequence.h Grid.h \
- DataDDS.h HTTPConnect.h ../../include/curl/curl.h \
- ../../include/curl/curlver.h ../../include/curl/easy.h \
- ../../include/curl/multi.h ../../include/curl/types.h RCReader.h \
+ DataDDS.h HTTPConnect.h RCReader.h \
ObjectType.h HTTPCache.h config_dap.h ResponseTooBigErr.h \
HTTPCacheDisconnectedMode.h SignalHandlerRegisteredErr.h HTTPResponse.h \
Response.h debug.h AISMerge.h AISResources.h GNU/Regex.h Resource.h \
--- opendap-3.4.4/DODS/src/nc3-dods-3.4.7/Makefile.in.BAD 2005-04-23 16:49:47.000000000 -0500
+++ opendap-3.4.4/DODS/src/nc3-dods-3.4.7/Makefile.in 2005-04-23 16:51:49.000000000 -0500
@@ -293,9 +293,7 @@
../../include/Array.h ../../include/Vector.h ../../include/List.h \
../../include/Structure.h ../../include/Constructor.h \
../../include/Sequence.h ../../include/Grid.h ../../include/DataDDS.h \
- ../../include/HTTPConnect.h ../../include/curl/curl.h \
- ../../include/curl/curlver.h ../../include/curl/easy.h \
- ../../include/curl/multi.h ../../include/curl/types.h \
+ ../../include/HTTPConnect.h \
../../include/RCReader.h ../../include/HTTPCache.h \
../../include/config_dap.h ../../include/ResponseTooBigErr.h \
../../include/HTTPCacheDisconnectedMode.h \
@@ -326,9 +324,7 @@
../../include/Vector.h ../../include/List.h ../../include/Structure.h \
../../include/Constructor.h ../../include/Sequence.h \
../../include/Grid.h ../../include/DataDDS.h \
- ../../include/HTTPConnect.h ../../include/curl/curl.h \
- ../../include/curl/curlver.h ../../include/curl/easy.h \
- ../../include/curl/multi.h ../../include/curl/types.h \
+ ../../include/HTTPConnect.h \
../../include/RCReader.h ../../include/ObjectType.h \
../../include/HTTPCache.h ../../include/config_dap.h \
../../include/ResponseTooBigErr.h \
@@ -363,9 +359,7 @@
../../include/List.h ../../include/Structure.h \
../../include/Constructor.h ../../include/Sequence.h \
../../include/Grid.h ../../include/DataDDS.h \
- ../../include/HTTPConnect.h ../../include/curl/curl.h \
- ../../include/curl/curlver.h ../../include/curl/easy.h \
- ../../include/curl/multi.h ../../include/curl/types.h \
+ ../../include/HTTPConnect.h \
../../include/RCReader.h ../../include/ObjectType.h \
../../include/HTTPCache.h ../../include/config_dap.h \
../../include/ResponseTooBigErr.h \
@@ -387,9 +381,7 @@
../../include/List.h ../../include/Structure.h \
../../include/Constructor.h ../../include/Sequence.h \
../../include/Grid.h ../../include/DataDDS.h \
- ../../include/HTTPConnect.h ../../include/curl/curl.h \
- ../../include/curl/curlver.h ../../include/curl/easy.h \
- ../../include/curl/multi.h ../../include/curl/types.h \
+ ../../include/HTTPConnect.h \
../../include/RCReader.h ../../include/ObjectType.h \
../../include/HTTPCache.h ../../include/config_dap.h \
../../include/ResponseTooBigErr.h \
@@ -414,9 +406,7 @@
../../include/List.h ../../include/Structure.h \
../../include/Constructor.h ../../include/Sequence.h \
../../include/Grid.h ../../include/DataDDS.h \
- ../../include/HTTPConnect.h ../../include/curl/curl.h \
- ../../include/curl/curlver.h ../../include/curl/easy.h \
- ../../include/curl/multi.h ../../include/curl/types.h \
+ ../../include/HTTPConnect.h \
../../include/RCReader.h ../../include/ObjectType.h \
../../include/HTTPCache.h ../../include/config_dap.h \
../../include/ResponseTooBigErr.h \
@@ -440,9 +430,7 @@
../../include/Array.h ../../include/Vector.h ../../include/List.h \
../../include/Structure.h ../../include/Constructor.h \
../../include/Sequence.h ../../include/Grid.h ../../include/DataDDS.h \
- ../../include/HTTPConnect.h ../../include/curl/curl.h \
- ../../include/curl/curlver.h ../../include/curl/easy.h \
- ../../include/curl/multi.h ../../include/curl/types.h \
+ ../../include/HTTPConnect.h \
../../include/RCReader.h ../../include/ObjectType.h \
../../include/HTTPCache.h ../../include/config_dap.h \
../../include/ResponseTooBigErr.h \
@@ -466,9 +454,7 @@
../../include/Array.h ../../include/Vector.h ../../include/List.h \
../../include/Structure.h ../../include/Constructor.h \
../../include/Sequence.h ../../include/Grid.h ../../include/DataDDS.h \
- ../../include/HTTPConnect.h ../../include/curl/curl.h \
- ../../include/curl/curlver.h ../../include/curl/easy.h \
- ../../include/curl/multi.h ../../include/curl/types.h \
+ ../../include/HTTPConnect.h \
../../include/RCReader.h ../../include/ObjectType.h \
../../include/HTTPCache.h ../../include/config_dap.h \
../../include/ResponseTooBigErr.h \
@@ -504,9 +490,7 @@
../../include/Vector.h ../../include/List.h ../../include/Structure.h \
../../include/Constructor.h ../../include/Sequence.h \
../../include/Grid.h ../../include/DataDDS.h \
- ../../include/HTTPConnect.h ../../include/curl/curl.h \
- ../../include/curl/curlver.h ../../include/curl/easy.h \
- ../../include/curl/multi.h ../../include/curl/types.h \
+ ../../include/HTTPConnect.h \
../../include/RCReader.h ../../include/ObjectType.h \
../../include/HTTPCache.h ../../include/config_dap.h \
../../include/ResponseTooBigErr.h \
@@ -530,9 +514,7 @@
../../include/Vector.h ../../include/List.h ../../include/Structure.h \
../../include/Constructor.h ../../include/Sequence.h \
../../include/Grid.h ../../include/DataDDS.h \
- ../../include/HTTPConnect.h ../../include/curl/curl.h \
- ../../include/curl/curlver.h ../../include/curl/easy.h \
- ../../include/curl/multi.h ../../include/curl/types.h \
+ ../../include/HTTPConnect.h \
../../include/RCReader.h ../../include/ObjectType.h \
../../include/HTTPCache.h ../../include/config_dap.h \
../../include/ResponseTooBigErr.h \
@@ -568,9 +550,7 @@
../../include/List.h ../../include/Structure.h \
../../include/Constructor.h ../../include/Sequence.h \
../../include/Grid.h ../../include/DataDDS.h \
- ../../include/HTTPConnect.h ../../include/curl/curl.h \
- ../../include/curl/curlver.h ../../include/curl/easy.h \
- ../../include/curl/multi.h ../../include/curl/types.h \
+ ../../include/HTTPConnect.h \
../../include/RCReader.h ../../include/ObjectType.h \
../../include/HTTPCache.h ../../include/config_dap.h \
../../include/ResponseTooBigErr.h \
@@ -604,9 +584,7 @@
../../include/Vector.h ../../include/List.h ../../include/Structure.h \
../../include/Constructor.h ../../include/Sequence.h \
../../include/Grid.h ../../include/DataDDS.h \
- ../../include/HTTPConnect.h ../../include/curl/curl.h \
- ../../include/curl/curlver.h ../../include/curl/easy.h \
- ../../include/curl/multi.h ../../include/curl/types.h \
+ ../../include/HTTPConnect.h \
../../include/RCReader.h ../../include/ObjectType.h \
../../include/HTTPCache.h ../../include/config_dap.h \
../../include/ResponseTooBigErr.h \
@@ -630,9 +608,7 @@
../../include/Vector.h ../../include/List.h ../../include/Structure.h \
../../include/Constructor.h ../../include/Sequence.h \
../../include/Grid.h ../../include/DataDDS.h \
- ../../include/HTTPConnect.h ../../include/curl/curl.h \
- ../../include/curl/curlver.h ../../include/curl/easy.h \
- ../../include/curl/multi.h ../../include/curl/types.h \
+ ../../include/HTTPConnect.h \
../../include/RCReader.h ../../include/ObjectType.h \
../../include/HTTPCache.h ../../include/config_dap.h \
../../include/ResponseTooBigErr.h \
@@ -656,9 +632,7 @@
../../include/Array.h ../../include/Vector.h ../../include/List.h \
../../include/Structure.h ../../include/Constructor.h \
../../include/Sequence.h ../../include/Grid.h ../../include/DataDDS.h \
- ../../include/HTTPConnect.h ../../include/curl/curl.h \
- ../../include/curl/curlver.h ../../include/curl/easy.h \
- ../../include/curl/multi.h ../../include/curl/types.h \
+ ../../include/HTTPConnect.h \
../../include/RCReader.h ../../include/ObjectType.h \
../../include/HTTPCache.h ../../include/config_dap.h \
../../include/ResponseTooBigErr.h \
--- opendap-3.4.4/DODS/src/tools/www-interface-3.4.3/Makefile.in.BAD 2005-04-23 16:49:18.000000000 -0500
+++ opendap-3.4.4/DODS/src/tools/www-interface-3.4.3/Makefile.in 2005-04-23 16:49:30.000000000 -0500
@@ -337,9 +337,7 @@
../../../include/List.h ../../../include/Structure.h \
../../../include/Constructor.h ../../../include/Sequence.h \
../../../include/Grid.h ../../../include/DataDDS.h \
- ../../../include/HTTPConnect.h ../../../include/curl/curl.h \
- ../../../include/curl/curlver.h ../../../include/curl/easy.h \
- ../../../include/curl/multi.h ../../../include/curl/types.h \
+ ../../../include/HTTPConnect.h \
../../../include/RCReader.h ../../../include/ObjectType.h \
../../../include/HTTPCache.h ../../../include/config_dap.h \
../../../include/ResponseTooBigErr.h \
--- opendap-3.4.4/DODS/src/tools/asciival-3.4.3/Makefile.in.BAD 2005-04-23 16:48:57.000000000 -0500
+++ opendap-3.4.4/DODS/src/tools/asciival-3.4.3/Makefile.in 2005-04-23 16:49:09.000000000 -0500
@@ -314,9 +314,7 @@
../../../include/List.h ../../../include/Structure.h \
../../../include/Constructor.h ../../../include/Sequence.h \
../../../include/Grid.h ../../../include/DataDDS.h \
- ../../../include/HTTPConnect.h ../../../include/curl/curl.h \
- ../../../include/curl/curlver.h ../../../include/curl/easy.h \
- ../../../include/curl/multi.h ../../../include/curl/types.h \
+ ../../../include/HTTPConnect.h \
../../../include/RCReader.h ../../../include/ObjectType.h \
../../../include/HTTPCache.h ../../../include/config_dap.h \
../../../include/ResponseTooBigErr.h \
--- NEW FILE opendap.spec ---
Name: opendap
Version: 3.4.4
Release: 5%{?dist}
Summary: Open-source Project for a Network Data Access Protocol
Group: Applications/Engineering
License: LGPL
URL: http://www.opendap.org/
Source0: ftp://ftp.unidata.ucar.edu/pub/dods/DODS-3.4/3.4.4/source/DODS-dap-3.4.8.tar.gz
Source1: ftp://ftp.unidata.ucar.edu/pub/dods/DODS-3.4/3.4.4/source/DODS-nc3-dods-3.4.7.tar.gz
Source2: ftp://ftp.unidata.ucar.edu/pub/dods/DODS-3.4/3.4.4/source/DODS-jg-dods-3.4.3.tar.gz
Source3: ftp://ftp.unidata.ucar.edu/pub/dods/DODS-3.4/3.4.4/source/DODS-ff-dods-3.4.3.tar.gz
# This thing is really broken.
#Source4: ftp://ftp.unidata.ucar.edu/pub/dods/DODS-3.4/3.4.4/source/DODS-ncview-3.4.3.tar.gz
Source5: ftp://ftp.unidata.ucar.edu/pub/dods/DODS-3.4/3.4.4/source/DODS-asciival-3.4.3.tar.gz
Source6: ftp://ftp.unidata.ucar.edu/pub/dods/DODS-3.4/3.4.4/source/DODS-www-interface-3.4.3.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Patch0: opendap-3.4.4-gcc4.patch
Patch1: opendap-3.4.4-dap-gcc4.patch
Patch2: opendap-3.4.4-nc3-dods-f95.patch
Patch3: opendap-3.4.4-systemlibs.patch
Patch4: opendap-3.4.4-includedir.patch
Patch5: opendap-3.4.4-shared.patch
Patch6: opendap-3.4.4-rpmoptflags.patch
BuildRequires: openssl-devel, pkgconfig
BuildRequires: curl-devel, krb5-libs, netcdf-devel
BuildRequires: libxml2-devel
%package devel
Summary: Development files for opendap
Group: Development/Libraries
Requires: %{name} = %{version}-%{release}
%package server
Summary: Server components for opendap
Group: System Environment/Daemons
Requires: %{name} = %{version}-%{release}
Requires: perl-HTML-Parser
%description
OPeNDAP provides software which makes local data accessible to remote
locations regardless of local storage format. OPeNDAP also provides tools
for transforming existing applications into OPeNDAP clients (i.e., enabling
them to remotely access OPeNDAP served data). OPeNDAP software is freely
available.
%description devel
This package contains the OPeNDAP header files and libraries.
%description server
This package contains the OPeNDAP server components.
%prep
%setup -c -n %{name}-%{version} -q -a 1 -a 2 -a 3 -a 5 -a 6
%patch0 -p1
%patch1 -p1
%patch2 -p1
%patch3 -p1
%patch4 -p1
%patch5 -p1
%patch6 -p1
%build
cd DODS/
export NETCDF_INC=%{_includedir}/netcdf-3 NETCDF_LIB=%{_libdir}/netcdf-3
export CPPFLAGS="$RPM_OPT_FLAGS -fPIC" CXXFLAGS="$RPM_OPT_FLAGS -fPIC" CFLAGS="$RPM_OPT_FLAGS -fPIC"
%configure
make
unset NETCDF_INC NETCDF_LIB
%install
rm -rf ${RPM_BUILD_ROOT}
cd DODS/
rm -rf include/netcdf.h include/netcdf.inc include/builtin.h share/
mkdir -p $RPM_BUILD_ROOT/%{perl_vendorlib}
mkdir -p $RPM_BUILD_ROOT/%{_datadir}/%{name}
mkdir -p $RPM_BUILD_ROOT/%{_bindir}
mkdir -p $RPM_BUILD_ROOT/%{_includedir}/opendap
install -m644 etc/*.pm $RPM_BUILD_ROOT/%{perl_vendorlib}/
install -m644 etc/jgofs_objects_readme $RPM_BUILD_ROOT/%{_datadir}/%{name}
install -m755 bin/* $RPM_BUILD_ROOT/%{_bindir}
for i in ff_das ff_dds ff_dods jg_das jg_dds jg_dods nc_das nc_dds nc_dods usage-jg \
usage def www_int nph-dods installServers deflate asciival; do
install -m755 etc/$i $RPM_BUILD_ROOT/%{_bindir}
done
install -m755 lib/*.a $RPM_BUILD_ROOT/%{_libdir}
install -m755 lib/libdap++.so* $RPM_BUILD_ROOT/%{_libdir}
install -m755 lib/libnc-dods.so* $RPM_BUILD_ROOT/%{_libdir}
install -m644 include/* $RPM_BUILD_ROOT/%{_includedir}/opendap
cd $RPM_BUILD_ROOT/%{_libdir}
chmod +x libdap++.so.0.0.0 libnc-dods.so.0.0.0
ln -s libdap++.so.0.0.0 libdap++.so.0
ln -s libdap++.so.0.0.0 libdap++.so
ln -s libnc-dods.so.0.0.0 libnc-dods.so.0
ln -s libnc-dods.so.0.0.0 libnc-dods.so
%clean
rm -rf ${RPM_BUILD_ROOT}
%post -p /sbin/ldconfig
%postun -p /sbin/ldconfig
%files
%defattr(-,root,root,-)
%doc DODS/etc/INSTALL-clients DODS/README DODS/etc/INSTALL-matlab-client DODS/etc/COPYING
%{_bindir}/geturl
%{_bindir}/dncdump
%{_bindir}/checkvar
%{_libdir}/libdap++.so.*
%{_libdir}/libnc-dods.so.*
%files devel
%defattr(-,root,root,-)
%doc DODS/ChangeLog DODS/INSTALL DODS/NEWS DODS/VERSION DODS/etc/COPYRIGHT_URI
%{_bindir}/opendap-config
%{_libdir}/libdap++.a
%{_libdir}/libdap++.so
%{_libdir}/libnc-dods.a
%{_libdir}/libnc-dods.so
%{_includedir}/opendap
%files server
%defattr(-,root,root,-)
%doc DODS/etc/INSTALL-servers DODS/etc/README-security DODS/etc/EXAMPLE_DODS_STATISTICS
%{_bindir}/installServers
%{_bindir}/nph-dods
%{_bindir}/asciival
%{_bindir}/www_int
%{_bindir}/def
%{_bindir}/jg_*
%{_bindir}/ff_*
%{_bindir}/nc_*
%{_bindir}/usage-jg
%{_bindir}/chkform
%{_bindir}/newform
%{_bindir}/bufform
%{_bindir}/readfile
%{_bindir}/deflate
%{_bindir}/usage
%dir %{_datadir}/%{name}
%{_datadir}/%{name}/jgofs_objects_readme
%{perl_vendorlib}/*.pm
%changelog
* Tue Jul 5 2005 Tom "spot" Callaway <tcallawa at redhat.com> 3.4.4-4
- Remove broken client bits
* Tue Jul 5 2005 Tom "spot" Callaway <tcallawa at redhat.com> 3.4.4-3
- put headers in %{_includedir}/opendap
- make shared libraries
- fix opendap-config
* Sat Apr 23 2005 Tom "spot" Callaway <tcallawa at redhat.com> 3.4.4-2
- Use system packages instead of included older versions
* Fri Apr 22 2005 Tom "spot" Callaway <tcallawa at redhat.com> 3.4.4-1
- Initial package
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/opendap/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore 9 Jul 2005 00:12:11 -0000 1.1
+++ .cvsignore 9 Jul 2005 00:14:57 -0000 1.2
@@ -0,0 +1,6 @@
+DODS-asciival-3.4.3.tar.gz
+DODS-dap-3.4.8.tar.gz
+DODS-ff-dods-3.4.3.tar.gz
+DODS-jg-dods-3.4.3.tar.gz
+DODS-nc3-dods-3.4.7.tar.gz
+DODS-www-interface-3.4.3.tar.gz
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/opendap/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources 9 Jul 2005 00:12:11 -0000 1.1
+++ sources 9 Jul 2005 00:14:57 -0000 1.2
@@ -0,0 +1,6 @@
+4fb5b5b1af1e962b7d35302d129071dc DODS-asciival-3.4.3.tar.gz
+3a1c6000d8713ded765d987c8d216462 DODS-dap-3.4.8.tar.gz
+e341d6ba8ac0ea8ef11679e330a0655c DODS-ff-dods-3.4.3.tar.gz
+38a2ef12916f1414d3dbe26d8913e2ae DODS-jg-dods-3.4.3.tar.gz
+dfeb77f1eace3b3c64884d21afc8a422 DODS-nc3-dods-3.4.7.tar.gz
+3c0f9dc00bba72fec8049ad7352fc5af DODS-www-interface-3.4.3.tar.gz
More information about the fedora-extras-commits
mailing list