1 files changed, 11 insertions, 1 deletions

diff --git a/configure.ac b/configure.ac
index 0e7cd38d..52bd99dd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -153,7 +153,15 @@ AC_ARG_ENABLE([peerinfo-app],
 AS_IF([test "x$enable_peerinfo_app" != "xno"], [
   GNUNET_PEERINFO_APP="peerinfo"
 ])
-AC_SUBST(GNUNET_PEERINFO_APP)
+AC_SUBST(GNUNET_CONVERSATION_APP)
+
+GNUNET_PEERINFO_APP=""
+AC_ARG_ENABLE([conversation-app],
+   AS_HELP_STRING([--disable-conversation-app],[Do not build gnunet-conversation-gtk application]))
+AS_IF([test "x$enable_conversation_app" != "xno"], [
+  GNUNET_PEERINFO_APP="conversation"
+])
+AC_SUBST(GNUNET_CONVERSATION_APP)
 
 # test for libextractor
 extractor=0
@@ -526,6 +534,7 @@ src/main/Makefile
 src/namestore/Makefile
 src/setup/Makefile
 src/statistics/Makefile
+src/conversation/Makefile
 pixmaps/Makefile
 po/Makefile.in
 po/Makefile
@@ -537,6 +546,7 @@ contrib/gnunet_peerinfo_gtk_about_window.glade
 contrib/gnunet_namestore_gtk_about_window.glade
 contrib/gnunet_statistics_gtk_about_window.glade
 contrib/gnunet_setup_about_window.glade
+contrib/gnunet_conversation_gtk_about_window.glade
 ])
 
 if test "$qrencode" != 1