diff options
Diffstat (limited to 'sqwebmail')
| -rw-r--r-- | sqwebmail/.gitignore | 1 | ||||
| -rw-r--r-- | sqwebmail/Makefile.am | 10 | ||||
| -rw-r--r-- | sqwebmail/configure.ac | 16 | ||||
| -rw-r--r-- | sqwebmail/sqwebmaild.dist.in.git (renamed from sqwebmail/sqwebmaild.dist.in) | 1 |
4 files changed, 26 insertions, 2 deletions
diff --git a/sqwebmail/.gitignore b/sqwebmail/.gitignore index cb1bd00..292956a 100644 --- a/sqwebmail/.gitignore +++ b/sqwebmail/.gitignore @@ -13,6 +13,7 @@ /sqwebmail.msg /sqwebmaild /sqwebmaild.dist +/sqwebmaild.dist.in /sqwebpasswd /testhtml /webgpg diff --git a/sqwebmail/Makefile.am b/sqwebmail/Makefile.am index 8d7b527..20dc31b 100644 --- a/sqwebmail/Makefile.am +++ b/sqwebmail/Makefile.am @@ -56,6 +56,16 @@ showmsg2html_LDFLAGS=-static ISPELLSOURCES=sqispell.c ispell.c ispell.h BUILT_SOURCES=htmllibdir.h +if HAVE_SGML + +GITFILES=sqwebmaild.dist.in + +BUILT_SOURCES += $(GITFILES) + +$(GITFILES): %: %.git + perl -p -e 's/\$$Id:[^\$$]*/\$$Id: '"`git log --pretty=format:\"%H\" -n 1 -- $<`-`date +%Y%m%d%H%M%S`/" <$< >$@.tmp + mv -f $@.tmp $@ +endif EXTRA_DIST=$(DOCS) sqwebmail.pamconf sqwebmail-system-auth.pamconf\ sqwebmail-system-auth2.pamconf\ diff --git a/sqwebmail/configure.ac b/sqwebmail/configure.ac index 676336a..fd40b78 100644 --- a/sqwebmail/configure.ac +++ b/sqwebmail/configure.ac @@ -350,7 +350,7 @@ AC_DEFINE_UNQUOTED(MAXLONGSIZE, $MAXLONGSIZE, AC_ARG_ENABLE(bannerprog, [ --enable-bannerprog=prog Program which will generate a banner.], - [ + [ AC_DEFINE_UNQUOTED(BANNERPROG, "$enableval", [ External banner generating program ]) ]) @@ -456,6 +456,20 @@ AC_SUBST(MINPASSLEN) AC_DEFINE_UNQUOTED(MINPASSLEN, $MINPASSLEN, [ Minimum length of a password ]) + +AM_CONDITIONAL(HAVE_SGML, test -d ${srcdir}/../docbook) + +# This gets built by the make rule, and is not in the git repo + +for f in sqwebmaild.dist.in +do + if test ! -f "$srcdir/$f" + then + cp -p "$srcdir/$f.git" "$srcdir/$f" + touch "$srcdir/$f.git" + fi +done + AC_OUTPUT(Makefile sendit.sh cleancache.pl sqwebmaild.dist) if test ! -d html/$lang diff --git a/sqwebmail/sqwebmaild.dist.in b/sqwebmail/sqwebmaild.dist.in.git index f681c08..3b810a0 100644 --- a/sqwebmail/sqwebmaild.dist.in +++ b/sqwebmail/sqwebmaild.dist.in.git @@ -61,4 +61,3 @@ LOGGEROPTS="" # Each occurence of @ is replaced by the search key # # You may provide your own settings below. - |