[Monodevelop-patches-list] r1957 - trunk/MonoDevelop/Core

[commit-watcher at mono-cvs.ximian.com]

Author: tberman
Date: 2004-09-20 21:20:39 -0400 (Mon, 20 Sep 2004)
New Revision: 1957

Modified:
   trunk/MonoDevelop/Core/ChangeLog
   trunk/MonoDevelop/Core/Makefile.am
   trunk/MonoDevelop/Core/configure.in
Log:
patch from Tim Gerla, closes bug #62286


Modified: trunk/MonoDevelop/Core/ChangeLog
===================================================================
--- trunk/MonoDevelop/Core/ChangeLog	2004-09-20 03:02:00 UTC (rev 1956)
+++ trunk/MonoDevelop/Core/ChangeLog	2004-09-21 01:20:39 UTC (rev 1957)
@@ -1,3 +1,9 @@
+2004-09-20  Tim Gerla  <tim at gerla.net>
+
+	* configure.in:
+	* Makefile.am: add --disable-update-mimedb to disable calling
+		       update-mime-database on install. 
+
 2004-09-19  Enver ALTIN  <ealtin at parkyeri.com>
 
 	* configure.in: Added Turkish to ALL_LINGUAS.

Modified: trunk/MonoDevelop/Core/Makefile.am
===================================================================
--- trunk/MonoDevelop/Core/Makefile.am	2004-09-20 03:02:00 UTC (rev 1956)
+++ trunk/MonoDevelop/Core/Makefile.am	2004-09-21 01:20:39 UTC (rev 1957)
@@ -21,11 +21,14 @@
 xdgmime_DATA = monodevelop.xml
 
 install-data-hook:
+if ENABLE_UPDATE_MIMEDB
 	update-mime-database $(gnome_data)/mime
+endif
 
 uninstall-hook:
+if ENABLE_UPDATE_MIMEDB
 	update-mime-database $(gnome_data)/mime
-
+endif
 else
 
 install-data-hook:

Modified: trunk/MonoDevelop/Core/configure.in
===================================================================
--- trunk/MonoDevelop/Core/configure.in	2004-09-20 03:02:00 UTC (rev 1956)
+++ trunk/MonoDevelop/Core/configure.in	2004-09-21 01:20:39 UTC (rev 1957)
@@ -119,6 +119,13 @@
 AM_CONDITIONAL(ENABLE_DEBUGGER, test "x$enable_debugger" = "xyes")
 AM_CONDITIONAL(ENABLE_XDGMIME, test "x$enable_xdgmime" = "xyes")
 
+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)
+
+
 dnl Intl
 ALL_LINGUAS="da es fr ja_JP pt_BR tr"
 GETTEXT_PACKAGE=monodevelop