dnrops
/
gimp
mirror of https://github.com/GNOME/gimp.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

check for gtk-doc.m4, depend on intltool > 0.31. 

2004-12-17  Sven Neumann  <sven@gimp.org>

	* autogen.sh: check for gtk-doc.m4, depend on intltool > 0.31.
This commit is contained in:
Sven Neumann 2004-12-17 16:29:27 +00:00 committed by Sven Neumann
parent a493f0dea2
commit c9ee12aeec
3 changed files with 7 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -1,3 +1,7 @@
2004-12-17 Sven Neumann <sven@gimp.org>
* autogen.sh: check for gtk-doc.m4, depend on intltool > 0.31.
2004-12-17 Sven Neumann <sven@gimp.org> 2004-12-17 Sven Neumann <sven@gimp.org>
* app/tools/gimpmovetool.c (gimp_move_tool_cursor_update): don't * app/tools/gimpmovetool.c (gimp_move_tool_cursor_update): don't

2
HACKING
View File

@ -16,7 +16,7 @@ Beta software can be found at alpha.gnu.org.
* pkg-config 0.7.0 (or preferably a newer version) * pkg-config 0.7.0 (or preferably a newer version)
- http://www.freedesktop.org/software/pkgconfig/ - http://www.freedesktop.org/software/pkgconfig/
* intltoolize 0.17 (or preferably a newer version) * intltoolize 0.31.1 (or preferably a newer version)
- ftp://ftp.gnome.org/pub/gnome/sources/intltool/ - ftp://ftp.gnome.org/pub/gnome/sources/intltool/
* gtkdocize * gtkdocize

34
autogen.sh
View File

@ -19,7 +19,7 @@ LIBTOOL_WIN32=1.5
AUTOCONF_REQUIRED_VERSION=2.54 AUTOCONF_REQUIRED_VERSION=2.54
AUTOMAKE_REQUIRED_VERSION=1.6 AUTOMAKE_REQUIRED_VERSION=1.6
GLIB_REQUIRED_VERSION=2.2.0 GLIB_REQUIRED_VERSION=2.2.0
INTLTOOL_REQUIRED_VERSION=0.17 INTLTOOL_REQUIRED_VERSION=0.31
srcdir=`dirname $0` srcdir=`dirname $0`
@ -165,36 +165,6 @@ else
DIE=1 DIE=1
fi fi
# Special test for problematic versions of intltool. Details at:
# http://bugzilla.gnome.org/show_bug.cgi?id=137502
# Print a warning message, but do not exit.
INTLTOOL_BUG_MIN_VERSION=0.28
INTLTOOL_BUG_MAX_VERSION=0.31
echo -n "checking for intltool < $INTLTOOL_BUG_MIN_VERSION or > $INTLTOOL_BUG_MAX_VERSION ... "
if (intltoolize --version) < /dev/null > /dev/null 2>&1; then
VER=`intltoolize --version \
| grep intltoolize | sed "s/.* \([0-9.]*\)/\1/"`
if expr $VER \>= $INTLTOOL_BUG_MIN_VERSION > /dev/null; then
if expr $VER \<= $INTLTOOL_BUG_MAX_VERSION > /dev/null; then
echo "no"
echo
echo " Versions of intltool between 0.28 and 0.31 are known to"
echo " generate incorrect XML output when processing gimp-tips.xml."
echo " Please consider updating to a more recent version."
echo
echo " This problem is not harmless, but you may continue to build."
echo " Please don't package the result of this build though."
echo
else
echo "yes"
fi
else
echo "yes"
fi
else
echo "not found"
fi
echo -n "checking for xsltproc ... " echo -n "checking for xsltproc ... "
if (xsltproc --version) < /dev/null > /dev/null 2>&1; then if (xsltproc --version) < /dev/null > /dev/null 2>&1; then
@ -241,7 +211,7 @@ fi
if test -z "$ACLOCAL_FLAGS"; then if test -z "$ACLOCAL_FLAGS"; then
acdir=`$ACLOCAL --print-ac-dir` acdir=`$ACLOCAL --print-ac-dir`
m4list="glib-2.0.m4 glib-gettext.m4 gtk-2.0.m4 intltool.m4 pkg.m4" m4list="glib-2.0.m4 glib-gettext.m4 gtk-doc.m4 gtk-2.0.m4 intltool.m4 pkg.m4"
for file in $m4list for file in $m4list
do do