From: Arun Persaud <arun@nubati.net>
Date: Thu, 23 Feb 2012 07:19:04 +0000 (-0800)
Subject: Merge branch 'master' into v4.6.x
X-Git-Url: http://winboard.nl/cgi-bin?a=commitdiff_plain;h=2d0fb98e10ba964a18ff63ea67f5abd04c6df585;hp=-c;p=xboard.git

Merge branch 'master' into v4.6.x

Conflicts:
	po/da.po
	po/uk.po

used version from master
---

2d0fb98e10ba964a18ff63ea67f5abd04c6df585
diff --combined configure.ac
index dd816e5,21b46aa..4f35fee
--- a/configure.ac
+++ b/configure.ac
@@@ -28,7 -28,7 +28,7 @@@ dnl| to regenerate configure.  Then sub
  dnl| the standard version of xboard.
  
  dnl| define second argument as VERSION.PATCHLEVEL. e.g. 4.4.0j
 -AC_INIT([xboard],[master-20120212],[bug-xboard@gnu.org])
 +AC_INIT([xboard],[4.6.0.20120212],[bug-xboard@gnu.org])
  
  dnl| need this to be able to compile some files in a subdir (filebrowser)
  AM_INIT_AUTOMAKE([subdir-objects])
@@@ -416,7 -416,24 +416,24 @@@ X_LIBS="$X_PRE_LIBS $X_LIBS $X_EXTRA_LI
  AC_SUBST(X_CFLAGS)
  AC_SUBST(X_LIBS)
  
+ dnl | should we install desktop icons and mime associations?
+ AC_ARG_ENABLE(	[update-mimedb],
+ 		[AS_HELP_STRING([--disable-update-mimedb],[disable the update-mime-database after install [default=no]])],
+ 		[enable_mimedb="no"],
+ 		[enable_mimedb="yes"])
+ 
+ AM_CONDITIONAL(ENABLE_UPDATE_MIMEDB, test x"$enable_mimedb" = "xyes")
+ 
+ if test x"$enable_mimedb" = "xyes"; then
+    AC_PATH_PROG([XDG_MIME],[xdg-mime])
+    AC_SUBST(XDG_MIME)
+    AC_PATH_PROG([XDG_DESKTOP_MENU],[xdg-desktop-menu])
+    AC_SUBST(XDG_DESKTOP_MENU)
+    AC_PATH_PROG([XDG_ICON_RESOURCE],[xdg-icon-resource])
+    AC_SUBST(XDG_ICON_RESOURCE)
+ fi
  
+ dnl |  output Makefile
  AC_CONFIG_FILES([Makefile cmail po/Makefile.in])
  AC_CONFIG_COMMANDS([test-stamp-h],[test -z "$CONFIG_HEADERS" || date > stamp-h])
  AC_CONFIG_COMMANDS([chmod-cmail],[chmod 755 cmail])
@@@ -435,6 -452,8 +452,8 @@@ echo 
  echo "        infodir:         $infodir   (info files will go here)"
  echo "        sysconfdir:      $sysconfdir   (xboard.conf will go here)"
  echo ""
+ echo "        update mimedb:   $enable_mimedb"
+ echo ""
  echo "        NLS support:     $USE_NLS"
  echo ""
  echo "        Xaw3d:           $with_Xaw3d"