Commit Diff

Commit:
36d7ed1e4ca16170bfdc637695cc21f41a871593
From:
Thomas Adam <thomas@xteddy.org>
Date:
Message:
portable: update dist configuration When running 'make dist', ensure we automatically pass through the relevant configure options so that the relevant files are included.
Actions:
Patch | Tree
commit - 89e7c39ce31c96de7905deda5a068d82f039891b
commit + 36d7ed1e4ca16170bfdc637695cc21f41a871593
blob - f70d1888f682891cebb56adf7153cc57827a5048
blob + bf9731e5f01779cf5fab7a164611aec3f3245eab
--- Makefile.am
+++ Makefile.am
@@ -1,3 +1,11 @@
+# When creating a distribution tarball, make sure we enable all current
+# 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
+
 SUBDIRS = compat libexec got tog gotadmin template gotwebd
 
 # -portable: re-enable once upstream is happy:  cvg
blob - c81f778c8820771b2047b6cb9688e7e0c241ed67
blob + db4e4bcd4b07aadf08d5b4b5f933fafcb8d341f4
--- configure.ac
+++ configure.ac
@@ -945,6 +945,10 @@ if test -z "$enable_gotd"; then
 	gotgwlep="N/A"
 fi
 
+if test -z "$enable_cvg"; then
+	enable_cvg="no"
+fi
+
 if test -z "$gotdep"; then
 	gotdep="N/A"
 fi
@@ -962,6 +966,7 @@ Configured got-portable with:
  Executables:      ${executables}
  Bison:            $YACC
  CFlags:           $CFLAGS
+ cvg:		   ${enable_cvg}
  Gotd:             ${enable_gotd}
    Empty Path:     ${gotdep}
    Gitwrapper:     ${gotgwlep}