diff --git a/compiler/cpp/Makefile.am b/compiler/cpp/Makefile.am
index 132462c..6b21c67 100644
--- a/compiler/cpp/Makefile.am
+++ b/compiler/cpp/Makefile.am
@@ -12,7 +12,6 @@
                  src/generate/t_generator.cc \
                  src/generate/t_php_generator.cc \
                  src/generate/t_xsd_generator.cc \
-                 src/generate/t_erl_generator.cc \
                  src/globals.h \
                  src/main.h \
                  src/platform.h \
@@ -58,6 +57,9 @@
 if THRIFT_GEN_perl
 thrift_SOURCES += src/generate/t_perl_generator.cc
 endif
+if THRIFT_GEN_erl
+thrift_SOURCES += src/generate/t_erl_generator.cc
+endif
 if THRIFT_GEN_cocoa
 thrift_SOURCES += src/generate/t_cocoa_generator.cc
 endif
diff --git a/configure.ac b/configure.ac
index 040ae06..9a748c5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -162,6 +162,8 @@
 AM_CONDITIONAL([THRIFT_GEN_rb], [test "$ax_thrift_gen_rb" = "yes"])
 AX_THRIFT_GEN(perl, [Perl], yes)
 AM_CONDITIONAL([THRIFT_GEN_perl], [test "$ax_thrift_gen_perl" = "yes"])
+AX_THRIFT_GEN(erl, [Erlang], yes)
+AM_CONDITIONAL([THRIFT_GEN_erl], [test "$ax_thrift_gen_erl" = "yes"])
 AX_THRIFT_GEN(cocoa, [Cocoa], yes)
 AM_CONDITIONAL([THRIFT_GEN_cocoa], [test "$ax_thrift_gen_cocoa" = "yes"])
 AX_THRIFT_GEN(st, [Smalltalk], yes)