mirror/netcdf-c
2
0
Fork 0
mirror of https://github.com/Unidata/netcdf-c.git synced 2025-01-30 16:10:44 +08:00
Code Issues Packages Projects Releases Wiki Activity

Updating the scripts to make sure the libraries being linked again are consistent.

Browse Source
This commit is contained in:
Ward Fisher 2012-06-11 19:44:32 +00:00
parent b676336b6c
commit 1ca8b5d09c
12 changed files with 27 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
configure.ac
View File

@ -637,7 +637,7 @@ AC_CHECK_SIZEOF(off_t)
AC_CHECK_SIZEOF(size_t)
if test "x$enable_netcdf_4" = xyes || test "x$enable_dap" = xyes; then
AC_SEARCH_LIBS([deflate], [zlib zlib1 z zlibwapi zlibstat], [], [
AC_SEARCH_LIBS([deflate], [zlibwapi zlibstat zlib zlib1 z], [], [
AC_MSG_ERROR([Can't find or link to the z library. Turn off netCDF-4 and \
opendap with --disable-netcdf-4 --disable-dap, or see config.log for errors.])])
fi

5
libdap2/daputil.h
View File

@ -71,8 +71,11 @@ extern size_t dimproduct3(NClist* dimensions);
#else
# define NCC_EXTRA __declspec(dllimport)
# endif
#endif
NCC_EXTRA extern int nc__testurl(const char* path, char** basename);
#else
extern int nc__testurl(const char* parth, char** basename);
#endif
/* Provide a wrapper for oc_fetch so we can log what it does */
extern OCerror dap_fetch(struct NCDAPCOMMON*,OCconnection,const char*,OCdxd,OCobject*);

2
my_shared_32_nc4_conf.sh
View File

@ -1,4 +1,4 @@
#!/bin/bash
set -x
./configure --disable-static --disable-doxygen --enable-shared --disable-dap --enable-netcdf-4 --enable-utilities --enable-dll CFLAGS="-ggdb -O0 -I/c/Users/wfisher/Desktop/hdf5-1.8.9/src" LDFLAGS="-ggdb -O0 -L/c/Users/wfisher/Desktop/hdf5-1.8.9/build_win32_dll/bin -L/c/Users/wfisher/Desktop/szip-2.1/build_win32_dll/bin"
./configure --disable-static --disable-doxygen --enable-shared --disable-dap --enable-netcdf-4 --enable-dll CFLAGS="-ggdb -O0 -I/c/Users/wfisher/Desktop/hdf5-1.8.9/src" LDFLAGS="-ggdb -O0 -L/c/Users/wfisher/Desktop/hdf5-1.8.9/build_win32_dll/bin -L/c/Users/wfisher/Desktop/szip-2.1/build_win32/bin"

8
my_shared_32_nc4_dap_conf.sh
View File

@ -1,10 +1,4 @@
#!/bin/bash
set -x
HDF5INCLUDE="/c/Users/wfisher/Desktop/hdf5-1.8.9/src"
CURLINCLUDE="/c/Users/wfisher/Desktop/curl-7.25.0/build_win32/include"
LIBSDIR="/c/Users/wfisher/Desktop/libs32"
./configure --disable-static --disable-doxygen --enable-shared --enable-dap --enable-netcdf-4 --enable-utilities --enable-dll CFLAGS="-ggdb -O0 -I$HDF5INCLUDE -I$CURLINCLUDE" LDFLAGS="-ggdb -O0 -L$LIBSDIR"
#./configure --disable-static --disable-doxygen --enable-shared --disable-dap --enable-netcdf-4 --enable-utilities --enable-dll CFLAGS="-ggdb -O0 -I/c/Users/wfisher/Desktop/hdf5-1.8.9/src" LDFLAGS="-ggdb -O0 -L/c/Users/wfisher/Desktop/hdf5-1.8.9/build_win32_dll/bin -L/c/Users/wfisher/Desktop/szip-2.1/build_win32_dll/bin"
./configure --disable-static --disable-doxygen --enable-shared --enable-dap --enable-netcdf-4 --enable-utilities --enable-dll CFLAGS="-ggdb -O0 -I/c/Users/wfisher/Desktop/hdf5-1.8.9/src -I/c/Users/wfisher/Desktop/curl-7.25.0/build_win32/include" LDFLAGS="-ggdb -O0 -L/c/Users/wfisher/Desktop/hdf5-1.8.9/build_win32_dll/bin -L/c/Users/wfisher/Desktop/szip-2.1/build_win32_dll/bin -L/c/Users/wfisher/Desktop/curl-7.25.0/build_win32/lib/.libs"

2
my_shared_64_min_conf.sh
View File

@ -1,5 +1,5 @@
#!/bin/bash
set -x
./configure --disable-dap --disable-doxygen --enable-shared --disable-static --enable-dll --disable-netcdf-4 --host=x86_64-w64-mingw32 CFLAGS="-ggdb -O0" LDFLAGS=""
./configure --disable-dap --disable-doxygen --enable-shared --disable-static --enable-dll --disable-netcdf-4 --host=x86_64-w64-mingw32 CFLAGS="-ggdb -O0" LDFLAGS="-ggdb -O0"
#./configure --disable-dap --disable-doxygen --enable-shared --disable-static --enable-dll --disable-netcdf-4 --disable-utilities --host=x86_64-w64-mingw32 CFLAGS="-ggdb -O0" LDFLAGS="-ggdb -O0"

5
my_shared_64_nc4_conf.sh
View File

@ -1,8 +1,5 @@
#!/bin/bash
set -x
./configure --disable-dap --disable-doxygen --enable-shared --disable-static --enable-dll --enable-netcdf-4 --enable-utilities --host=x86_64-w64-mingw32 CFLAGS="-ggdb -gdwarf-2 -O0 -I/c/Users/wfisher/Desktop/hdf5-1.8.9/build_win64_dll -I/c/Users/wfisher/Desktop/hdf5-1.8.9/src" LDFLAGS="-ggdb -gdwarf-2 -O0 -L/c/Users/wfisher/Desktop/hdf5-1.8.9/build_win64_dll/bin -L/c/Users/wfisher/Desktop/zlib125dll/dllx64 -L/c/Users/wfisher/Desktop/szip-2.1/build_win64_dll/bin"
./configure --disable-dap --disable-doxygen --enable-shared --disable-static --enable-dll --enable-netcdf-4 --host=x86_64-w64-mingw32 CFLAGS="-ggdb -gdwarf-2 -O0 -I/c/Users/wfisher/Desktop/hdf5-1.8.9/src" LDFLAGS="-ggdb -gdwarf-2 -O0 -L/c/Users/wfisher/Desktop/hdf5-1.8.9/build_win64_dll/bin -L/c/Users/wfisher/Desktop/zlib125dll/dllx64 -L/c/Users/wfisher/Desktop/szip-2.1/build_win64/bin"
#./configure --disable-dap --disable-doxygen --enable-shared --disable-static --enable-dll --enable-netcdf-4 --enable-utilities --host=x86_64-w64-mingw32 CFLAGS="-ggdb -gdwarf-2 -O0 -I/c/HDF5189/include" LDFLAGS="-ggdb -gdwarf-2 -O0 -L/c/HDF5189/bin"
#./configure --disable-dap --disable-doxygen --enable-shared --disable-static --enable-dll --enable-netcdf-4 --disable-utilities --host=x86_64-w64-mingw32 CFLAGS="-ggdb -O0 -I/c/HDF5189/include" LDFLAGS="-ggdb -O0 -L/home/wfisher/mypath/x86_64-w64-mingw32/lib -L/home/wfisher/zlib-1.2.5 -L/c/Users/wfisher/Desktop/szip-2.1/build_win64/bin -L/c/HDF5189/bin"

5
my_shared_64_nc4_dap_conf.sh Normal file
View File

@ -0,0 +1,5 @@
#!/bin/bash
set -x
./configure --enable-dap --disable-doxygen --enable-shared --disable-static --enable-dll --enable-netcdf-4 --host=x86_64-w64-mingw32 CFLAGS="-ggdb -gdwarf-2 -O0 -I/c/Users/wfisher/Desktop/hdf5-1.8.9/build_win64_dll -I/c/Users/wfisher/Desktop/hdf5-1.8.9/src -I/c/Users/wfisher/Desktop/curl-7.25.0/build_win64/include" LDFLAGS="-ggdb -gdwarf-2 -O0 -L/c/Users/wfisher/Desktop/hdf5-1.8.9/build_win64_dll/bin -L/c/Users/wfisher/Desktop/zlib125dll/dllx64 -L/c/Users/wfisher/Desktop/szip-2.1/build_win64/bin -L/c/Users/wfisher/Desktop/curl-7.25.0/build_win64/lib/.libs"

2
my_static_32_min_conf.sh
View File

@ -1,3 +1,3 @@
#!/bin/bash
set -x
./configure --enable-static --disable-dap --disable-doxygen --disable-shared --disable-netcdf-4 --enable-diskless CFLAGS="-ggdb -static -O0" LDFLAGS="-static -ggdb -O0"
./configure --enable-static --disable-dap --disable-doxygen --disable-shared --disable-netcdf-4 CFLAGS="-ggdb -static -O0" LDFLAGS="-static -ggdb -O0"

3
my_static_32_nc4_conf.sh
View File

@ -1,6 +1,5 @@
#!/bin/bash
set -x
./configure --enable-static --disable-doxygen --disable-shared --disable-dap --enable-netcdf-4 --enable-diskless CFLAGS="-ggdb -O0 -I/c/Users/wfisher/Desktop/hdf5-1.8.9/src -I/c/Users/wfisher/Desktop/hdf5-1.8.9/hl/src -I/c/Users/wfisher/Desktop/netcdf-4.2/include/ -I/c/Users/wfisher/Desktop/curl-7.25.0/include/" LDFLAGS="-static -ggdb -O0 -L/c/Users/wfisher/Desktop/hdf5-1.8.9/build_win/bin"
./configure --enable-static --disable-doxygen --disable-shared --disable-dap --enable-netcdf-4 CFLAGS="-ggdb -O0 -I/c/Users/wfisher/Desktop/hdf5-1.8.9/src -I/c/Users/wfisher/Desktop/hdf5-1.8.9/hl/src -I/c/Users/wfisher/Desktop/netcdf-4.2/include/" LDFLAGS="-static -ggdb -O0 -L/c/Users/wfisher/Desktop/hdf5-1.8.9/build_win32_static/bin -L/c/Users/wfisher/Desktop/szip-2.1/build_win32/bin -L/c/Users/wfisher/Desktop/zlib125dll/static32"

8
my_static_32_nc4_dap_conf.sh
View File

@ -1,11 +1,5 @@
#!/bin/bash
set -x
HDF5INCLUDE="/c/Users/wfisher/Desktop/hdf5-1.8.9/src"
CURLINCLUDE="/c/Users/wfisher/Desktop/curl-7.25.0/build_win32/include -DCURL_STATICLIB"
LIBSDIR="/c/Users/wfisher/Desktop/libs32"
./configure --enable-static --disable-doxygen --disable-shared --enable-dap --enable-netcdf-4 --enable-utilities CFLAGS="-ggdb -O0 -I$HDF5INCLUDE -I$CURLINCLUDE" LDFLAGS="-ggdb -O0 -L$LIBSDIR"
#./configure --disable-doxygen --disable-shared --enable-dap --enable-netcdf-4 --enable-diskless CFLAGS="-ggdb -O0 -I/c/Users/wfisher/Desktop/hdf5-1.8.9/src -I/c/Users/wfisher/Desktop/hdf5-1.8.9/hl/src -I/c/Users/wfisher/Desktop/curl-7.25.0/include/ -DCURL_STATICLIB" LDFLAGS="-ggdb -O0 -L/c/Users/wfisher/Desktop/hdf5-1.8.9/build_win/bin -L/c/Users/wfisher/Desktop/curl-7.25.0/lib/.libs -L/c/Users/wfisher/Desktop/hdf5-1.8.9/build_win/bin -L/c/Users/wfisher/Desktop/szip-2.1/build_win32_static/bin"
./configure --disable-doxygen --disable-shared --enable-dap --enable-netcdf-4 CFLAGS="-ggdb -O0 -I/c/Users/wfisher/Desktop/hdf5-1.8.9/src -I/c/Users/wfisher/Desktop/hdf5-1.8.9/hl/src -I/c/Users/wfisher/Desktop/curl-7.25.0/build_win32/include/ -DCURL_STATICLIB" LDFLAGS="-ggdb -O0 -L/c/Users/wfisher/Desktop/hdf5-1.8.9/build_win32_static/bin -L/c/Users/wfisher/Desktop/curl-7.25.0/build_win32/lib/.libs -L/c/Users/wfisher/Desktop/szip-2.1/build_win32/bin"
#-L/c/Users/wfisher/Desktop/curl-7.25.0/lib/.libs/libcurl.a"

4
my_static_64_nc4_conf.sh
View File

@ -1,6 +1,8 @@
#!/bin/bash
set -x
./configure --enable-static --disable-doxygen --disable-shared --disable-dap --enable-netcdf-4 --enable-diskless --host=x86_64-w64-mingw32 CFLAGS="-ggdb -O0 -I/c/Users/wfisher/Desktop/hdf5-1.8.9/src" LDFLAGS="-ggdb -O0 -L/c/Users/wfisher/Desktop/szip-2.1/build_win64_static/bin -L/c/Users/wfisher/Desktop/hdf5-1.8.9/build_win64_static/bin -L/c/Users/wfisher/Desktop/zlib125dll/staticx64"
./configure --enable-static --disable-doxygen --disable-shared --disable-dap --enable-netcdf-4 --host=x86_64-w64-mingw32 CFLAGS="-ggdb -O0 -I/c/Users/wfisher/Desktop/hdf5-1.8.9/src" LDFLAGS="-ggdb -O0 -L/c/Users/wfisher/Desktop/szip-2.1/build_win64/bin -L/c/Users/wfisher/Desktop/hdf5-1.8.9/build_win64/bin -L/c/Users/wfisher/Desktop/zlib125dll/staticx64"
#./configure --enable-static --disable-doxygen --disable-shared --disable-dap --enable-netcdf-4 --host=x86_64-w64-mingw32 CFLAGS="-ggdb -O0 -I/c/Users/wfisher/Desktop/hdf5-1.8.9/src" LDFLAGS="-ggdb -O0 -L/c/Users/wfisher/Desktop/szip-2.1/build_win64/bin -L/c/Users/wfisher/Desktop/hdf5-1.8.9/build_win64_static/bin -L/c/Users/wfisher/Desktop/zlib125dll/staticx64"

7
my_static_64_nc4_dap_conf.sh Normal file
View File

@ -0,0 +1,7 @@
#!/bin/bash
set -x
./configure --enable-static --disable-doxygen --disable-shared --enable-dap --enable-netcdf-4 --host=x86_64-w64-mingw32 CFLAGS="-ggdb -O0 -I/c/Users/wfisher/Desktop/hdf5-1.8.9/src -I/c/Users/wfisher/Desktop/curl-7.25.0/build_win64/include -DCURL_STATICLIB" LDFLAGS="-ggdb -O0 -L/c/Users/wfisher/Desktop/szip-2.1/build_win64/bin -L/c/Users/wfisher/Desktop/hdf5-1.8.9/build_win64_static/bin -L/c/Users/wfisher/Desktop/zlib125dll/staticx64 -L/c/Users/wfisher/Desktop/curl-7.25.0/build_win64/lib/.libs"