Skip to content

Commit 41ea19e

Browse files
author
Jeff Whitaker
committed
update
1 parent 61493fb commit 41ea19e

File tree

1 file changed

+21
-21
lines changed

1 file changed

+21
-21
lines changed

config.sh

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -36,37 +36,37 @@ function build_curl2 {
3636
touch curl-stamp
3737
}
3838

39-
function build_libs {
40-
build_hdf5
41-
build_curl2
42-
if [ -z "$IS_OSX" ] && [ $MB_ML_VER -eq 1 ]; then
43-
export CFLAGS="-std=gnu99 -Wl,-strip-all"
44-
fi
45-
build_netcdf
46-
}
47-
4839
function build_netcdf {
4940
if [ -e netcdf-stamp ]; then return; fi
5041
build_hdf5
5142
build_curl
5243
if [ $NETCDF_VERSION == "MASTER" ]; then
53-
git clone https://github.com/Unidata/netcdf-c
54-
cd netcdf-c
55-
autoreconf -i
56-
./configure --prefix=$BUILD_PREFIX --enable-dap \
57-
make -j4
58-
make install
59-
cd ..
44+
git clone https://github.com/Unidata/netcdf-c
45+
cd netcdf-c
46+
autoreconf -i
47+
./configure --prefix=$BUILD_PREFIX --enable-dap \
48+
make -j4
49+
make install
50+
cd ..
6051
else
61-
fetch_unpack https://github.com/Unidata/netcdf-c/archive/v${NETCDF_VERSION}.tar.gz
62-
(cd netcdf-c-${NETCDF_VERSION} \
63-
&& ./configure --prefix=$BUILD_PREFIX --enable-dap \
64-
&& make -j4 \
65-
&& make install)
52+
fetch_unpack https://github.com/Unidata/netcdf-c/archive/v${NETCDF_VERSION}.tar.gz
53+
(cd netcdf-c-${NETCDF_VERSION} \
54+
&& ./configure --prefix=$BUILD_PREFIX --enable-dap \
55+
&& make -j4 \
56+
&& make install)
6657
fi
6758
touch netcdf-stamp
6859
}
6960

61+
function build_libs {
62+
build_hdf5
63+
build_curl2
64+
if [ -z "$IS_OSX" ] && [ $MB_ML_VER -eq 1 ]; then
65+
export CFLAGS="-std=gnu99 -Wl,-strip-all"
66+
fi
67+
build_netcdf
68+
}
69+
7070
function run_tests {
7171
# Runs tests on installed distribution from an empty directory
7272
pwd

0 commit comments

Comments
 (0)