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

oops; completely disable udunits and libcf again

Browse Source
This commit is contained in:
Dennis Heimbigner 2012-07-17 22:29:09 +00:00
parent 95ee14d882
commit 007798183b
3 changed files with 17 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Makefile.am
View File

@ -67,14 +67,14 @@ LIBRPC = librpc
endif
# Build UDUNITS?
if BUILD_UDUNITS
UDUNITS = udunits
endif
#if BUILD_UDUNITS
#UDUNITS = udunits
#endif
# Build libcf?
if BUILD_LIBCF
LIBCF = libcf
endif
#if BUILD_LIBCF
#LIBCF = libcf
#endif
# Define Test directories
if BUILD_TESTSETS

4
cf
View File

@ -139,8 +139,8 @@ FLAGS="$FLAGS --enable-doxygen"
FLAGS="$FLAGS --enable-logging"
#FLAGS="$FLAGS --disable-diskless"
#FLAGS="$FLAGS --enable-mmap"
FLAGS="$FLAGS --with-udunits"
FLAGS="$FLAGS --with-libcf"
#FLAGS="$FLAGS --with-udunits"
#FLAGS="$FLAGS --with-libcf"
#FLAGS="$FLAGS --disable-shared"
#FLAGS="$FLAGS --enable-shared"

14
configure.ac
View File

@ -728,13 +728,17 @@ if test "x$enable_logging" = xyes; then
AC_DEFINE([LOGGING], 1, [If true, turn on logging.])
fi
# Like other libraries, udunits and libcf
# are no long part of the netcdf distribution.
#AC_MSG_CHECKING([whether udunits is to be built])
#AC_ARG_WITH([udunits],
# [AS_HELP_STRING([--with-udunits],
# [Build udunits2 package.])])
#test "x$with_udunits" = xyes || with_udunits=no
#AC_MSG_RESULT($with_udunits)
with_udunits=no
#AM_CONDITIONAL(BUILD_UDUNITS, [test "x$with_udunits" = xyes])
# Does the user want to also build the libcf library?
#AC_MSG_CHECKING([whether libcf is to be built])
@ -745,7 +749,10 @@ with_udunits=no
# Forecast conventions. (Requires netCDF-4 and HDF5)])])
#test "x$with_libcf" = xyes || with_libcf=no
#AC_MSG_RESULT($with_libcf)
with_libcf=no
#AM_CONDITIONAL(BUILD_LIBCF, [test "x$with_libcf" = xyes])
#AC_CONFIG_SUBDIRS([udunits libcf])
# Automake conditionals need to be called, whether the answer is yes
# or no.
@ -771,8 +778,6 @@ AM_CONDITIONAL(BUILD_CDMREMOTE, [test "x$enable_cdmremote" = xyes]) # Alias
AM_CONDITIONAL(BUILD_RPC, [test "x$enable_rpc" = xyes])
AM_CONDITIONAL(BUILD_DISKLESS, [test x$enable_diskless = xyes])
AM_CONDITIONAL(BUILD_MMAP, [test x$enable_mmap = xyes])
AM_CONDITIONAL(BUILD_LIBCF, [test "x$with_libcf" = xyes])
AM_CONDITIONAL(BUILD_UDUNITS, [test "x$with_udunits" = xyes])
# If the machine doesn't have a long long, and we want netCDF-4, then
# we've got problems!
@ -850,7 +855,6 @@ AH_BOTTOM([#include "ncconfigure.h"])
# debugging purposes.
# cp confdefs.h my_config.h
AC_CONFIG_SUBDIRS([udunits libcf])
AC_MSG_NOTICE([generating header files and makefiles])
AC_CONFIG_FILES([Makefile