2010-10-02 [mir] 3.7.6cvs49
* configure.ac * manual/de/dist/html/Makefile.am * manual/de/dist/pdf/Makefile.am * manual/de/dist/ps/Makefile.am * manual/de/dist/txt/Makefile.am * manual/dist/html/Makefile.am * manual/dist/pdf/Makefile.am * manual/dist/ps/Makefile.am * manual/dist/txt/Makefile.am * manual/es/dist/html/Makefile.am * manual/es/dist/pdf/Makefile.am * manual/es/dist/ps/Makefile.am * manual/es/dist/txt/Makefile.am * manual/fr/dist/html/Makefile.am * manual/fr/dist/pdf/Makefile.am * manual/fr/dist/ps/Makefile.am * manual/fr/dist/txt/Makefile.am * manual/pl/dist/html/Makefile.am * manual/pl/dist/pdf/Makefile.am * manual/pl/dist/ps/Makefile.am * manual/pl/dist/txt/Makefile.am 1) Downgrade autoconf requirements to 2.59 to allow building on oldest supported Linux distributions. 2) Only try to build manuals if the needed software is present.
This commit is contained in:
Michael Rasmussen
parent
74b96dc15b
commit
78232bbde2
28
ChangeLog
28
ChangeLog
|
|
@ -1,3 +1,31 @@
|
|||
2010-10-02 [mir] 3.7.6cvs49
|
||||
|
||||
* configure.ac
|
||||
* manual/de/dist/html/Makefile.am
|
||||
* manual/de/dist/pdf/Makefile.am
|
||||
* manual/de/dist/ps/Makefile.am
|
||||
* manual/de/dist/txt/Makefile.am
|
||||
* manual/dist/html/Makefile.am
|
||||
* manual/dist/pdf/Makefile.am
|
||||
* manual/dist/ps/Makefile.am
|
||||
* manual/dist/txt/Makefile.am
|
||||
* manual/es/dist/html/Makefile.am
|
||||
* manual/es/dist/pdf/Makefile.am
|
||||
* manual/es/dist/ps/Makefile.am
|
||||
* manual/es/dist/txt/Makefile.am
|
||||
* manual/fr/dist/html/Makefile.am
|
||||
* manual/fr/dist/pdf/Makefile.am
|
||||
* manual/fr/dist/ps/Makefile.am
|
||||
* manual/fr/dist/txt/Makefile.am
|
||||
* manual/pl/dist/html/Makefile.am
|
||||
* manual/pl/dist/pdf/Makefile.am
|
||||
* manual/pl/dist/ps/Makefile.am
|
||||
* manual/pl/dist/txt/Makefile.am
|
||||
1) Downgrade autoconf requirements to 2.59 to allow
|
||||
building on oldest supported Linux distributions.
|
||||
2) Only try to build manuals if the needed software
|
||||
is present.
|
||||
|
||||
2010-10-02 [colin] 3.7.6cvs48
|
||||
|
||||
* src/plugins/trayicon/trayicon.c
|
||||
|
|
|
|||
|
|
@ -4044,3 +4044,4 @@
|
|||
( cvs diff -u -r 1.654.2.4114 -r 1.654.2.4115 configure.ac; ) > 3.7.6cvs46.patchset
|
||||
( cvs diff -u -r 1.14.2.72 -r 1.14.2.73 src/plugins/trayicon/trayicon.c; ) > 3.7.6cvs47.patchset
|
||||
( cvs diff -u -r 1.14.2.73 -r 1.14.2.74 src/plugins/trayicon/trayicon.c; ) > 3.7.6cvs48.patchset
|
||||
( cvs diff -u -r 1.654.2.4117 -r 1.654.2.4118 configure.ac; cvs diff -u -r 1.1.2.1 -r 1.1.2.2 manual/de/dist/html/Makefile.am; cvs diff -u -r 1.1.2.1 -r 1.1.2.2 manual/de/dist/pdf/Makefile.am; cvs diff -u -r 1.1.2.1 -r 1.1.2.2 manual/de/dist/ps/Makefile.am; cvs diff -u -r 1.1.2.1 -r 1.1.2.2 manual/de/dist/txt/Makefile.am; cvs diff -u -r 1.1.2.5 -r 1.1.2.6 manual/dist/html/Makefile.am; cvs diff -u -r 1.1.2.6 -r 1.1.2.7 manual/dist/pdf/Makefile.am; cvs diff -u -r 1.1.2.5 -r 1.1.2.6 manual/dist/ps/Makefile.am; cvs diff -u -r 1.1.2.5 -r 1.1.2.6 manual/dist/txt/Makefile.am; cvs diff -u -r 1.1.2.2 -r 1.1.2.3 manual/es/dist/html/Makefile.am; cvs diff -u -r 1.1.2.2 -r 1.1.2.3 manual/es/dist/pdf/Makefile.am; cvs diff -u -r 1.1.2.2 -r 1.1.2.3 manual/es/dist/ps/Makefile.am; cvs diff -u -r 1.1.2.2 -r 1.1.2.3 manual/es/dist/txt/Makefile.am; cvs diff -u -r 1.1.2.3 -r 1.1.2.4 manual/fr/dist/html/Makefile.am; cvs diff -u -r 1.1.2.4 -r 1.1.2.5 manual/fr/dist/pdf/Makefile.am; cvs diff -u -r 1.1.2.3 -r 1.1.2.4 manual/fr/dist/ps/Makefile.am; cvs diff -u -r 1.1.2.3 -r 1.1.2.4 manual/fr/dist/txt/Makefile.am; cvs diff -u -r 1.1.2.3 -r 1.1.2.4 manual/pl/dist/html/Makefile.am; cvs diff -u -r 1.1.2.4 -r 1.1.2.5 manual/pl/dist/pdf/Makefile.am; cvs diff -u -r 1.1.2.3 -r 1.1.2.4 manual/pl/dist/ps/Makefile.am; cvs diff -u -r 1.1.2.3 -r 1.1.2.4 manual/pl/dist/txt/Makefile.am; ) > 3.7.6cvs49.patchset
|
||||
|
|
|
|||
48
configure.ac
48
configure.ac
|
|
@ -1,5 +1,5 @@
|
|||
|
||||
AC_PREREQ(2.60)
|
||||
AC_PREREQ(2.59)
|
||||
AC_INIT(src/main.c)
|
||||
AC_CONFIG_AUX_DIR(config)
|
||||
AC_CONFIG_MACRO_DIR([m4])
|
||||
|
|
@ -12,7 +12,7 @@ MINOR_VERSION=7
|
|||
MICRO_VERSION=6
|
||||
INTERFACE_AGE=0
|
||||
BINARY_AGE=0
|
||||
EXTRA_VERSION=48
|
||||
EXTRA_VERSION=49
|
||||
EXTRA_RELEASE=
|
||||
EXTRA_GTK2_VERSION=
|
||||
|
||||
|
|
@ -208,6 +208,50 @@ AC_ARG_ENABLE(manual,
|
|||
[ --disable-manual do not build manual],
|
||||
[ac_cv_enable_manual=$enableval], [ac_cv_enable_manual=yes])
|
||||
|
||||
dnl ******************************
|
||||
dnl ** Check for required tools **
|
||||
dnl ** to build manuals **
|
||||
dnl ******************************
|
||||
SAXON=`which saxon 2> /dev/null`
|
||||
if test $? -ne 0; then
|
||||
SAXON=
|
||||
fi
|
||||
if test -z "$SAXON"; then
|
||||
SAXONJAR='/usr/share/java/saxon.jar'
|
||||
if test ! -f "$SAXONJAR"; then
|
||||
SAXONJAR='/usr/local/share/java/saxon.jar'
|
||||
if test ! -f "$SAXONJAR"; then
|
||||
SAXONJAR=
|
||||
fi
|
||||
fi
|
||||
fi
|
||||
AM_CONDITIONAL(MANUAL_PDF, test -n "$SAXON" -o -n "$SAXONJAR")
|
||||
|
||||
DOCBOOK2TXT=`which docbook2txt 2> /dev/null`
|
||||
if test $? -ne 0; then
|
||||
DOCBOOK2TXT=
|
||||
fi
|
||||
AM_CONDITIONAL(MANUAL_TXT, test -n "$DOCBOOK2TXT")
|
||||
|
||||
DOCBOOK2HTML=`which docbook2html 2> /dev/null`
|
||||
if test $? -ne 0; then
|
||||
DOCBOOK2HTML=
|
||||
fi
|
||||
AM_CONDITIONAL(MANUAL_HTML, test -n "$DOCBOOK2HTML")
|
||||
|
||||
DOCBOOK2PS=`which docbook2ps 2> /dev/null`
|
||||
if test $? -ne 0; then
|
||||
DOCBOOK2PS=
|
||||
fi
|
||||
AM_CONDITIONAL(MANUAL_PS, test -n "$DOCBOOK2PS")
|
||||
|
||||
if test -n "$DOCBOOK2TXT" -o -n "$DOCBOOK2HTML" -o -n "$DOCBOOK2PS" \
|
||||
-o -n "$SAXON" -o -n "$SAXONJAR"; then
|
||||
ac_cv_enable_manual="yes"
|
||||
else
|
||||
ac_cv_enable_manual="no"
|
||||
fi
|
||||
|
||||
AM_CONDITIONAL(BUILD_MANUAL, test x"$ac_cv_enable_manual" = xyes)
|
||||
|
||||
dnl Set PACKAGE_DATA_DIR in config.h.
|
||||
|
|
|
|||
Loading…
Reference in a new issue