[nautilus-actions] Display a summary of configuration options

[Pierre Wieser <pwieser src gnome org>]

commit 4a9e47aaa18adefe141974bdcd7c84a3c092a47d
Author: Pierre Wieser <pwieser trychlos org>
Date:   Thu Dec 2 19:45:28 2010 +0100

    Display a summary of configuration options

 ChangeLog                |    8 ++++++++
 configure.ac             |   30 +++++++++++++++++++++++++++++-
 m4/na-enable-manuals.m4  |   10 ++++++++++
 m4/na-maintainer-mode.m4 |    3 +++
 m4/na-nautilus-extdir.m4 |    1 +
 5 files changed, 51 insertions(+), 1 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 63ef273..9cdda58 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2010-12-02 Pierre Wieser <pwieser trychlos org>
+
+	* configure.ac: Display a summary of configuration options.
+
+	* m4/na-enable-manuals.m4:
+	* m4/na-maintainer-mode.m4:
+	* m4/na-nautilus-extdir.m4: Define displayable variables.
+
 2010-12-01 Pierre Wieser <pwieser trychlos org>
 
 	* src/nact/nact-assistant-export.c
diff --git a/configure.ac b/configure.ac
index 0789147..75721c7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -159,7 +159,9 @@ PKG_CHECK_MODULES([NAUTILUS_ACTIONS], \
 )
 
 AC_SUBST([NAUTILUS_ACTIONS_CFLAGS])
+AC_DEFINE_UNQUOTED([NAUTILUS_ACTIONS_CFLAGS],["${NAUTILUS_ACTIONS_CFLAGS}"],[N-A compiler flags])
 AC_SUBST([NAUTILUS_ACTIONS_LIBS])
+AC_DEFINE_UNQUOTED([NAUTILUS_ACTIONS_LIBS],["${NAUTILUS_ACTIONS_LIBS}"],[N-A linker flags])
 
 # defines log domains when in maintainer mode
 NA_LOG_DOMAINS
@@ -168,7 +170,7 @@ NA_LOG_DOMAINS
 NA_ENABLE_MANUALS
 
 # add --with-default-io-provider option
-NA_SET_DEFAULT_IO_PROVIDER([desktop])
+NA_SET_DEFAULT_IO_PROVIDER([na-desktop])
 
 # when working in a test environment, nautilus extensions are typically
 # installed in a non-standard location ; lets specify them here
