diff -NurdB glabels-2.0.3/configure.in glabels-2.0.3-patched/configure.in --- glabels-2.0.3/configure.in 2005-06-19 19:25:27.000000000 -0500 +++ glabels-2.0.3-patched/configure.in 2005-07-02 21:28:24.000000000 -0500 @@ -73,7 +73,7 @@ AC_SUBST(LIBGNOMEPRINTUI_REQUIRED) AC_SUBST(LIBGNOMECANVAS_REQUIRED) AC_SUBST(LIBGLADE_REQUIRED) - + dnl --------------------------------------------------------------------------- dnl - GLABELS prerequisites @@ -126,6 +126,16 @@ AC_PATH_PROG(UPDATE_DESKTOP_DATABASE, update-desktop-database, no) AM_CONDITIONAL(HAVE_NEWER_MIME, test x$UPDATE_DESKTOP_DATABASE != xno) +AC_ARG_ENABLE(update-mimedb, AC_HELP_STRING([--disable-update-mimedb], + [disable the update-mime-database after install [default=no]]),, + enable_update_mimedb=yes) +AM_CONDITIONAL(ENABLE_UPDATE_MIMEDB, test x$enable_update_mimedb = xyes) + +AC_ARG_ENABLE(update-desktopdb, AC_HELP_STRING([--disable-update-desktopdb], + [disable the update-desktop-database after install [default=no]]),, + enable_update_desktopdb=yes) +AM_CONDITIONAL(ENABLE_UPDATE_DESKTOPDB, test x$enable_update_desktopdb = xyes) + dnl --------------------------------------------------------------------------- dnl - Supported languages diff -NurdB glabels-2.0.3/data/mime/Makefile.am glabels-2.0.3-patched/data/mime/Makefile.am --- glabels-2.0.3/data/mime/Makefile.am 2004-08-09 09:46:23.000000000 -0500 +++ glabels-2.0.3-patched/data/mime/Makefile.am 2005-07-02 21:28:17.000000000 -0500 @@ -28,18 +28,26 @@ install-data-hook: +if ENABLE_UPDATE_MIMEDB if HAVE_NEW_MIME $(UPDATE_MIME_DATABASE) "$(DESTDIR)$(datadir)/mime" endif +endif +if ENABLE_UPDATE_DESKTOPDB if HAVE_NEWER_MIME $(UPDATE_DESKTOP_DATABASE) endif +endif uninstall-hook: +if ENABLE_UPDATE_MIMEDB if HAVE_NEW_MIME $(UPDATE_MIME_DATABASE) "$(DESTDIR)$(datadir)/mime" endif +endif +if ENABLE_UPDATE_DESKTOPDB if HAVE_NEWER_MIME $(UPDATE_DESKTOP_DATABASE) endif +endif