gnome-icon-theme r1795 - trunk
- From: dobey svn gnome org
- To: svn-commits-list gnome org
- Subject: gnome-icon-theme r1795 - trunk
- Date: Sun, 30 Mar 2008 20:02:42 +0100 (BST)
Author: dobey
Date: Sun Mar 30 20:02:42 2008
New Revision: 1795
URL: http://svn.gnome.org/viewvc/gnome-icon-theme?rev=1795&view=rev
Log:
2008-03-30 Rodney Dawes <dobey pwns gmail com>
* configure.in: Up version to 2.23.0 for development series
Add check to determine whether we are building a stable or dev build
Disable the use and requirement of icon-naming-utils for dev builds
Modified:
trunk/ChangeLog
trunk/configure.in
Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in (original)
+++ trunk/configure.in Sun Mar 30 20:02:42 2008
@@ -1,7 +1,7 @@
# Process this file with autoconf to produce a configure script.
AC_PREREQ(2.53)
-AC_INIT([gnome-icon-theme], [2.22.0],
+AC_INIT([gnome-icon-theme], [2.23.0],
[http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-icon-theme])
AC_CONFIG_SRCDIR(index.theme.in)
@@ -26,21 +26,30 @@
# Define the toplevel path here
AC_SUBST(themedir, "\${datadir}/icons/gnome")
-UTILS_REQUIRED=0.8.1
-
-AC_MSG_CHECKING([icon-naming-utils >= $UTILS_REQUIRED])
-PKG_CHECK_EXISTS(icon-naming-utils >= $UTILS_REQUIRED,
- 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"
- AC_SUBST(ICONMAP)
+ICONMAP="/bin/true"
+AC_MSG_CHECKING([development series build])
+DEVVERSION="`echo $PACKAGE_VERSION|cut -d. -f2`"
+if expr $DEVVERSION % 2 > /dev/null != "0"; then
AC_MSG_RESULT([yes])
else
AC_MSG_RESULT([no])
- AC_MSG_ERROR([icon-naming-utils >= $UTILS_REQUIRED is required to build
- and install gnome-icon-theme])
+
+ UTILS_REQUIRED=0.8.1
+
+ AC_MSG_CHECKING([icon-naming-utils >= $UTILS_REQUIRED])
+ PKG_CHECK_EXISTS(icon-naming-utils >= $UTILS_REQUIRED,
+ 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"
+ AC_MSG_RESULT([yes])
+ else
+ AC_MSG_RESULT([no])
+ AC_MSG_ERROR([icon-naming-utils >= $UTILS_REQUIRED is required to build
+ and install gnome-icon-theme])
+ fi
fi
+AC_SUBST(ICONMAP)
AC_CONFIG_FILES([
Makefile
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]