configure.ac: default to --enable-gtk

Default to enabling gtk rather than disabling it. Gracefully handle
cases where the user tries to enable it but it cannot be enabled.

Makefile.am: Add missing headers to noinst_HEADERS.

Signed-off-by: Colin McCabe <colinm@hq.newdream.net>

diff --git a/configure.ac b/configure.ac
index 5805ad818410880c152409100e2faa4b756773af..a4c14636cd2ac643c91a33309cf745efb6f83387 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -210,19 +210,16 @@ AC_CHECK_FUNC([sync_file_range],
 #AC_FUNC_UTIME_NULL
 #AC_CHECK_FUNCS([bzero fchdir fdatasync floor ftruncate getcwd gethostbyname gethostname gettimeofday inet_ntoa localtime_r memmove memset mkdir munmap pow rmdir select socket sqrt strcasecmp strchr strerror strstr utime])
 
-AC_ARG_WITH(gtk2,
-        AC_HELP_STRING([--with-gtk2],
-        [Build the graphical tools.  Default=no]),
-        [HAVE_GTK2=yes],[HAVE_GTK2=no]
-        )
-
-AM_CONDITIONAL(WITH_GTK2, [test "x$HAVE_GTK2" = "xyes"])
-
-if test "x$HAVE_GTK2" == "xyes"; then
-       PKG_CHECK_MODULES(GTKMM, [gtkmm-2.4 >= 1.0.0])
-       AC_DEFINE([HAVE_GTK2], [1],
-                [Define if you have GTK2])
-fi
+AC_ARG_WITH([gtk2],
+        [AS_HELP_STRING([--with-gtk2], [Build the graphical tools.  Default=yes.])],
+        [try_with_gtk2=$withval],
+        [])
+AS_IF([test "x$try_with_gtk2" != "xno"],
+        [PKG_CHECK_MODULES(GTKMM, [gtkmm-2.4 >= 1.0.0],
+                [AC_DEFINE([HAVE_GTK2], [1], [we have gtk2])],
+                [try_with_gtk2=no
+                 AC_MSG_RESULT([Sorry, a usable version of gtkmm was not found. We will build without it.])])])
+AM_CONDITIONAL(WITH_GTK2, [test "x$try_with_gtk2" != "xno"])
 
 AC_CONFIG_HEADERS([src/acconfig.h])
 AC_CONFIG_FILES([Makefile

diff --git a/src/Makefile.am b/src/Makefile.am
index 437f54a28ad791e190e5ba083b5f320b1b3f533d..a00f2f7cfeabcb48dfd03c720bf054ff96479a38 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -824,7 +824,9 @@ noinst_HEADERS = \
        rgw/rgw_rest.h\
        rgw/rgw_common.h\
        rgw/rgw_user.h\
-       sample.ceph.conf
+       sample.ceph.conf\
+       tools/ceph.h\
+       tools/gui.h
 
 all_sources = $(cmon_SOURCES) $(ceph_SOURCES) $(cephfs_SOURCES) $(cauthtool_SOURCES) $(monmaptool_SOURCES) \
        $(crushtool_SOURCES) $(osdmaptool_SOURCES) $(cconf_SOURCES) $(mount_ceph_SOURCES) $(cmds_SOURCES) \