diff options
| -rw-r--r-- | Makefile.am | 2 | ||||
| -rw-r--r-- | configure.ac | 9 | ||||
| -rw-r--r-- | tools/Makefile.am | 9 |
3 files changed, 18 insertions, 2 deletions
diff --git a/Makefile.am b/Makefile.am index 4ccc9a6..58123bb 100644 --- a/Makefile.am +++ b/Makefile.am @@ -12,7 +12,7 @@ endif ACLOCAL_AMFLAGS = -I m4 -DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc --disable-scrollkeeper +DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc --disable-scrollkeeper --enable-mpaste if MATE_ABOUT_ENABLED versiondir = $(datadir)/mate-about diff --git a/configure.ac b/configure.ac index 6a731e7..abff60a 100644 --- a/configure.ac +++ b/configure.ac @@ -92,6 +92,14 @@ AC_ARG_ENABLE([mate-conf-import], [enable_mate_conf_import=yes],[enable_mate_conf_import=no]) AM_CONDITIONAL(MATE_CONF_IMPORT_ENABLED, test "x$enable_mate_conf_import" = "xyes") + +# Install tool to paste text to paste.mate-desktop.org +AC_ARG_ENABLE([mpaste], + [AS_HELP_STRING([--enable-mpaste],[install mpaste tool])], + [enable_mpaste=yes],[enable_mpaste=no]) +AM_CONDITIONAL(MPASTE_ENABLED, test "x$enable_mpaste" = "xyes") + + # Path to the pnp.ids file -- to know if we use one shipped with another # package, or an internal file @@ -360,6 +368,7 @@ mate-desktop $VERSION `echo mate-desktop $VERSION | sed "s/./=/g"` Build desktop-wide docs: ${enable_desktop_docs} 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} Startup notification support: ${have_startup_notification} XRandr support: ${have_randr} diff --git a/tools/Makefile.am b/tools/Makefile.am index 8056dad..ccce500 100644 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -9,6 +9,13 @@ desktop_DATA = $(desktop_in_files:.desktop.in=.desktop) bin_SCRIPTS += mate-conf-import endif -EXTRA_DIST = mate-gsettings-toggle mate-conf-import +if MPASTE_ENABLED +bin_SCRIPTS += mpaste +endif + +EXTRA_DIST = \ + mate-conf-import \ + mate-gsettings-toggle \ + mpaste CLEANFILES = mate-conf-import.desktop mate-conf-import.desktop.in |