Merged trunk changes r9797:9829 into 217update branch.
diff -Nrup Nimbus-clean/configure.in Nimbus/configure.in
--- Nimbus-clean/configure.in 2006-09-20 17:49:14.419832000 +0200
+++ Nimbus/configure.in 2006-09-20 17:49:51.873019000 +0200
@@ -41,7 +41,7 @@ PKG_CHECK_EXISTS(icon-naming-utils >= $U
have_utils=yes, have_utils=no)
if test "x$have_utils" = "xyes"; then
UTILS_PATH="`$PKG_CONFIG --variable=program_path icon-naming-utils`"
- ICONMAP="$UTILS_PATH/icon-name-mapping"
+ ICONMAP="icon-name-mapping"
AC_SUBST(ICONMAP)
AC_MSG_RESULT([yes])
else