build: fix ./configure --disable-dtd-validation
authorPekka Paalanen <pekka.paalanen@collabora.co.uk>
Mon, 29 Feb 2016 12:59:51 +0000 (14:59 +0200)
committerBryce Harrington <bryce@osg.samsung.com>
Mon, 29 Feb 2016 23:32:35 +0000 (15:32 -0800)
commit4a41d26c4d0f4775f3a013a41a32ac1512a0a177
tree18e8ff0b4043e8ff7570aec21d94d94fc2a206f1
parent564623653a146ba74714bcf3569d8082a2afd3f0
build: fix ./configure --disable-dtd-validation

When configured with --disable-dtd-validation:

  CPPAS    src/dtddata.o
src/dtddata.S: Assembler messages:
src/dtddata.S:39: Error: file not found: src/wayland.dtd.embed
Makefile:1520: recipe for target 'src/dtddata.o' failed

This is because the variable name used does not match the implicit
variable name in autoconf.

Fix the variable name, making both --disable-dtd-validation and
--enable-dtd-validation to what they should.

Do not try to build dtddata.S if dtd-validation is disabled. It depends
on wayland.dtd.embed which is created by configure only if
dtd-validation is enabled.

If not building dtddata.S, also make sure the extern definitions in
scanner.c are compiled out.

Bugzilla: https://bugs.gentoo.org/show_bug.cgi?id=575212
Reported-by: leio@gentoo.org
Signed-off-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
Reviewed-by: Quentin Glidic <sardemff7+git@sardemff7.net>
Tested-by: Bryce Harrington <bryce@osg.samsung.com>
Makefile.am
configure.ac
src/scanner.c