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

also look for automake-1.10. 

2007-05-21  Sven Neumann  <sven@gimp.org>

	* autogen.sh: also look for automake-1.10.


svn path=/trunk/; revision=22553
This commit is contained in:
Sven Neumann 2007-05-21 16:54:31 +00:00 committed by Sven Neumann
parent 9b369d8f6b
commit 4e2a8c5a9b
4 changed files with 19 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -1,3 +1,7 @@
2007-05-21 Sven Neumann <sven@gimp.org>
* autogen.sh: also look for automake-1.10.
2007-05-21 Sven Neumann <sven@gimp.org>
* app/core/gimp.c (gimp_message): documentation.

3
autogen.sh
View File

@ -160,6 +160,9 @@ echo -n "checking for automake >= $AUTOMAKE_REQUIRED_VERSION ... "
if ($AUTOMAKE --version) < /dev/null > /dev/null 2>&1; then
AUTOMAKE=$AUTOMAKE
ACLOCAL=$ACLOCAL
elif (automake-1.10 --version) < /dev/null > /dev/null 2>&1; then
AUTOMAKE=automake-1.10
ACLOCAL=aclocal-1.10
elif (automake-1.9 --version) < /dev/null > /dev/null 2>&1; then
AUTOMAKE=automake-1.9
ACLOCAL=aclocal-1.9

2
devel-docs/ChangeLog
View File

@ -1,7 +1,7 @@
2007-05-21 Sven Neumann <sven@gimp.org>
* app/Makefile.am: do nothing unless configured with
--enable-gtk-doc-app.
--enable-gtk-doc-app. Removed dist-hook override.
2007-05-14 Sven Neumann <sven@gimp.org>

19
devel-docs/app/Makefile.am
View File

@ -1,7 +1,5 @@
## Process this file with automake to produce Makefile.in
if ENABLE_GTK_DOC_APP
# The name of the module.
DOC_MODULE = app
@ -110,15 +108,20 @@ GTKDOC_LIBS = \
$(INTLLIBS)
if ENABLE_GTK_DOC_APP
include $(top_srcdir)/gtk-doc.make
else
EXTRA_DIST = \
$(DOC_MODULE)-docs.sgml \
$(DOC_MODULE)-overrides.txt \
$(DOC_MODULE)-sections.txt
endif
# Other files to distribute
EXTRA_DIST += \
$(DOC_MODULE).types \
version.in
endif
# Override dist-hook as we don't want to distribute generated files
dist-hook:
@true