stribute the autogen'erated files as .bak and enable them only if local libopts is...

diff --git a/Makefile.am b/Makefile.am
index 2e431096876aeb6e450c969c020a939df2b41ac5..d2b1f9778871658a4ab1b335802db16d1a4f06a7 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -53,12 +53,14 @@ dist-hook:
        cd $(distdir)/src/ && for i in *.def;do \
                if test x"$$i" = x"args-std.def";then  continue; fi; \
                autogen $$i; \
-               touch $$i; \
                cp $$i $$i.tmp; \
                sed -i 's/@subheading \(.*\)/@*\n@var{\1}\n@*/' $$i.tmp; \
                autogen -Tagman-cmd.tpl $$i.tmp; \
                rm -f $$i.tmp; \
                mv -f *.1 ../doc/manpages/; \
        done
+       cd $(distdir)/src/ && for i in *-args.c *-args.h;do \
+               mv $$i $$i.bak; \
+       done
        sed 's/\@\@VERSION\@\@/$(VERSION)/g' -i $(distdir)/doc/invoke-*.texi
        touch $(distdir)/doc/*.html $(distdir)/doc/*.pdf $(distdir)/doc/*.info

diff --git a/configure.ac b/configure.ac
index 79110182d959da517cfba68147871f553f58e613..ab95920595b2f240f9054e914c033b5fb7a727d0 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -347,7 +347,11 @@ AM_CONDITIONAL(ENABLE_TROUSERS, test "$with_tpm" != "no")
 LIBOPTS_CHECK([src/libopts])
 if [ test "$NEED_LIBOPTS_DIR" != "true" ];then
        dnl delete libopts-generated files
-       rm -f ${srcdir}/src/*-args.c ${srcdir}/src/*-args.h
+       for i in ${srcdir}/src/*-args.c.bak ${srcdir}/src/*-args.h.bak; do
+               nam=`echo $i|sed 's/.bak//g'`
+               cp -f $i $nam
+       done
+       AC_SUBST([AUTOGEN], [/bin/true])
 fi
 
 AC_CHECK_TYPE(ssize_t,