@@ -182,4 +184,30 @@ AC_DEFINE([NAUTILUS_ACTIONS_DEBUG],["NAUTILUS_ACTIONS_DEBUG"],[Debug environment
 AC_CHECK_LIB(nautilus-extension, nautilus_menu_item_new)
 AC_CHECK_FUNCS(nautilus_menu_provider_emit_items_updated_signal)
 
+# display and keep configuration informations
+config_options="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" 
+AC_DEFINE_UNQUOTED([NA_CONFIG_OPTIONS],["$0 ${config_options}"],["Configure options"])
+
 AC_OUTPUT
+
+if test "x${enable_schemas_install}" = "xno"; then
+	_ac_na_schemas_install="disabled"; else
+	_ac_na_schemas_install="enabled in ${GCONF_SCHEMA_FILE_DIR}"
+fi
+_ac_na_gtk_doc=`if test "x${enable_gtk_doc}" = "xno"; then echo disabled; else echo enabled; fi`
+$as_echo "
+	${PACKAGE_STRING} configuration summary:
+
+	Installation prefix             ${prefix}
+	Build system type               ${ac_cv_build}
+	Preprocessor flags              ${AM_CPPFLAGS}
+	Compiler flags                  ${AM_CFLAGS} ${NAUTILUS_ACTIONS_CFLAGS}
+	Linker flags                    ${NAUTILUS_ACTIONS_LIBS}
+	Nautilus extensions directory   ${ac_with_nact_nautilus_extdir}
+	Default I/O provider            ${with_default_io_provider}
+	GConf schemas installation      ${_ac_na_schemas_install}
+	Maintainer mode                 ${_ac_na_maintainer_mode}
+	Gtk documentation               ${_ac_na_gtk_doc}
+	HTML manuals generation         ${_ac_na_html_manuals}
+	PDF manuals generation          ${_ac_na_pdf_manuals}
+"
diff --git a/m4/na-enable-manuals.m4 b/m4/na-enable-manuals.m4
index b683ad6..2a061d1 100644
--- a/m4/na-enable-manuals.m4
+++ b/m4/na-enable-manuals.m4
@@ -65,6 +65,7 @@ AC_DEFUN([_AC_ARG_NA_ENABLE_HTML_MANUALS],[
 
 AC_DEFUN([_CHECK_FOR_HTML_MANUALS],[
 	AC_MSG_CHECKING([whether to build HTML manuals])
+	_ac_na_html_manuals="disabled"
 	if test "x${enable_html_manuals}" = "xno"; then
 		AC_MSG_RESULT([no])
 	else
@@ -86,6 +87,12 @@ AC_DEFUN([_CHECK_FOR_HTML_MANUALS],[
 		if test "x${with_gdt}" = "xno" -a "x${with_db2html}" = "xno"; then
 			AC_MSG_ERROR([neither gnome-doc-tool not db2html have been found, unable to generate HTML manuals])
 		fi
+		_ac_na_html_manuals="enabled with"
+		if test "x${with_gdt}" = "xno"; then
+			_ac_na_html_manuals="${_ac_na_html_manuals} db2html"
+		else
+			_ac_na_html_manuals="${_ac_na_html_manuals} gnome-doc-tool"
+		fi
 	fi
 
 	AC_SUBST([WITH_DB2HTML],[${with_db2html}])
@@ -106,14 +113,17 @@ AC_DEFUN([_AC_ARG_NA_ENABLE_PDF_MANUALS],[
 
 AC_DEFUN([_CHECK_FOR_PDF_MANUALS],[
 	AC_MSG_CHECKING([whether to build PDF manuals])
+	_ac_na_pdf_manuals="disabled"
 	if test "x${enable_pdf_manuals}" = "xno"; then
 		AC_MSG_RESULT([no])
 	else
 		AC_MSG_RESULT([yes])
 		if test "x${enable_pdf_manuals}" = "xyes"; then
 			AC_CHECK_PROG([with_dblatex],[dblatex],[yes],[no])
+			_ac_na_pdf_manuals="enabled with dblatex"
 		elif test "x${enable_pdf_manuals}" = "xdblatex"; then
 			AC_CHECK_PROG([with_dblatex],[dblatex],[yes],[no])
+			_ac_na_pdf_manuals="enabled with dblatex"
 		else
 			AC_MSG_ERROR([${enable_pdf_manuals} is not a known tool, must be 'dblatex'])
 		fi
diff --git a/m4/na-maintainer-mode.m4 b/m4/na-maintainer-mode.m4
index aa178ee..fc50048 100644
--- a/m4/na-maintainer-mode.m4
+++ b/m4/na-maintainer-mode.m4
@@ -31,9 +31,12 @@
 dnl define NA_MAINTAINER_MODE
 
 AC_DEFUN([NA_IS_MAINTAINER_MODE],[
+	_ac_na_maintainer_mode="disabled"
+
 	if test "${USE_MAINTAINER_MODE}" = "yes"; then
 		AC_DEFINE([NA_MAINTAINER_MODE],[1],[Define to 1 if we are in maintainer mode])
 		AC_SUBST([AM_CPPFLAGS],["${AM_CPPFLAGS} ${DISABLE_DEPRECATED} -DGSEAL_ENABLED"])
 		AC_SUBST([AM_CFLAGS],["${AM_CFLAGS} -Werror"])
+		_ac_na_maintainer_mode="enabled"
 	fi
 ])
diff --git a/m4/na-nautilus-extdir.m4 b/m4/na-nautilus-extdir.m4
index 9960fb1..b220fa0 100644
--- a/m4/na-nautilus-extdir.m4
+++ b/m4/na-nautilus-extdir.m4
@@ -39,6 +39,7 @@ AC_DEFUN([NA_NAUTILUS_EXTDIR],[
 	else
 		AC_MSG_NOTICE([installing plugin in ${ac_with_nact_nautilus_extdir}])
 		AC_SUBST([NAUTILUS_EXTENSIONS_DIR],[${ac_with_nact_nautilus_extdir}])
+		AC_DEFINE_UNQUOTED([NA_NAUTILUS_EXTENSIONS_DIR],[${ac_with_nact_nautilus_extdir}],[Nautilus extensions directory])
 	fi
 ])