From 007798183bcdc8c3f656a84f0409968e5e30702c Mon Sep 17 00:00:00 2001
From: Dennis Heimbigner <dmh@unidata.ucar.edu>
Date: Tue, 17 Jul 2012 22:29:09 +0000
Subject: [PATCH] oops; completely disable udunits and libcf again

---
 Makefile.am  | 12 ++++++------
 cf           |  4 ++--
 configure.ac | 14 +++++++++-----
 3 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 0432c4fc5..d034a81e9 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -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
diff --git a/cf b/cf
index 757e0dd62..632e88192 100644
--- a/cf
+++ b/cf
@@ -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"
diff --git a/configure.ac b/configure.ac
index 828e40a96..86f28b5af 100644
--- a/configure.ac
+++ b/configure.ac
@@ -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