diff --git a/compiler/cpp/Makefile.am b/compiler/cpp/Makefile.am
index fe2a2d7..4fc4637 100644
--- a/compiler/cpp/Makefile.am
+++ b/compiler/cpp/Makefile.am
@@ -11,7 +11,6 @@
                  src/md5.c \
                  src/generate/t_generator.cc \
                  src/generate/t_php_generator.cc \
-                 src/generate/t_xsd_generator.cc \
                  src/globals.h \
                  src/main.h \
                  src/platform.h \
@@ -71,6 +70,9 @@
 if THRIFT_GEN_hs
 thrift_SOURCES += src/generate/t_hs_generator.cc
 endif
+if THRIFT_GEN_xsd
+thrift_SOURCES += src/generate/t_xsd_generator.cc
+endif
 if THRIFT_GEN_html
 thrift_SOURCES += src/generate/t_html_generator.cc
 endif
diff --git a/configure.ac b/configure.ac
index 9a748c5..69e292c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -172,6 +172,8 @@
 AM_CONDITIONAL([THRIFT_GEN_ocaml], [test "$ax_thrift_gen_ocaml" = "yes"])
 AX_THRIFT_GEN(hs, [Haskell], yes)
 AM_CONDITIONAL([THRIFT_GEN_hs], [test "$ax_thrift_gen_hs" = "yes"])
+AX_THRIFT_GEN(xsd, [XSD], yes)
+AM_CONDITIONAL([THRIFT_GEN_xsd], [test "$ax_thrift_gen_xsd" = "yes"])
 AX_THRIFT_GEN(html, [HTML], yes)
 AM_CONDITIONAL([THRIFT_GEN_html], [test "$ax_thrift_gen_html" = "yes"])