commit - 34a6d6398b194b4b79f6e76dba083a12b8097f21
commit + e9ac8ffb81b959aef62a5b522a7e340da6ffd597
blob - 2d80869654cd5894831cd819050da42a7564c46d
blob + b7158ca393f71349db4b0db82e8f3a664f51adda
--- Makefile.am
+++ Makefile.am
@@ -2,19 +2,23 @@
 # configure flags so that no files are missing.  This is irrespective of
 # whether the end-user will enable this; this step is here so that all the
 # relevant files are included in the distribution.
-AM_DISTCHECK_CONFIGURE_FLAGS= \
-	--enable-cvg \
-	--enable-gotd
+AM_DISTCHECK_CONFIGURE_FLAGS= --enable-cvg
 
-SUBDIRS = compat libexec got tog gotadmin template gotwebd
+SUBDIRS = compat \
+	  gitwrapper \
+	  got \
+	  gotadmin \
+	  gotctl \
+	  gotd \
+	  gotsh \
+	  gotwebd \
+	  libexec \
+	  template \
+	  tog
 
 # -portable: re-enable once upstream is happy:  cvg
 # TODO: gotd gotsh template
 
-if GOTD_ENABLED
-SUBDIRS += gotd gotsh gotctl gitwrapper
-endif
-
 if CVG_ENABLED
 SUBDIRS += cvg
 endif
blob - 4438af8674f93e29d3151a11c8c422c8a8ed55ff
blob + f079ec5cd0b62b5e79ab37b88773b35d2222dab9
--- configure.ac
+++ configure.ac
@@ -21,8 +21,6 @@ AC_USE_SYSTEM_EXTENSIONS
 AC_CANONICAL_HOST
 
 AC_CONFIG_SUBDIRS([template])
-AC_ARG_ENABLE([gotd],
-	AS_HELP_STRING([--enable-gotd], [build gotd and gotsh]))
 AC_ARG_ENABLE([cvg],
 	       AS_HELP_STRING([--enable-cvg],
 			      [EXPERIMENTAL: cvg - cvs-like-git]))
@@ -904,13 +902,21 @@ LIBS=""
 
 AH_BOTTOM([#include "got_compat2.h"])
 
-AM_CONDITIONAL([GOTD_ENABLED], [test "x$enable_gotd" = xyes])
 AM_CONDITIONAL([CVG_ENABLED], [test "x$enable_cvg" = xyes])
 
 AC_CONFIG_FILES([Makefile
 		 compat/Makefile
+		 gitwrapper/Makefile
+		 got/Makefile
+		 gotadmin/Makefile
+		 gotctl/Makefile
+		 gotd/Makefile
+		 gotd/libexec/Makefile
+		 gotd/libexec/got-notify-email/Makefile
+		 gotd/libexec/got-notify-http/Makefile
+		 gotsh/Makefile
+		 gotwebd/Makefile
 		 libexec/Makefile
-		 libexec/got-read-tree/Makefile
 		 libexec/got-fetch-http/Makefile
 		 libexec/got-fetch-pack/Makefile
 		 libexec/got-index-pack/Makefile
@@ -922,23 +928,11 @@ AC_CONFIG_FILES([Makefile
 		 libexec/got-read-pack/Makefile
 		 libexec/got-read-patch/Makefile
 		 libexec/got-read-tag/Makefile
+		 libexec/got-read-tree/Makefile
 		 libexec/got-send-pack/Makefile
-		 got/Makefile
-		 gotadmin/Makefile
-		 gotwebd/Makefile
 		 tog/Makefile
 		 Makefile.common:Makefile.common.in])
 
-if test "x$enable_gotd" = "xyes"; then
-	AC_CONFIG_FILES([gitwrapper/Makefile])
-	AC_CONFIG_FILES([gotd/Makefile])
-	AC_CONFIG_FILES([gotd/libexec/Makefile])
-	AC_CONFIG_FILES([gotd/libexec/got-notify-email/Makefile])
-	AC_CONFIG_FILES([gotd/libexec/got-notify-http/Makefile])
-	AC_CONFIG_FILES([gotsh/Makefile])
-	AC_CONFIG_FILES([gotctl/Makefile])
-fi
-
 if test "x$enable_cvg" = "xyes"; then
 	AC_CONFIG_FILES([cvg/Makefile])
 fi
@@ -951,12 +945,6 @@ manpages="$(eval echo ${mandir})"
 gotdep="$GOTD_EMPTY_PATHC"
 gotgwlep="$GITWRAPPER_LIBEXEC_PATHC"
 
-if test -z "$enable_gotd"; then
-	enable_gotd="no"
-	gotdep="N/A"
-	gotgwlep="N/A"
-fi
-
 if test -z "$enable_cvg"; then
 	enable_cvg="no"
 fi
@@ -979,7 +967,7 @@ Configured got-portable with:
  Bison:            $YACC
  CFlags:           $CFLAGS
  cvg:		   ${enable_cvg}
- Gotd:             ${enable_gotd}
+ Gotd:
    Empty Path:     ${gotdep}
    Gitwrapper:     ${gotgwlep}
  Helpers:          ${helpers}