2005-07-07  Stepan Kasal  <address@hidden>

	It's easier to use AM_CONDITIONAL than ADD_PROG="...${EXEEXT}..."
	* configure.ac: Set AM_CONDITIONAL([UUCODE]) according to
	--disable-uucode.
	* src/Makefile.am: Use "if UUCODE".
	* doc/Makefile.am: Likewise.

diff -urN sharutils-0/configure.ac sharutils-1/configure.ac
--- sharutils-0/configure.ac	2005-06-07 23:54:04.000000000 +0200
+++ sharutils-1/configure.ac	2005-07-07 14:49:54.000000000 +0200
@@ -22,18 +22,7 @@
 
 dnl AC_ARG_PROGRAM
 
-ADD_PROG=
-ADD_SCRIPT="mail-files mailshar"
-DIST_MAN1PAGES=
-NODIST_MAN1PAGES=
-dnl MAN1PAGES=
-MAN5PAGES=
-AC_SUBST(ADD_PROG)
-AC_SUBST(ADD_SCRIPT)
-AC_SUBST(DIST_MAN1PAGES)
-AC_SUBST(NODIST_MAN1PAGES)
-dnl AC_SUBST(MAN1PAGES)
-AC_SUBST(MAN5PAGES)
+AC_SUBST(ADD_SCRIPT, ["mail-files mailshar"])
 
 AC_PROG_CC
 AC_PROG_INSTALL
@@ -106,24 +95,9 @@
   AC_MSG_RESULT(no)
 fi
 
-AC_MSG_CHECKING(if uuencode and uudecode are wanted)
 AC_ARG_ENABLE(uucode,
-[  --disable-uucode        disable installation of uuencode and uudecode],
-[if test "$enableval" = yes; then
-  AC_MSG_RESULT(yes)
-  ADD_PROG="uudecode${EXEEXT} uuencode${EXEEXT}"
-  DIST_MAN1PAGES="uuencode.1"
-  NODIST_MAN1PAGES="uudecode.1"
-  MAN5PAGES="uuencode.5"
-else
-  AC_MSG_RESULT(no)
-fi], [
-  AC_MSG_RESULT(yes)
-  ADD_PROG="uudecode${EXEEXT} uuencode${EXEEXT}"
-  DIST_MAN1PAGES="uuencode.1"
-  NODIST_MAN1PAGES="uudecode.1"
-  MAN5PAGES="uuencode.5"
-])
+[  --disable-uucode        disable installation of uuencode and uudecode])
+AM_CONDITIONAL([UUCODE], [test "x$enable_uucode" != xno])
 
 AM_GNU_GETTEXT
 AM_GNU_GETTEXT_VERSION([GETTEXT_VERSION])
diff -urN sharutils-0/doc/Makefile.am sharutils-1/doc/Makefile.am
--- sharutils-0/doc/Makefile.am	2005-07-01 17:15:50.000000000 +0200
+++ sharutils-1/doc/Makefile.am	2005-07-07 14:43:18.000000000 +0200
@@ -19,18 +19,16 @@
 
 info_TEXINFOS = sharutils.texi
 
-DISTCLEANFILES = uudecode.1
+dist_man1_MANS = shar.1 unshar.1
 
-DIST_MAN1PAGES = shar.1 unshar.1 @DIST_MAN1PAGES@
-NODIST_MAN1PAGES = @NODIST_MAN1PAGES@
-man1_MANS = $(DIST_MAN1PAGES) $(NODIST_MAN1PAGES)
-noinst_MANS = uuencode.1 uuencode.5
-noinst_man1_MANS = uudecode.1
-man5_MANS = @MAN5PAGES@
+if UUCODE
+  dist_man1_MANS += uuencode.1 uuencode.5
+  man1_MANS = uudecode.1
+endif
 
-# dist_man_MANS = @MAN1PAGES@ @MAN5PAGES@
+CLEANFILES = $(man1_MANS)
 
-EXTRA_DIST = $(DIST_MAN1PAGES) $(man5_MANS) doclicense.texi
+EXTRA_DIST = doclicense.texi
 
 uudecode.1: Makefile
 	man1base=`echo $(man1dir) | sed 'address@hidden/\(.*\)@\1@'`; \
diff -urN sharutils-0/src/Makefile.am sharutils-1/src/Makefile.am
--- sharutils-0/src/Makefile.am	2005-06-07 23:54:04.000000000 +0200
+++ sharutils-1/src/Makefile.am	2005-07-07 14:40:52.000000000 +0200
@@ -17,8 +17,10 @@
 
 ## Process this file with automake to produce Makefile.in.
 
-bin_PROGRAMS = shar unshar @ADD_PROG@
-EXTRA_PROGRAMS = uuencode uudecode
+bin_PROGRAMS = shar unshar
+if UUCODE
+  bin_PROGRAMS += uuencode uudecode
+endif
 bin_SCRIPTS = @ADD_SCRIPT@
 EXTRA_SCRIPTS = compress-dummy mail-files mailshar remsync