gnome-icon-theme r1825 - trunk

[dobey svn gnome org]

Author: dobey
Date: Sun Jun 15 14:43:53 2008
New Revision: 1825
URL: http://svn.gnome.org/viewvc/gnome-icon-theme?rev=1825&view=rev

Log:
2008-06-15  Rodney Dawes  <dobey pwns gmail com>

	* Makefile.am:
	Remove the intltool scripts bits, as new intltool uses installed copies

	* configure.in:
	Up the intltool requirement to 0.40.0
	Update the devel version check and add an --enable-icon-mapping
	argument to configure for forcing the use of symlinks for packagers



Modified:
   trunk/ChangeLog
   trunk/Makefile.am
   trunk/configure.in

Modified: trunk/Makefile.am
==============================================================================
--- trunk/Makefile.am	(original)
+++ trunk/Makefile.am	Sun Jun 15 14:43:53 2008
@@ -11,9 +11,6 @@
 
 EXTRA_DIST=				\
 	index.theme.in 			\
-	intltool-update.in 		\
-	intltool-merge.in 		\
-	intltool-extract.in		\
 	gnome-icon-theme.pc.in		\
 	mkinstalldirs
 
@@ -25,19 +22,11 @@
 CLEANFILES = 				\
 	index.theme
 
-DISTCLEANFILES = 			\
-	intltool-extract		\
-	intltool-merge			\
-	intltool-update
-
 MAINTAINERCLEANFILES =			\
 	Makefile.in			\
 	aclocal.m4			\
 	configure			\
 	install-sh			\
-	intltool-extract.in		\
-	intltool-merge.in		\
-	intltool-update.in		\
 	missing				\
 	mkinstalldirs
 

Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in	(original)
+++ trunk/configure.in	Sun Jun 15 14:43:53 2008
@@ -7,7 +7,7 @@
 
 AM_INIT_AUTOMAKE([1.9 tar-ustar])
 
-IT_PROG_INTLTOOL([0.35.0])
+IT_PROG_INTLTOOL([0.40.0])
 PKG_PROG_PKG_CONFIG([0.19])
 
 GETTEXT_PACKAGE="${PACKAGE}"
@@ -26,14 +26,24 @@
 # Define the toplevel path here
 AC_SUBST(themedir, "\${datadir}/icons/gnome")
 
-ICONMAP="true"
 AC_MSG_CHECKING([development series build])
 DEVVERSION="`echo $PACKAGE_VERSION|cut -d. -f2`"
 if expr $DEVVERSION % 2 > /dev/null != "0"; then
+   mapenable=no
    AC_MSG_RESULT([yes])
 else
+   mapenable=yes
    AC_MSG_RESULT([no])
+fi
 
+AC_ARG_ENABLE([icon-mapping],
+	AC_HELP_STRING([--enable-icon-mapping],
+			[Enable compatibility symlinks [default=$mapenable]]),
+	enable_mapping=$enableval,
+	enable_mapping=$mapenable)
+
+ICONMAP="true"
+if test "x$enable_mapping" != "xno"; then
    UTILS_REQUIRED=0.8.7
 
    AC_MSG_CHECKING([icon-naming-utils >= $UTILS_REQUIRED])