diff options
| author | Clement Lefebvre <[email protected]> | 2015-09-18 10:36:01 +0100 |
|---|---|---|
| committer | Clement Lefebvre <[email protected]> | 2015-09-18 10:36:01 +0100 |
| commit | 5ca874a34650d3f9b44dcbd00eb219a9bf04a394 (patch) | |
| tree | b8c4e108e5e65c0df74a8391b7adb5e5b5acc1e7 /configure.ac | |
| parent | 57886d7a447ed010762879259beb97e81c0284ea (diff) | |
| parent | ca724d9f8493639ef51e108fb0b8bef499207ffa (diff) | |
| download | mate-desktop-5ca874a34650d3f9b44dcbd00eb219a9bf04a394.tar.bz2 mate-desktop-5ca874a34650d3f9b44dcbd00eb219a9bf04a394.tar.xz | |
Merge branch 'master' of https://github.com/clefebvre/mate-desktop into clefebvre-master
Conflicts:
configure.ac
user-guide/mate-user-guide.desktop.in.in
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/configure.ac b/configure.ac index 05ad090..89bb457 100644 --- a/configure.ac +++ b/configure.ac @@ -92,14 +92,6 @@ AC_ARG_ENABLE([mate-about], AM_CONDITIONAL(MATE_ABOUT_ENABLED, test "x$enable_mate_about" = "xyes") -# Should we build the docbook user-guide? Will be useful until -# the new mallard mate-user-guide is complete and translated -AC_ARG_ENABLE([user-guide], - [AS_HELP_STRING([--disable-user-guide],[do not build user guide])],, - [enable_user_guide=yes]) -AM_CONDITIONAL(USER_GUIDE_ENABLED, test "x$enable_user_guide" = "xyes") - - # Install tool to migrate 1.4 MateConf settings AC_ARG_ENABLE([mate-conf-import], [AS_HELP_STRING([--enable-mate-conf-import],[install mate-conf-import tool])],, @@ -331,8 +323,6 @@ man/Makefile tools/mate-color-select.desktop.in tools/mate-conf-import.desktop.in tools/Makefile -user-guide/Makefile -user-guide/mate-user-guide.desktop.in icons/Makefile ]) @@ -362,7 +352,6 @@ mate-desktop $VERSION Gtk+ version: ${GTK_API_VERSION} Build mate-about: ${enable_mate_about} - Build user guide: ${enable_user_guide} Install mate-conf-import: ${enable_mate_conf_import} Install mpaste: ${enable_mpaste} Use external pnp.ids: ${EXTERNAL_PNP_IDS} |