Optionally (and by default) build CDI application.

app/Makefile.am

@@ -2,13 +2,18 @@
 #
 bin_PROGRAMS    =
 noinst_PROGRAMS =
+check_PROGRAMS  =
+if ENABLE_CDI_APP
 if ENABLE_CDI_LIB
   bin_PROGRAMS    += cdi
-else
+else !ENABLE_CDI_LIB
   noinst_PROGRAMS += cdi
-endif
+endif !ENABLE_CDI_LIB
+  noinst_PROGRAMS += createtable
+else !ENABLE_CDI_APP
+  check_PROGRAMS += cdi
+endif !ENABLE_CDI_APP
 #
-noinst_PROGRAMS    += createtable
 #
 cdi_SOURCES         = cdi.c printinfo.h printinfo_extern.c
 cdi_LDADD           = $(top_builddir)/src/libcdi.la @LIBS@

m4/acx_options.m4

@@ -295,6 +295,12 @@ AC_ARG_ENABLE([hirlam-extensions],
               [enable_hirlam_extensions=no])
 AC_MSG_RESULT([$enable_hirlam_extensions])
 AM_CONDITIONAL([ENABLE_HIRLAM_EXTENSIONS],[test x$enable_hirlam_extensions = 'xyes'])
+#  ----------------------------------------------------------------------
+#  Build CDI application
+AC_ARG_ENABLE([cdi-app],
+              [AS_HELP_STRING([--enable-cdi-app],[build and install CDI application [default=yes]])],
+              [], [enable_cdi_app=yes])
+AM_CONDITIONAL([ENABLE_CDI_APP], [test x$enable_cdi_app = 'xyes'])
 #
 ])
 dnl