2010-12-03 [mir] 3.7.7cvs10
authorMichael Rasmussen <mir@datanom.net>
Fri, 3 Dec 2010 00:03:23 +0000 (00:03 +0000)
committerMichael Rasmussen <mir@datanom.net>
Fri, 3 Dec 2010 00:03:23 +0000 (00:03 +0000)
* configure.ac
  Fix bug so that configure option --disable-manual
  actually disable building the manuals

ChangeLog
PATCHSETS
configure.ac

index 6f050ac1b54b187854cdb31425903f7ada9aa3db..0d2d215a5575cbeff5657bd74f3989a1bfbff011 100644 (file)
--- 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
index e9a35e6a29692f14cf6e3cee9c90e59a6e9ba2f7..d7973144dcddc15afd6a3849e95d7e872e023eaa 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
 ( 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
index d38d50e75a4fd45eb939f014a277a6a05d6fa223..6f76c34784f95ff7164b581e328476f881e6efdd 100644 (file)
@@ -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)