commit 52e23bca42ece8dc82c379c7e2e2a725dd491ce2
parent 7f3a624fbdf7fddab2e9a669841267905d03ff0f
Author: Michael Rasmussen <mir@datanom.net>
Date: Fri, 3 Dec 2010 00:03:23 +0000
2010-12-03 [mir] 3.7.7cvs10
* configure.ac
Fix bug so that configure option --disable-manual
actually disable building the manuals
Diffstat:
3 files changed, 16 insertions(+), 7 deletions(-)
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,9 @@
+2010-12-03 [mir] 3.7.7cvs10
+
+ * configure.ac
+ Fix bug so that configure option --disable-manual
+ actually disable building the manuals
+
2010-12-01 [pawel] 3.7.7cvs9
* src/crash.c
diff --git a/PATCHSETS b/PATCHSETS
@@ -4071,3 +4071,4 @@
( cvs diff -u -r 1.1.2.98 -r 1.1.2.99 src/gtk/quicksearch.c; ) > 3.7.7cvs7.patchset
( cvs diff -u -r 1.12.2.62 -r 1.12.2.63 src/action.c; ) > 3.7.7cvs8.patchset
( cvs diff -u -r 1.23.2.34 -r 1.23.2.35 src/crash.c; ) > 3.7.7cvs9.patchset
+( cvs diff -u -r 1.654.2.4145 -r 1.654.2.4146 configure.ac; ) > 3.7.7cvs10.patchset
diff --git a/configure.ac b/configure.ac
@@ -12,7 +12,7 @@ MINOR_VERSION=7
MICRO_VERSION=7
INTERFACE_AGE=0
BINARY_AGE=0
-EXTRA_VERSION=9
+EXTRA_VERSION=10
EXTRA_RELEASE=
EXTRA_GTK2_VERSION=
@@ -156,7 +156,7 @@ fi
CFLAGS="$CFLAGS -Wall"
if test $USE_MAINTAINER_MODE = yes; then
- CFLAGS="$CFLAGS -DGTK_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DG_DISABLE_DEPRECATED -DGTK_DISABLE_SINGLE_INCLUDES"
+ CFLAGS="-g -Wall -DGTK_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DG_DISABLE_DEPRECATED -DGTK_DISABLE_SINGLE_INCLUDES"
fi
pthread_name=
@@ -245,11 +245,13 @@ if test $? -ne 0; then
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"
+if test x"$ac_cv_enable_manual" = x"yes"; then
+ 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
fi
AM_CONDITIONAL(BUILD_MANUAL, test x"$ac_cv_enable_manual" = xyes)
