blob: 66eacb821e5e4d3a9904700e9914a2780bdf9558 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
|
--- a/configure.ac 2012-10-29 14:34:48.200093085 +0100
+++ b/configure.ac 2012-10-29 14:37:05.997077034 +0100
@@ -591,7 +591,7 @@
INCLUDE_DIRS="$INCLUDE_DIRS -I\$(top_builddir)/include/corosync -I\$(top_srcdir)/include/corosync"
# final build of *FLAGS
-CFLAGS="$ENV_CFLAGS $lt_prog_compiler_pic $SEC_FLAGS $OPT_CFLAGS $GDB_FLAGS \
+CFLAGS="$ENV_CFLAGS $lt_prog_compiler_pic $OS_CFLAGS \
$COVERAGE_CFLAGS $EXTRA_WARNINGS \
$WERROR_CFLAGS $NSS_CFLAGS $LIBQB_CFLAGS \
$SNMP_INCLUDES"
@@ -616,7 +616,10 @@
AM_CONDITIONAL(AUGTOOL, test -n "${AUGTOOL}")
AC_SUBST([NSS_LDFLAGS])
-AM_CONDITIONAL(BUILD_HTML_DOCS, test -n "${GROFF}")
+AC_ARG_ENABLE([doc],
+ AS_HELP_STRING([--enable-doc],[Build html documentation])
+)
+AM_CONDITIONAL(BUILD_HTML_DOCS, [test -n "${GROFF}" && test "x$enable_doc" = "xyes"] )
AC_SUBST([LINT_FLAGS])
--- a/Makefile.am 2012-10-29 14:34:48.200093085 +0100
+++ b/Makefile.am 2012-10-29 14:37:16.236853385 +0100
@@ -48,8 +48,6 @@
autoheader automake autoconf test_lense.sh \
autoscan.log configure.scan ltmain.sh
-dist_doc_DATA = LICENSE INSTALL README.recovery SECURITY TODO AUTHORS
-
SUBDIRS = include common_lib lib exec tools test cts pkgconfig \
man init conf qdevices
|
GitWeb
