Developers of Sympa

[Guillaume Rousse <address@concealed>]

Hello developpers.

I'm mandriva sympa package maintainer. We met during JRES, and I told
you how awfull sympa autotools usage was...

Here are two first patches attempting to change the situation, and move
toward a standard use of those tools.

The first one (autoconf-cleanup) doesn't change much in the installation
process, it's rather a purely syntaxic cleanup:
- rename configure.in to configure.ac
- define software version inside configure.ac directly
- use current AC_INIT and AC_OUTPUT syntax
- define autoconf 2.59 as minimal version
- wrap long lines
- use AC_HELP_STRING for formatting options help output
- make all binaries tests use the same logic, meaning no default value,
and only look in PATH if no value given by user
- don't call AC_SUBST for variables set through AC_PATH_PROG (done
implicitely)
- don't put explicit substitutions targets in Makefile.am, automake does
it automatically
- removal of AM_MAINTAINER_MODE in configure.ac (it prevent automatic
makefile rebuild/configure re-invocation)

The second one (use-automake-correctly), bring real change. It is not a
 finished jobs (too many issues to discuss), but it shows how automake
is supposed to be used. So:
- removal of all targets already defined by automake (install, all, etc..)
- removal of all recursion targets (makedoc, makeman,...)
- conversion of all static Makefile in src and doc trees to Makefile.ams
- definition of SUBDIR variable in top-level, src and doc subdirs
Makefile.am
- definition of primary targets in those makefile, as foo_BAR variables,
where foo is the installation directory, and BAR the type of the file to
install
- definition of EXTRA_DIST and CLEANFILES variable to ensure make clean
and make dist will work as expected
- use a standard in-place substitution system for variables defined by
configure process, as per
http://www.gnu.org/software/autoconf/manual/autoconf-2.57/html_mono/autoconf.html#SEC24
- drop all reference to custom variables in configure.ac for those
directories defined in GNU's standards
- drop non-standard /home/sympa prefix
- usage of a config.h headers rather than command line flags to pass C
symbols for building binaries

I didn't finished the work mainly because setup is unclear. Original
configure script defines a lots of different subdirectories with similar
content type, whereas most software usually just define directories for:
- configuration ($prefix/etc/sympa by default)
- non-variable content ($prefix/share/sympa by default)
- variable content ($prefix/var/lib/sympa by default)
- documentation ($prefix/share/doc/sympa by default)
and then install content relatively to those top-level directories.

I didn't configured installation, nor ensured substitutions were
correctly handled for those destination directories not cleary matching
this standard setup (samples and user config).

Also, you'll notice how performing a lot of substitutions in perl
modules is cumbersome. You'd rather have a unique .pm files defining
those constants (using constant pragma, or ReadOnly module), sourced by
all others, so as to substitude only once.

And I didn't handled the po subdirectory neither. Not very difficult to
do, but the procedure to do it is a bit different from other contents,
so I wanted first to demonstrate pure automake usage. For more
explanations, I suggest reading http://www.lrde.epita.fr/~adl/autotools.html

Hope you'll appreciate the work :)
-- 
Guillaume Rousse
Moyens Informatiques - INRIA Futurs
Tel: 01 69 35 69 62
diff -Naur sympa-5.3.4/configure.ac sympa-5.3.4-autoconf-cleanup/configure.ac
--- sympa-5.3.4/configure.ac    1970-01-01 01:00:00.000000000 +0100
+++ sympa-5.3.4-autoconf-cleanup/configure.ac   2008-02-22 00:14:26.000000000 
+0100
@@ -0,0 +1,447 @@
+# configure.in - Top-level configure.in for Sympa
+# RCS Identication ; $Revision: 3678 $ ; $Date: 2006-04-05 10:22:32 +0200 
(mer, 05 avr 2006) $ 
+#
+# Sympa - SYsteme de Multi-Postage Automatique
+# Copyright (c) 1997, 1998, 1999, 2000, 2001 Comite Reseau des Universites
+# Copyright (c) 1997,1998, 1999 Institut Pasteur & Christophe Wolfhugel
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+
+AC_PREREQ(2.59)
+AC_INIT(sympa, 5.3.4, address@concealed)
+AM_INIT_AUTOMAKE
+
+AC_PREFIX_DEFAULT(/home/sympa)
+
+## Directories setup
+## for main config files
+
+## location of main config files
+CONFDIR='/etc'
+AC_ARG_WITH(
+    [confdir],
+    AC_HELP_STRING(
+       [--with-confdir=DIR],
+       [Sympa main configuration files in DIR  (default /etc)],
+    ),
+    [CONFDIR="$withval"]
+)
+AC_SUBST(CONFDIR)
+
+## location of CGIs
+CGIDIR='${prefix}/bin'
+AC_ARG_WITH(
+    [cgidir],
+    AC_HELP_STRING(
+       [--with-cgidir=DIR],
+       [CGIs in DIR  (default ${prefix}/bin)],
+    ),
+    [CGIDIR="$withval"]
+)
+AC_SUBST(CGIDIR)
+
+## location of icons
+ICONSDIR='/var/www/icons'
+AC_ARG_WITH(
+    [iconsdir],
+    AC_HELP_STRING(
+       [--with-iconsdir=DIR],
+       [web interface icons in DIR  (default /var/www/icons)],
+    ),
+    [ICONSDIR="$withval"]
+)
+AC_SUBST(ICONSDIR)
+
+## location of user executables
+BINDIR='${prefix}/bin'
+AC_ARG_WITH(
+    [bindir],
+    AC_HELP_STRING(
+       [--with-bindir=DIR],
+       [user executables in DIR (default ${prefix}/bin). queue and 
bouncequeue programs will be installed in this directory. If sendmail is 
configured to use smrsh (check the mailer prog definition in your 
sendmail.cf), this should point to /etc/smrsh. This is probably the case if 
you are using Linux],
+    ),
+    [BINDIR="$withval"]
+)
+AC_SUBST(BINDIR)
+
+## location of system admin executables
+SBINDIR='${prefix}/bin'
+AC_ARG_WITH(
+    [sbindir],
+    AC_HELP_STRING(
+       [--with-sbindir=DIR],
+       [system admin executables in DIR (default ${prefix}/bin)],
+    ),
+    [SBINDIR="$withval"]
+)
+AC_SUBST(SBINDIR)
+
+## location of program executables
+LIBEXECDIR='${prefix}/bin'
+AC_ARG_WITH(
+    [libexecdir],
+    AC_HELP_STRING(
+       [--with-libexecdir=DIR],
+       [program executables in DIR (default ${prefix}/bin)],
+    ),
+    [LIBEXECDIR="$withval"]
+)
+AC_SUBST(LIBEXECDIR)
+
+## location of Perl modules
+LIBDIR='${prefix}/bin'
+AC_ARG_WITH(
+    [libdir],
+    AC_HELP_STRING(
+       [--with-libdir=DIR],
+       [Perl modules in DIR (default ${prefix}/bin)],
+    ),
+    [LIBDIR="$withval"]
+)
+AC_SUBST(LIBDIR)
+
+## location of default *read-only* data files
+DATADIR='${prefix}/bin/etc'
+AC_ARG_WITH(
+    [datadir],
+    AC_HELP_STRING(
+       [--with-datadir=DIR],
+       [default *read-only* data files in DIR (default ${prefix}/bin/etc)],
+    ),
+    [DATADIR="$withval"]
+)
+AC_SUBST(DATADIR)
+
+## location of modifiable data files
+EXPLDIR='${prefix}/expl'
+AC_ARG_WITH(
+    [expldir],
+    AC_HELP_STRING(
+       [--with-expldir=DIR],
+       [modifiable data files in DIR (default ${prefix}/expl)],
+    ),
+    [EXPLDIR="$withval"]
+)
+AC_SUBST(EXPLDIR)
+
+## location of documentation
+MANDIR='/usr/local/man'
+AC_ARG_WITH(
+    [mandir],
+    AC_HELP_STRING(
+       [--with-mandir=DIR],
+       [documentation in DIR (default /usr/local/man)],
+    ),
+    [MANDIR="$withval"]
+)
+AC_SUBST(MANDIR)
+
+## SYS V init scripts directory
+INITDIR=/etc/rc.d/init.d
+AC_ARG_WITH(
+    [initdir],
+    AC_HELP_STRING(
+       [--with-initdir=DIR],
+       [install System V init script in DIR  (default /etc/rc.d/init.d)],
+    ),
+    [INITDIR="$withval"]
+)
+AC_SUBST(INITDIR)
+
+## Lock directory
+LOCKDIR=/var/lock/subsys
+AC_ARG_WITH(
+    [lockdir],
+    AC_HELP_STRING(
+       [--with-lockdir=DIR],
+       [create lock files in DIR  (default /var/lock/subsys)],
+    ),
+    [LOCKDIR="$withval"]
+)
+AC_SUBST(LOCKDIR)
+
+## directory for storing .pid files
+PIDDIR='${prefix}'
+AC_ARG_WITH(
+    [piddir],
+    AC_HELP_STRING(
+       [--with-piddir=DIR],
+       [create .pid files in DIR  (default ${prefix})],
+    ),
+    [PIDDIR="$withval"]
+)
+AC_SUBST(PIDDIR)
+
+## directory for Config directories populated by the user
+ETCDIR='${prefix}/etc'
+AC_ARG_WITH(
+    [etcdir],
+    AC_HELP_STRING(
+       [--with-etcdir=DIR],
+       [Config directories populated by the user are in DIR  (default 
${prefix}/etc)],
+    ),
+    [ETCDIR="$withval"]
+)
+AC_SUBST(ETCDIR)
+
+## directory for language files
+LOCALEDIR='${prefix}/locale'
+AC_ARG_WITH(
+    [localedir],
+    AC_HELP_STRING(
+       [--with-localedir=DIR],
+       [create language files in DIR  (default ${prefix}/locale)],
+    ),
+    [LOCALEDIR="$withval"]
+)
+AC_SUBST(LOCALEDIR)
+
+## directory for Documentation files
+DOCDIR='${prefix}/doc'
+AC_ARG_WITH(
+    docdir,
+    AC_HELP_STRING(
+       [--with-docdir=DIR],
+       [create documentation files in DIR  (default ${prefix}/doc)],
+    ),
+    [DOCDIR="$withval"]
+)
+AC_SUBST(DOCDIR)
+
+## directory for script files
+SCRIPTDIR='${prefix}/bin'
+AC_ARG_WITH(
+    [scriptdir],
+    AC_HELP_STRING(
+       [--with-scriptdir=DIR],
+       [create script files in DIR  (default ${prefix}/bin)],
+    ),
+    [SCRIPTDIR="$withval"]
+)
+AC_SUBST(SCRIPTDIR)
+
+## directory for sample files
+SAMPLEDIR='${prefix}/sample'
+AC_ARG_WITH(
+    [sampledir],
+    AC_HELP_STRING(
+       [--with-sampledir=DIR],
+       [create sample files in DIR  (default ${prefix}/sample)],
+    ),
+    [SAMPLEDIR="$withval"]
+)
+AC_SUBST(SAMPLEDIR)
+
+## directory for sample files
+SPOOLDIR='${prefix}/spool'
+AC_ARG_WITH(
+    [spooldir],
+    AC_HELP_STRING(
+       [--with-spooldir=DIR],
+       [spool directory is DIR  (default ${prefix}/spool)],
+    ),
+    [SPOOLDIR="$withval"]
+)
+AC_SUBST(SPOOLDIR)
+
+## to run wwsympa.fcgi without setuidperl
+AC_ARG_ENABLE(
+    [secure],
+    AC_HELP_STRING(
+       [--enable-secure],
+       [install wwsympa to be run in a secure mode, without suidperl 
(default disabled)]
+    )
+)
+AC_SUBST(enable_secure)
+
+dnl Checks for programs.
+AC_PROG_CC
+AC_PROG_MAKE_SET
+AC_AIX
+
+AC_ARG_WITH(
+    [perl],
+    AC_HELP_STRING(
+       [--with-perl=PATH],
+       [set full path to Perl interpreter]
+    ),
+    [PERL="$withval"]
+)
+if test -z "$PERL"; then
+    AC_PATH_PROG(PERL, perl)
+fi
+
+AC_ARG_WITH(
+    [suidperl],
+    AC_HELP_STRING(
+       [--with-suidperl=PATH],
+       [set full path to setuid Perl interpreter]
+    ),
+    [SUIDPERL="$withval"]
+)
+if test -z "$SUIDPERL"; then
+    AC_PATH_PROG(SUIDPERL, suidperl)
+fi
+
+AC_ARG_WITH(
+    [sudo],
+    AC_HELP_STRING(
+       [--with-sudo=PATH],
+       [set full path to sudo]
+    ),
+    [SUDO="$withval"]
+)
+if test -z "$SUDO"; then
+    AC_PATH_PROG(SUDO, sudo)
+fi
+
+AC_ARG_WITH(
+    [mhonarc],
+    AC_HELP_STRING(
+       [--with-mhonarc=PATH],
+       [set full path to MhOnArc mail archiving system]
+    ),
+    [MHONARC="$withval"]
+)
+if test -z "$MHONARC"; then
+    AC_PATH_PROG(MHONARC, mhonarc)
+fi
+
+AC_ARG_WITH(
+    [openssl],
+    AC_HELP_STRING(
+       [--with-openssl=PATH],
+       [set full path to OpenSSL]
+    ),
+    [OPENSSL="$withval"]
+)
+if test -z "$OPENSSL"; then
+    AC_PATH_PROG(OPENSSL, openssl)
+fi
+
+AC_ARG_WITH(
+    [cvs2cl],
+    AC_HELP_STRING(
+       [--with-cvs2cl=PATH],
+       [set full path to cvs2cl]
+    ),
+    [CVS2CL="$withval"]
+)
+if test -z "$CVS2CL"; then
+    AC_PATH_PROG(CVS2CL, cvs2cl.pl)
+fi
+
+AC_ARG_WITH(
+    [msgfmt],
+    AC_HELP_STRING(
+       [--with-msgfmt=PATH],
+       [set full path to msgfmt]
+    ),
+    [MSGFMT="$withval"]
+)
+if test -z "$MSGFMT"; then
+    AC_PATH_PROG(MSGFMT, msgfmt)
+fi
+
+AC_ARG_WITH(
+    [newaliases],
+    AC_HELP_STRING(
+       [--with-newaliases=PATH],
+       [set path to newaliases command]
+    ),
+    [NEWALIASES="$withval"]
+)
+if test -z "$NEWALIASES"; then
+    AC_PATH_PROG(NEWALIASES, newaliases)
+fi
+
+AC_ARG_WITH(
+    [newaliases_arg],
+    AC_HELP_STRING(
+       [--with-newaliases_arg=ARGS],
+       [set arguments to newaliases command (default NONE)]
+    ),
+    [NEWALIASES_ARG="$withval"]
+)
+AC_SUBST(NEWALIASES_ARG)
+
+AC_ARG_WITH(
+    [postmap],
+    AC_HELP_STRING(
+       [--with-postmap=PATH],
+       [set path to postfix postmap command]
+    ),
+    [POSTMAP="$withval"]
+)
+if test -z "$POSTMAP"; then
+    AC_PATH_PROG(POSTMAP, postmap)
+fi
+
+AC_ARG_WITH(
+    [postmap_arg],
+    AC_HELP_STRING(
+       [--with-postmap_arg=ARGS],
+       [set arguments to postfix postmap command (default NONE)]
+    ),
+    [POSTMAP_ARG="$withval"]
+)
+AC_SUBST(POSTMAP_ARG)
+
+USER=sympa
+AC_ARG_WITH(
+    [user],
+    AC_HELP_STRING(
+       [--with-user=LOGIN],
+       [set sympa user name (default sympa)],
+    )
+    [USER="$withval"]
+)
+AC_SUBST(USER)
+
+GROUP=sympa
+AC_ARG_WITH(
+    group,
+    AC_HELP_STRING(
+       [--with-group=LOGIN],
+       [set sympa group name (default sympa)]
+    ),
+    [GROUP="$withval"]
+)
+AC_SUBST(GROUP)
+
+SENDMAIL_ALIASES=/etc/mail/sympa_aliases
+AC_ARG_WITH(
+    [sendmail_aliases], 
+    AC_HELP_STRING(
+       [--with-sendmail_aliases=ALIASFILE],
+       [set aliases file to be used by Sympa (default 
/etc/mail/sympa_aliases)]
+    ),
+    [SENDMAIL_ALIASES="$withval"]
+)
+AC_SUBST(SENDMAIL_ALIASES)
+
+VIRTUAL_ALIASES=/etc/mail/sympa_virtual
+AC_ARG_WITH(
+    [virtual_aliases],
+    AC_HELP_STRING(
+       [--with-virtual_aliases=ALIASFILE],
+       [set postfix virtual file to be used by Sympa (default 
/etc/mail/sympa_virtual)]
+    ),
+    [VIRTUAL_ALIASES="$withval"]
+)
+AC_SUBST(VIRTUAL_ALIASES)
+
+AC_CONFIG_FILES([Makefile])
+AC_OUTPUT
diff -Naur sympa-5.3.4/configure.in sympa-5.3.4-autoconf-cleanup/configure.in
--- sympa-5.3.4/configure.in    2006-04-05 10:22:32.000000000 +0200
+++ sympa-5.3.4-autoconf-cleanup/configure.in   1970-01-01 01:00:00.000000000 
+0100
@@ -1,209 +0,0 @@
-# configure.in - Top-level configure.in for Sympa
-# RCS Identication ; $Revision: 3678 $ ; $Date: 2006-04-05 10:22:32 +0200 
(mer, 05 avr 2006) $ 
-#
-# Sympa - SYsteme de Multi-Postage Automatique
-# Copyright (c) 1997, 1998, 1999, 2000, 2001 Comite Reseau des Universites
-# Copyright (c) 1997,1998, 1999 Institut Pasteur & Christophe Wolfhugel
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-
-AC_INIT(check_perl_modules.pl)
-PACKAGE=sympa
-VERSION=`cat ${srcdir}/.version`
-MAJOR_VERSION=[`expr $VERSION : '\([0-9][0-9]*\)'`]
-AC_SUBST(MAJOR_VERSION)
-MINOR_VERSION=[`expr $VERSION : '[0-9][0-9]*\.\([0-9][0-9]*\)'`]
-AC_SUBST(MINOR_VERSION)
-MICRO_VERSION=[`expr $VERSION : '[0-9][0-9]*\.[0-9][0-9]*\.\([0-9][0-9]*\)'`]
-AC_SUBST(MICRO_VERSION)
-AC_CANONICAL_SYSTEM
-AC_CANONICAL_HOST
-AM_INIT_AUTOMAKE([sympa], $VERSION, nosubst)
-AC_PREREQ(2.13)
-
-AC_PREFIX_DEFAULT(/home/sympa)
-
-## Directories setup
-## for main config files
-
-## location of main config files
-CONFDIR='/etc'
-AC_ARG_WITH(confdir, [  --with-confdir=DIR     Sympa main configuration 
files in DIR  (default /etc)], [CONFDIR="$withval"])
-AC_SUBST(CONFDIR)
-
-## location of CGIs
-CGIDIR='${prefix}/bin'
-AC_ARG_WITH(cgidir, [  --with-cgidir=DIR     CGIs in DIR  (default 
${prefix}/bin)], [CGIDIR="$withval"])
-AC_SUBST(CGIDIR)
-
-## location of icons
-ICONSDIR='/var/www/icons'
-AC_ARG_WITH(iconsdir, [  --with-iconsdir=DIR     web interface icons in DIR  
(default /var/www/icons)], [ICONSDIR="$withval"])
-AC_SUBST(ICONSDIR)
-
-## location of user executables
-BINDIR='${prefix}/bin'
-AC_ARG_WITH(bindir, [  --with-bindir=DIR     user executables in DIR 
(default ${prefix}/bin). queue and bouncequeue programs will be installed in 
this directory. If sendmail is configured to use smrsh (check the mailer prog 
definition in your sendmail.cf), this should point to /etc/smrsh. This is 
probably the case if you are using Linux], [BINDIR="$withval"])
-AC_SUBST(BINDIR)
-
-## location of system admin executables
-SBINDIR='${prefix}/bin'
-AC_ARG_WITH(sbindir, [  --with-sbindir=DIR     system admin executables in 
DIR (default ${prefix}/bin)], [SBINDIR="$withval"])
-AC_SUBST(SBINDIR)
-
-## location of program executables
-LIBEXECDIR='${prefix}/bin'
-AC_ARG_WITH(libexecdir, [  --with-libexecdir=DIR     program executables in 
DIR (default ${prefix}/bin)], [LIBEXECDIR="$withval"])
-AC_SUBST(LIBEXECDIR)
-
-## location of Perl modules
-LIBDIR='${prefix}/bin'
-AC_ARG_WITH(libdir, [  --with-libdir=DIR     Perl modules in DIR (default 
${prefix}/bin)], [LIBDIR="$withval"])
-AC_SUBST(LIBDIR)
-
-## location of default *read-only* data files
-DATADIR='${prefix}/bin/etc'
-AC_ARG_WITH(datadir, [  --with-datadir=DIR     default *read-only* data 
files in DIR (default ${prefix}/bin/etc)], [DATADIR="$withval"])
-AC_SUBST(DATADIR)
-
-## location of modifiable data files
-EXPLDIR='${prefix}/expl'
-AC_ARG_WITH(expldir, [  --with-expldir=DIR     modifiable data files in DIR 
(default ${prefix}/expl)], [EXPLDIR="$withval"])
-AC_SUBST(EXPLDIR)
-
-## location of documentation
-MANDIR='/usr/local/man'
-AC_ARG_WITH(mandir, [  --with-mandir=DIR     documentation in DIR (default 
/usr/local/man)], [MANDIR="$withval"])
-AC_SUBST(MANDIR)
-
-## SYS V init scripts directory
-INITDIR=/etc/rc.d/init.d
-AC_ARG_WITH(initdir, [  --with-initdir=DIR     install System V init script 
in DIR  (default /etc/rc.d/init.d)], [INITDIR="$withval"])
-AC_SUBST(INITDIR)
-
-## Lock directory
-LOCKDIR=/var/lock/subsys
-AC_ARG_WITH(lockdir, [  --with-lockdir=DIR     create lock files in DIR  
(default /var/lock/subsys)], [LOCKDIR="$withval"])
-AC_SUBST(LOCKDIR)
-
-## directory for storing .pid files
-PIDDIR='${prefix}'
-AC_ARG_WITH(piddir, [  --with-piddir=DIR     create .pid files in DIR  
(default ${prefix})], [PIDDIR="$withval"])
-AC_SUBST(PIDDIR)
-
-## directory for Config directories populated by the user
-ETCDIR='${prefix}/etc'
-AC_ARG_WITH(etcdir, [  --with-etcdir=DIR     Config directories populated by 
the user are in DIR  (default ${prefix}/etc)], [ETCDIR="$withval"])
-AC_SUBST(ETCDIR)
-
-## directory for language files
-LOCALEDIR='${prefix}/locale'
-AC_ARG_WITH(localedir, [  --with-localedir=DIR     create language files in 
DIR  (default ${prefix}/locale)], [LOCALEDIR="$withval"])
-AC_SUBST(LOCALEDIR)
-
-## directory for Documentation files
-DOCDIR='${prefix}/doc'
-AC_ARG_WITH(docdir, [  --with-docdir=DIR     create documentation files in 
DIR  (default ${prefix}/doc)], [DOCDIR="$withval"])
-AC_SUBST(DOCDIR)
-
-## directory for script files
-SCRIPTDIR='${prefix}/bin'
-AC_ARG_WITH(scriptdir, [  --with-scriptdir=DIR     create script files in 
DIR  (default ${prefix}/bin)], [SCRIPTDIR="$withval"])
-AC_SUBST(SCRIPTDIR)
-
-## directory for sample files
-SAMPLEDIR='${prefix}/sample'
-AC_ARG_WITH(sampledir, [  --with-sampledir=DIR     create sample files in 
DIR  (default ${prefix}/sample)], [SAMPLEDIR="$withval"])
-AC_SUBST(SAMPLEDIR)
-
-## directory for sample files
-SPOOLDIR='${prefix}/spool'
-AC_ARG_WITH(spooldir, [  --with-spooldir=DIR     spool directory is DIR  
(default ${prefix}/spool)], [SPOOLDIR="$withval"])
-AC_SUBST(SPOOLDIR)
-
-## to run wwsympa.fcgi without setuidperl
-AC_ARG_ENABLE(secure, [  --enable-secure     install wwsympa to be run in a 
secure mode, without suidperl (default disabled)])
-AC_SUBST(enable_secure)
-
-dnl Checks for programs.
-AC_PROG_CC
-AC_PROG_MAKE_SET
-AC_AIX
-
-AC_PATH_PROG(PERL, perl, /usr/bin/perl)
-AC_ARG_WITH(perl, [  --with-perl=FULLPATH       set full path to Perl 
interpreter (default /usr/bin/perl)], [PERL="$withval"])
-AC_SUBST(PERL)
-
-AC_PATH_PROG(SUIDPERL, suidperl, /usr/bin/suidperl)
-AC_SUBST(SUIDPERL)
-
-AC_PATH_PROG(SUDO, sudo, /usr/bin/sudo)
-AC_SUBST(SUDO)
-
-AC_PATH_PROG(MHONARC, mhonarc, /usr/bin/mhonarc)
-AC_ARG_WITH(mhonarc, [  --with-mhonarc=FULLPATH       set full path to 
MhOnArc mail archiving system (default /usr/bin/mhonarc)], 
[MHONARC="$withval"])
-AC_SUBST(MHONARC)
-
-AC_PATH_PROG(OPENSSL, openssl, /usr/local/ssl/bin)
-AC_ARG_WITH(openssl, [  --with-openssl=FULLPATH       set path to OpenSSL 
(default /usr/local/ssl/bin/openssl)], [OPENSSL="$withval"])
-AC_SUBST(OPENSSL)
-
-AC_PATH_PROG(CVS2CL, cvs2cl.pl, /usr/local/bin)
-AC_SUBST(CVS2CL)
-
-AC_PATH_PROG(MSGFMT, msgfmt, /usr/bin/msgfmt)
-AC_SUBST(MSGFMT)
-
-AC_PATH_PROG(SH, sh, /bin/sh)
-
-USER=sympa
-AC_ARG_WITH(user, [  --with-user=LOGIN       set sympa user name (default 
sympa)], [USER="$withval"])
-AC_SUBST(USER)
-
-GROUP=sympa
-AC_ARG_WITH(group, [  --with-group=LOGIN     set sympa group name (default 
sympa)], [GROUP="$withval"])
-AC_SUBST(GROUP)
-
-SENDMAIL_ALIASES=/etc/mail/sympa_aliases
-AC_ARG_WITH(sendmail_aliases, [  --with-sendmail_aliases=ALIASFILE     set 
aliases file to be used by Sympa (default /etc/mail/sympa_aliases)], 
[SENDMAIL_ALIASES="$withval"])
-AC_SUBST(SENDMAIL_ALIASES)
-
-VIRTUAL_ALIASES=/etc/mail/sympa_virtual
-AC_ARG_WITH(virtual_aliases, [  --with-virtual_aliases=ALIASFILE     set 
postfix virtual file to be used by Sympa (default /etc/mail/sympa_virtual)], 
[VIRTUAL_ALIASES="$withval"])
-AC_SUBST(VIRTUAL_ALIASES)
-
-NEWALIASES=/usr/bin/newaliases
-AC_ARG_WITH(newaliases, [  --with-newaliases=FULLPATH     set path to 
newaliases command (default /usr/bin/newaliases)], [NEWALIASES="$withval"])
-AC_SUBST(NEWALIASES)
-
-NEWALIASES_ARG=
-AC_ARG_WITH(newaliases_arg, [  --with-newaliases_arg=ARGS     set arguments 
to newaliases command (default NONE)], [NEWALIASES_ARG="$withval"])
-AC_SUBST(NEWALIASES_ARG)
-
-POSTMAP=/usr/sbin/postmap
-AC_ARG_WITH(postmap, [  --with-postmap=FULLPATH     set path to postfix 
postmap command (default /usr/sbin/postmap)], [POSTMAP="$withval"])
-AC_SUBST(POSTMAP)
-
-POSTMAP_ARG=${VIRTUAL_ALIASES}
-AC_ARG_WITH(postmap_arg, [  --with-postmap_arg=ARGS     set arguments to 
postfix postmap command (default [same as virtual_aliases])], 
[POSTMAP_ARG="$withval"])
-AC_SUBST(POSTMAP_ARG)
-
-dnl Initialize maintainer mode
-AM_MAINTAINER_MODE
-
-AC_OUTPUT(Makefile)
-
-
-
diff -Naur sympa-5.3.4/Makefile.am sympa-5.3.4-autoconf-cleanup/Makefile.am
--- sympa-5.3.4/Makefile.am     2007-03-14 16:42:14.000000000 +0100
+++ sympa-5.3.4-autoconf-cleanup/Makefile.am    2008-02-22 00:14:20.000000000 
+0100
@@ -24,16 +24,6 @@
 ChangeLog:
        @CVS2CL@
 
-## User Id and Group for Sympa (your httpd should have the same uid.gid)
-USER   =       @USER@
-GROUP  =       @GROUP@
-
-## configuration file
-CONFDIR        =       @CONFDIR@
-
-##  Perl path
-PERL   =       @PERL@
-
 ## For preparing samples
 HOST           =       `$(PERL) -MSys::Hostname -e "printf '%s', 
Sys::Hostname::hostname();"`
 COOKIE         =       `$(PERL) -e " print int(rand ( time ))  "`
@@ -48,108 +38,23 @@
 ## installed (usefull for packagers of Sympa)
 DIR    =       ${prefix}
 
-EXPL_DIR       =       @EXPLDIR@
-
-## PID location
-PIDDIR =       @PIDDIR@
-
-## Both queue and bouncequeue are lunched by sendmail. If sendmail
-## is configured to used smrsh (check the mailer prog definition), thoses
-## files needs to be installed in /etc/smrsh.  
-MAILERPROGDIR  =       @BINDIR@
-
 RPMTOPDIR      =       `rpm --eval %_topdir`
 #RPMTOPDIR     =       /usr/src/redhat
 
-MANDIR         =       @MANDIR@
-
-## SYSV init scripts directory
-INITDIR                =       @INITDIR@
-
-BINDIR         =       @BINDIR@
-
-SBINDIR                =       @SBINDIR@
-
-CGIDIR         =       @CGIDIR@
-
-LIBDIR         =       @LIBDIR@
-
-LOCALEDIR      =       @LOCALEDIR@
-
-DOCDIR         =       @DOCDIR@
-
-ETCDIR         =       @ETCDIR@
-
-SCRIPTDIR      =       @SCRIPTDIR@
-
-SAMPLEDIR      =       @SAMPLEDIR@
-
-## Spools directory
-SPOOLDIR       =       @SPOOLDIR@
-
 ## Directory for installing WWSympa
 WWSBINDIR      =       $(BINDIR)
 
 ## Web interface colors are now defined in sympa.conf
 
-## Target directory for installing Icons
-ICONSDIR       =       @ICONSDIR@
-
 ## Settings used in src/etc/scripts/sympa
 PIDPRE         =       pidof -x
 PIDPOST                =       
-LOCKDIR                =       @LOCKDIR@
-
-## Path to newaliases command (or what else may be called to rebuild
-## Mail aliases database)
-NEWALIASES     =       @NEWALIASES@
-
-## Argument to newaliases command
-# NEWALIASES_ARG       =       hash:/etc/mail/sympa_aliases
-NEWALIASES_ARG =       @NEWALIASES_ARG@
-
-## Path to postmap command (or what else may be called to rebuild
-## Mail virtual database)
-POSTMAP                =       @POSTMAP@
-
-## Argument to postmap command
-# POSTMAP_ARG  =       hash:/etc/mail/sympa_virtual
-POSTMAP_ARG    =       @POSTMAP_ARG@
-
-## The sendmail aliases file we use. Better use a seperate one for sympa.
-## Of course an extra alias file must be generated with proper permissions
-## (owner sympa, write access for sympa, no write access for anyone else)
-## and declared in sendmail.cf!
-SENDMAIL_ALIASES=      @SENDMAIL_ALIASES@
-
-## The postfix virtual file we use. Better use a seperate one for sympa.
-## Of course an extra alias file must be generated with proper permissions
-## (owner sympa, write access for sympa, no write access for anyone else)
-## and declared in main.cf!
-VIRTUAL_ALIASES=       @VIRTUAL_ALIASES@
 
 ## Path to OpenSSL
-OPENSSL        =       @OPENSSL@
 SSLCERTDIR =   $(EXPL_DIR)/X509-user-certs
 
-SH     =       @SH@
-CC     =       @CC@
 CFLAGS =       -g
 
-# Aix4.2 (and some others unix), use gnu make !
-#MAKE  =       @MAKE@
-
-# FreeBSD hier(7) structure and locations
-# by Autrijus Tang 2001/10/11
-#ifeq ($(shell uname), FreeBSD)
-#      PIDPRE  =       ps -ax | grep
-#      PIDPOST =       | grep perl | head -n 1 | cut -f 2 -d " "
-#      LOCKDIR =       /var/spool/lock
-#      ICONSDIR        =       /usr/local/www/icons
-#      RPMTOPDIR       =       /usr/local/src/redhat
-#      OPENSSL =       /usr/bin/openssl
-#endif
-
 ##---------- STOP ---------- STOP ---------- STOP ---------- STOP ----------
 
 CONFIG         =       $(CONFDIR)/sympa.conf
diff -Naur sympa-5.3.4/.version sympa-5.3.4-autoconf-cleanup/.version
--- sympa-5.3.4/.version        2007-11-26 18:18:52.000000000 +0100
+++ sympa-5.3.4-autoconf-cleanup/.version       1970-01-01 01:00:00.000000000 
+0100
@@ -1 +0,0 @@
-5.3.4
diff -Naur sympa-5.3.4-autoconf-cleanup/configure.ac 
sympa-5.3.4-use-automake-correctly/configure.ac
--- sympa-5.3.4-autoconf-cleanup/configure.ac   2008-02-22 00:14:26.000000000 
+0100
+++ sympa-5.3.4-use-automake-correctly/configure.ac     2008-02-22 
00:15:30.000000000 +0100
@@ -23,23 +23,6 @@
 AC_INIT(sympa, 5.3.4, address@concealed)
 AM_INIT_AUTOMAKE
 
-AC_PREFIX_DEFAULT(/home/sympa)
-
-## Directories setup
-## for main config files
-
-## location of main config files
-CONFDIR='/etc'
-AC_ARG_WITH(
-    [confdir],
-    AC_HELP_STRING(
-       [--with-confdir=DIR],
-       [Sympa main configuration files in DIR  (default /etc)],
-    ),
-    [CONFDIR="$withval"]
-)
-AC_SUBST(CONFDIR)
-
 ## location of CGIs
 CGIDIR='${prefix}/bin'
 AC_ARG_WITH(
@@ -64,66 +47,6 @@
 )
 AC_SUBST(ICONSDIR)
 
-## location of user executables
-BINDIR='${prefix}/bin'
-AC_ARG_WITH(
-    [bindir],
-    AC_HELP_STRING(
-       [--with-bindir=DIR],
-       [user executables in DIR (default ${prefix}/bin). queue and 
bouncequeue programs will be installed in this directory. If sendmail is 
configured to use smrsh (check the mailer prog definition in your 
sendmail.cf), this should point to /etc/smrsh. This is probably the case if 
you are using Linux],
-    ),
-    [BINDIR="$withval"]
-)
-AC_SUBST(BINDIR)
-
-## location of system admin executables
-SBINDIR='${prefix}/bin'
-AC_ARG_WITH(
-    [sbindir],
-    AC_HELP_STRING(
-       [--with-sbindir=DIR],
-       [system admin executables in DIR (default ${prefix}/bin)],
-    ),
-    [SBINDIR="$withval"]
-)
-AC_SUBST(SBINDIR)
-
-## location of program executables
-LIBEXECDIR='${prefix}/bin'
-AC_ARG_WITH(
-    [libexecdir],
-    AC_HELP_STRING(
-       [--with-libexecdir=DIR],
-       [program executables in DIR (default ${prefix}/bin)],
-    ),
-    [LIBEXECDIR="$withval"]
-)
-AC_SUBST(LIBEXECDIR)
-
-## location of Perl modules
-LIBDIR='${prefix}/bin'
-AC_ARG_WITH(
-    [libdir],
-    AC_HELP_STRING(
-       [--with-libdir=DIR],
-       [Perl modules in DIR (default ${prefix}/bin)],
-    ),
-    [LIBDIR="$withval"]
-)
-AC_SUBST(LIBDIR)
-
-## location of default *read-only* data files
-DATADIR='${prefix}/bin/etc'
-AC_ARG_WITH(
-    [datadir],
-    AC_HELP_STRING(
-       [--with-datadir=DIR],
-       [default *read-only* data files in DIR (default ${prefix}/bin/etc)],
-    ),
-    [DATADIR="$withval"]
-)
-AC_SUBST(DATADIR)
-
 ## location of modifiable data files
 EXPLDIR='${prefix}/expl'
 AC_ARG_WITH(
@@ -136,18 +59,6 @@
 )
 AC_SUBST(EXPLDIR)
 
-## location of documentation
-MANDIR='/usr/local/man'
-AC_ARG_WITH(
-    [mandir],
-    AC_HELP_STRING(
-       [--with-mandir=DIR],
-       [documentation in DIR (default /usr/local/man)],
-    ),
-    [MANDIR="$withval"]
-)
-AC_SUBST(MANDIR)
-
 ## SYS V init scripts directory
 INITDIR=/etc/rc.d/init.d
 AC_ARG_WITH(
@@ -184,18 +95,6 @@
 )
 AC_SUBST(PIDDIR)
 
-## directory for Config directories populated by the user
-ETCDIR='${prefix}/etc'
-AC_ARG_WITH(
-    [etcdir],
-    AC_HELP_STRING(
-       [--with-etcdir=DIR],
-       [Config directories populated by the user are in DIR  (default 
${prefix}/etc)],
-    ),
-    [ETCDIR="$withval"]
-)
-AC_SUBST(ETCDIR)
-
 ## directory for language files
 LOCALEDIR='${prefix}/locale'
 AC_ARG_WITH(
@@ -208,30 +107,6 @@
 )
 AC_SUBST(LOCALEDIR)
 
-## directory for Documentation files
-DOCDIR='${prefix}/doc'
-AC_ARG_WITH(
-    docdir,
-    AC_HELP_STRING(
-       [--with-docdir=DIR],
-       [create documentation files in DIR  (default ${prefix}/doc)],
-    ),
-    [DOCDIR="$withval"]
-)
-AC_SUBST(DOCDIR)
-
-## directory for script files
-SCRIPTDIR='${prefix}/bin'
-AC_ARG_WITH(
-    [scriptdir],
-    AC_HELP_STRING(
-       [--with-scriptdir=DIR],
-       [create script files in DIR  (default ${prefix}/bin)],
-    ),
-    [SCRIPTDIR="$withval"]
-)
-AC_SUBST(SCRIPTDIR)
-
 ## directory for sample files
 SAMPLEDIR='${prefix}/sample'
 AC_ARG_WITH(
@@ -366,6 +241,11 @@
 if test -z "$NEWALIASES"; then
     AC_PATH_PROG(NEWALIASES, newaliases)
 fi
+AC_DEFINE_UNQUOTED(
+    NEWALIASES,
+    "$NEWALIASES",
+    [path to newaliases command]
+)
 
 AC_ARG_WITH(
     [newaliases_arg],
@@ -376,6 +256,11 @@
     [NEWALIASES_ARG="$withval"]
 )
 AC_SUBST(NEWALIASES_ARG)
+AC_DEFINE_UNQUOTED(
+    NEWALIASES_ARG,
+    "$NEWALIASES_ARG",
+    [argument to newaliases command]
+)
 
 AC_ARG_WITH(
     [postmap],
@@ -388,6 +273,11 @@
 if test -z "$POSTMAP"; then
     AC_PATH_PROG(POSTMAP, postmap)
 fi
+AC_DEFINE_UNQUOTED(
+    POSTMAP,
+    "$POSTMAP",
+    [path to postmap command]
+)
 
 AC_ARG_WITH(
     [postmap_arg],
@@ -398,6 +288,11 @@
     [POSTMAP_ARG="$withval"]
 )
 AC_SUBST(POSTMAP_ARG)
+AC_DEFINE_UNQUOTED(
+    POSTMAP_ARG,
+    "$POSTMAP_ARG",
+    [argument to postmap command]
+)
 
 USER=sympa
 AC_ARG_WITH(
@@ -443,5 +338,12 @@
 )
 AC_SUBST(VIRTUAL_ALIASES)
 
-AC_CONFIG_FILES([Makefile])
+AC_CONFIG_HEADERS([config.h])
+AC_CONFIG_FILES([
+  Makefile
+  src/Makefile
+  src/etc/Makefile
+  doc/Makefile
+  doc/man8/Makefile
+])
 AC_OUTPUT
diff -Naur sympa-5.3.4-autoconf-cleanup/doc/Makefile 
sympa-5.3.4-use-automake-correctly/doc/Makefile
--- sympa-5.3.4-autoconf-cleanup/doc/Makefile   2008-02-22 00:14:09.000000000 
+0100
+++ sympa-5.3.4-use-automake-correctly/doc/Makefile     1970-01-01 
01:00:00.000000000 +0100
@@ -1,53 +0,0 @@
-# Makefile - This Makefile does the Sympa documentation processing and 
installation
-# RCS Identication ; $Revision: 4420 $ ; $Date: 2007-05-31 10:34:15 +0200 
(jeu, 31 mai 2007) $ 
-#
-# Sympa - SYsteme de Multi-Postage Automatique
-# Copyright (c) 1997, 1998, 1999, 2000, 2001 Comite Reseau des Universites
-# Copyright (c) 1997,1998, 1999 Institut Pasteur & Christophe Wolfhugel
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-
-# Available targets:
-#   - all: generates .ps and .html files
-#
-# Needs:
-#
-# History
-#   1999/04/13 : address@concealed : design of this makefile
-#   1999/04/18 : address@concealed : added index generation
-#   1999/06/24 : address@concealed         : icons are duplicated with html 
(-local_icons)
-#   2007/05/31 : address@concealed         : the source is now the sympa.org wiki
-#
-
-all:   
-       @echo "Since Sympa 5.3 the documentation is only provided in PDF 
format. The source being http://www.sympa.org/wiki/manual";
-
-makedir:
-       @if [ ! -d $(DESTDIR)$(DOCDIR) ]; then \
-               echo "Creating required directory $(DESTDIR)$(DOCDIR)"; \
-               mkdir -p $(DESTDIR)$(DOCDIR); \
-       fi
-
-install: makedir 
-       @for f in sympa.pdf; do \
-               echo "Installing documentation...$(DESTDIR)$(DOCDIR)/$$f"; \
-               cp $$f $(DESTDIR)$(DOCDIR); \
-       done
-       @if [  -d $(DESTDIR)$(DOCDIR)/sympa ]; then \
-               rm -rf $(DESTDIR)$(DOCDIR)/sympa; \
-       fi
-
-
-
diff -Naur sympa-5.3.4-autoconf-cleanup/doc/Makefile.am 
sympa-5.3.4-use-automake-correctly/doc/Makefile.am
--- sympa-5.3.4-autoconf-cleanup/doc/Makefile.am        1970-01-01 
01:00:00.000000000 +0100
+++ sympa-5.3.4-use-automake-correctly/doc/Makefile.am  2008-02-22 
00:16:31.000000000 +0100
@@ -0,0 +1,36 @@
+# Makefile - This Makefile does the Sympa documentation processing and 
installation
+# RCS Identication ; $Revision: 4420 $ ; $Date: 2007-05-31 10:34:15 +0200 
(jeu, 31 mai 2007) $ 
+#
+# Sympa - SYsteme de Multi-Postage Automatique
+# Copyright (c) 1997, 1998, 1999, 2000, 2001 Comite Reseau des Universites
+# Copyright (c) 1997,1998, 1999 Institut Pasteur & Christophe Wolfhugel
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+
+# Available targets:
+#   - all: generates .ps and .html files
+#
+# Needs:
+#
+# History
+#   1999/04/13 : address@concealed : design of this makefile
+#   1999/04/18 : address@concealed : added index generation
+#   1999/06/24 : address@concealed         : icons are duplicated with html 
(-local_icons)
+#   2007/05/31 : address@concealed         : the source is now the sympa.org wiki
+#
+
+dist_pdf_DATA = sympa.pdf
+
+SUBDIRS = man8
diff -Naur sympa-5.3.4-autoconf-cleanup/doc/man8/Makefile 
sympa-5.3.4-use-automake-correctly/doc/man8/Makefile
--- sympa-5.3.4-autoconf-cleanup/doc/man8/Makefile      2008-02-22 
00:14:09.000000000 +0100
+++ sympa-5.3.4-use-automake-correctly/doc/man8/Makefile        1970-01-01 
01:00:00.000000000 +0100
@@ -1,61 +0,0 @@
-## Available catalogues (languages)
-MAN8   =       archived.8 bounced.8 alias_manager.8 sympa.8 
-
-.SUFFIXES:     .8 .pod
-
-.8:    .pod
-
-.pod.8:
-       rm -f $@
-       pod2man --section=8 --center="sympa $(SYMPA_VERSION)" --lax 
--release="$(SYMPA_VERSION)" $< $@
-
-all:   $(MAN8)
-
-clean:
-       rm -f *.8
-
-install: 
-       echo "Please use the main Makefile for installing MAN Page."
-
-newinstall: makedir 
-       @for manfile in $(MAN8); do \
-               echo "Installing man 
pages...$(DESTDIR)$(MANDIR)/man8/$$manfile"; \
-               ( \
-                       PERL=$(PERL); export PERL; \
-                       UMASK=0644; export UMASK; \
-                       DIR=$(DIR); export DIR; \
-                       INSTALLDIR=$(MANDIR)/man8; export INSTALLDIR; \
-                       DESTDIR=$(DESTDIR); export DESTDIR; \
-                       SYMPA_VERSION=$(SYMPA_VERSION); export SYMPA_VERSION; 
\
-                       CONFDIR=$(CONFDIR); export CONFDIR; \
-                       SENDMAIL_ALIASES=$(SENDMAIL_ALIASES); export 
SENDMAIL_ALIASES; \
-                       VIRTUAL_ALIASES=$(VIRTUAL_ALIASES); export 
VIRTUAL_ALIASES; \
-                       MAILERPROGDIR=$(MAILERPROGDIR); export MAILERPROGDIR; 
\
-                       PIDDIR=$(PIDDIR); export PIDDIR; \
-                       SPOOLDIR=$(SPOOLDIR); export SPOOLDIR; \
-                       PIDDIR=$(PIDDIR); export PIDDIR; \
-                       ETCBINDIR=$(ETCBINDIR); export ETCBINDIR; \
-                       $(PERL) ../../subst.pl $$manfile \
-               ) ;\
-       done
-makedir:
-       @if [ ! -d $(DESTDIR)$(MANDIR) ]; then \
-               echo "Creating required directory $(DESTDIR)$(MANDIR)"; \
-               mkdir -p $(DESTDIR)$(MANDIR); \
-       fi
-       @if [ ! -d $(DESTDIR)$(MANDIR)/man8 ]; then \
-               echo "Creating required directory $(DESTDIR)$(MANDIR)/man8"; \
-               mkdir -p $(DESTDIR)$(MANDIR)/man8; \
-       fi
-
-
-
-
-
-
-
-
-
-
-
-
diff -Naur sympa-5.3.4-autoconf-cleanup/doc/man8/Makefile.am 
sympa-5.3.4-use-automake-correctly/doc/man8/Makefile.am
--- sympa-5.3.4-autoconf-cleanup/doc/man8/Makefile.am   1970-01-01 
01:00:00.000000000 +0100
+++ sympa-5.3.4-use-automake-correctly/doc/man8/Makefile.am     2008-02-22 
00:16:37.000000000 +0100
@@ -0,0 +1,8 @@
+man_MANS = archived.8 bounced.8 alias_manager.8 sympa.8
+EXTRA_DIST = $(man_MANS:.8=.pod)
+
+CLEANFILES = $(man_MANS)
+
+.pod.8:
+       pod2man --section=8 --center="sympa $(VERSION)" --lax \
+               --release="$(VERSION)" $< $@
diff -Naur sympa-5.3.4-autoconf-cleanup/Makefile.am 
sympa-5.3.4-use-automake-correctly/Makefile.am
--- sympa-5.3.4-autoconf-cleanup/Makefile.am    2008-02-22 00:14:20.000000000 
+0100
+++ sympa-5.3.4-use-automake-correctly/Makefile.am      2008-02-22 
00:15:39.000000000 +0100
@@ -19,7 +19,7 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
-#SUBDIRS = src doc wwsympa nls
+SUBDIRS = src doc
 
 ChangeLog:
        @CVS2CL@
@@ -53,8 +53,6 @@
 ## Path to OpenSSL
 SSLCERTDIR =   $(EXPL_DIR)/X509-user-certs
 
-CFLAGS =       -g
-
 ##---------- STOP ---------- STOP ---------- STOP ---------- STOP ----------
 
 CONFIG         =       $(CONFDIR)/sympa.conf
@@ -69,8 +67,6 @@
 LOG_SOCKET_TYPE        =       unix
 #endif
 
-all:   warning checkperl checkcpan sources man locale
-
 rpm: build_rh_rpm build_mdk_rpm
 
 warning:
@@ -123,49 +119,10 @@
        fi
 
 
-sources: src/Makefile src/queue.c src/bouncequeue.c src/aliaswrapper.c
-       @echo "Making src"
-       @(cd src && echo "making in src..." && \
-       $(MAKE) SH='${SH}' CC='${CC}' CFLAGS='${CFLAGS}' PERL='${PERL}' \
-       DIR='${DIR}' BINDIR='${BINDIR}' SBINDIR='${SBINDIR}' 
LIBDIR='${LIBDIR}' WWSBINDIR='${WWSBINDIR}' \
-       MAILERPROGDIR='${MAILERPROGDIR}' ETCBINDIR='${ETCBINDIR}' 
ETCDIR='${ETCDIR}' \
-       CONFIG='${CONFIG}' WWSCONFIG='${WWSCONFIG}' \
-       USER='${USER}' GROUP='${GROUP}' \
-       SENDMAIL_ALIASES='${SENDMAIL_ALIASES}' \
-       VIRTUAL_ALIASES='${VIRTUAL_ALIASES}' \
-       NEWALIASES='${NEWALIASES}' NEWALIASES_ARG='${NEWALIASES_ARG}' \
-       POSTMAP='${POSTMAP}' POSTMAP_ARG='${POSTMAP_ARG}' \
-       PIDPRE='${PIDPRE}' PIDPOST='${PIDPOST}' LOCKDIR='${LOCKDIR}');
-
-documentation: doc/sympa.tex.tpl doc/Makefile 
-       @echo "Making documentation"
-       @(cd doc && echo "making in doc/..." && \
-       $(MAKE) SH='${SH}' CC='${CC}' CFLAGS='${CFLAGS}' PERL='${PERL}' 
CGIDIR='${CGIDIR}' \
-       DIR='${DIR}' BINDIR='${BINDIR}' SBINDIR='${SBINDIR}' 
LIBDIR='${LIBDIR}' WWSBINDIR='${WWSBINDIR}' \
-       MAILERPROGDIR='${MAILERPROGDIR}' ETCBINDIR='${ETCBINDIR}' 
ETCDIR='${ETCDIR}' PIDDIR='${PIDDIR}' \
-       CONFIG='${CONFIG}' WWSCONFIG='${WWSCONFIG}' EXPL_DIR='${EXPL_DIR}' 
LOCALEDIR='${LOCALEDIR}' SPOOLDIR='${SPOOLDIR}' \
-       SCRIPTDIR='${SCRIPTDIR}' \
-       USER='${USER}' GROUP='${GROUP}');
-
-man: doc/man8/Makefile
-       @echo "Making man"
-       @(cd doc/man8 && echo "making in doc/man8/..." && \
-       $(MAKE) SYMPA_VERSION='$(SYMPA_VERSION)');
-
 checkcpan: 
        @echo "Checking needed CPAN modules ..."
        $(PERL) ./check_perl_modules.pl
 
-clean:
-       find . \( -name ".#*" -o -name "*~" -o -name ".*~" -o -name "#*#" \) 
-exec  rm -f {} \;
-       @for i in src wwsympa src/etc/sample;\
-       do \
-       (cd $$i && echo "making clean in $$i..." && \
-       $(MAKE) PERL='${PERL}' clean) || exit 1; \
-       done;
-
-install: importantchanges installdir installsrc installwws installwebtt2 
installmailtt2 installlocale installman installscript installsample 
installconfig installdoc installsoap nextstep
-
 nextstep: 
        @echo ""
        @echo "#########################################################"
diff -Naur sympa-5.3.4-autoconf-cleanup/src/etc/Makefile.am 
sympa-5.3.4-use-automake-correctly/src/etc/Makefile.am
--- sympa-5.3.4-autoconf-cleanup/src/etc/Makefile.am    1970-01-01 
01:00:00.000000000 +0100
+++ sympa-5.3.4-use-automake-correctly/src/etc/Makefile.am      2008-02-22 
00:16:23.000000000 +0100
@@ -0,0 +1,137 @@
+# Makefile - This Makefile builds and installs Sympa sources
+# RCS Identication ; $Revision: 4190 $ ; $Date: 2007-03-19 10:53:17 +0100 
(lun, 19 mar 2007) $ 
+#
+# Sympa - SYsteme de Multi-Postage Automatique
+# Copyright (c) 1997, 1998, 1999, 2000, 2001 Comite Reseau des Universites
+# Copyright (c) 1997,1998, 1999 Institut Pasteur & Christophe Wolfhugel
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+
+SUBDIRS = etc
+
+pkgsysconfdir = $(sysconfdir)/$(PACKAGE)
+libpkgdatadir = $(pkgdatadir)/lib
+edit = sed \
+        -e 's,@pkgsysconfdir\@,$(pkgsysconfdir),g' \
+        -e 's,@libpkgdatadir\@,$(libpkgdatadir),g' \
+        -e 's,@sbindir\@,$(sbindir),g' \
+        -e 's,@PERL\@,$(PERL),g' \
+        -e 's,@VERSION\@,$(VERSION),g'
+
+bin_PROGRAMS  = queue bouncequeue familyqueue
+sbin_PROGRAMS = aliaswrapper virtualwrapper
+sbin_SCRIPTS  = sympa.pl alias_manager.pl task_manager.pl sympa_wizard.pl
+
+libpkgdata_DATA = admin.pm Archive.pm Commands.pm Conf.pm CAS.pm \
+                 Config_XML.pm Family.pm Language.pm List.pm Log.pm \
+                 mail.pm Ldap.pm Upgrade.pm tools.pl Version.pm Fetch.pm \
+                 Message.pm Task.pm Datasource.pm SQLSource.pm \
+                 LDAPSource.pm PlainDigest.pm tt2.pl parser.pl \
+                 report.pm time_utils.pl Lock.pm
+
+nosubst_modules = Archive.pm CAS.pm Config_XML.pm Language.pm Log.pm \
+                 mail.pm Ldap.pm Fetch.pm Message.pm Task.pm Datasource.pm \
+                 SQLSource.pm LDAPSource.pm PlainDigest.pm tt2.pl parser.pl \
+                 report.pm time_utils.pl Lock.pm
+subst_modules   = admin.pm Commands.pm Conf.pm Family.pm List.pm Upgrade.pm \
+                 tools.pl Version.pm
+
+EXTRA_DIST = $(nosubst_modules) \
+            $(subst_modules:.pm=.pm.in) \
+            $(sbin_SCRIPTS:.pl=.pl.in) \
+            tools.pl.in
+
+CLEANFILES = $(sbin_SCRIPTS) $(subst_modules)
+
+queue_SOURCES          = queue.c
+bouncequeue_SOURCES    = bouncequeue.c
+familyqueue_SOURCES    = familyqueue.c
+aliaswrapper_SOURCES   = aliaswrapper.c
+virtualwrapper_SOURCES = virtualwrapper.c
+
+AM_CPPFLAGS = -DCONFIG=\"$(pkgsysconfdir)\"
+
+sympa.pl: Makefile $(srcdir)/sympa.pl.in
+       rm -f sympa.pl
+       $(edit) $(srcdir)/sympa.pl.in > sympa.pl
+       chmod +x sympa.pl
+
+alias_manager.pl: Makefile $(srcdir)/alias_manager.pl.in
+       rm -f alias_manager.pl
+       $(edit) $(srcdir)/alias_manager.pl.in > alias_manager.pl
+       chmod +x alias_manager.pl
+
+task_manager.pl: Makefile $(srcdir)/task_manager.pl.in
+       rm -f task_manager.pl
+       $(edit) $(srcdir)/task_manager.pl.in > task_manager.pl
+       chmod +x task_manager.pl
+
+sympa_wizard.pl: Makefile $(srcdir)/sympa_wizard.pl.in
+       rm -f sympa_wizard.pl
+       $(edit) $(srcdir)/sympa_wizard.pl.in > sympa_wizard.pl
+       chmod +x sympa_wizard.pl
+
+Version.pm: Makefile $(srcdir)/Version.pm.in
+       rm -f Version.pm
+       $(edit) $(srcdir)/Version.pm.in > List.pm
+
+Family.pm: Makefile $(srcdir)/Family.pm.in
+       rm -f Family.pm
+       $(edit) $(srcdir)/Family.pm.in > Family.pm
+
+List.pm: Makefile $(srcdir)/List.pm.in
+       rm -f List.pm
+       $(edit) $(srcdir)/List.pm.in > List.pm
+
+Conf.pm: Makefile $(srcdir)/Conf.pm.in
+       rm -f Conf.pm
+       $(edit) $(srcdir)/Conf.pm.in > Conf.pm
+
+Commands.pm: Makefile $(srcdir)/Commands.pm.in
+       rm -f Commands.pm
+       $(edit) $(srcdir)/Commands.pm.in > Commands.pm
+
+Upgrade.pm: Makefile $(srcdir)/Upgrade.pm.in
+       rm -f Upgrade.pm
+       $(edit) $(srcdir)/Upgrade.pm.in > Upgrade.pm
+
+admin.pm: Makefile $(srcdir)/admin.pm.in
+       rm -f admin.pm
+       $(edit) $(srcdir)/admin.pm.in > admin.pm
+
+tools.pl: Makefile $(srcdir)/tools.pl.in
+       rm -f tools.pl
+       $(edit) $(srcdir)/tools.pl.in > tools.pl
+
+installtask_models:
+       @echo "Installing default task models ..."
+       cp -pR etc/list_task_models/* $(DESTDIR)$(ETCBINDIR)/list_task_models
+
+installgeneral_task_models:
+       @echo "Installing general task models ..."
+       cp -pR etc/global_task_models/* 
$(DESTDIR)$(ETCBINDIR)/global_task_models
+
+installlisttemplates:
+       @echo "Installing default list templates ..."
+       cp -pR etc/create_list_templates/* 
$(DESTDIR)$(ETCBINDIR)/create_list_templates
+
+installfamilies:
+       @echo "Installing default list families ..."
+       cp -pR etc/families/* $(DESTDIR)$(ETCBINDIR)/families
+
+installscenari:
+       @echo "Installing default scenari..."
+       cp etc/scenari/*.* $(DESTDIR)$(ETCBINDIR)/scenari
+       $(PERL) ../set_symlinks.pl scenari $(DESTDIR)$(ETCBINDIR)/scenari
diff -Naur sympa-5.3.4-autoconf-cleanup/src/Makefile 
sympa-5.3.4-use-automake-correctly/src/Makefile
--- sympa-5.3.4-autoconf-cleanup/src/Makefile   2008-02-22 00:14:09.000000000 
+0100
+++ sympa-5.3.4-use-automake-correctly/src/Makefile     1970-01-01 
01:00:00.000000000 +0100
@@ -1,279 +0,0 @@
-# Makefile - This Makefile builds and installs Sympa sources
-# RCS Identication ; $Revision: 4190 $ ; $Date: 2007-03-19 10:53:17 +0100 
(lun, 19 mar 2007) $ 
-#
-# Sympa - SYsteme de Multi-Postage Automatique
-# Copyright (c) 1997, 1998, 1999, 2000, 2001 Comite Reseau des Universites
-# Copyright (c) 1997,1998, 1999 Institut Pasteur & Christophe Wolfhugel
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-
-CDEFS  =       -DCONFIG=\"$(CONFIG)\"
-
-sbin_SRC       =       sympa.pl alias_manager.pl task_manager.pl 
sympa_wizard.pl
-
-bin_SRC                =       queue bouncequeue familyqueue
-
-lib_SRC                =       admin.pm Archive.pm Commands.pm Conf.pm 
CAS.pm Config_XML.pm \
-                       Family.pm Language.pm List.pm Log.pm mail.pm Ldap.pm 
Upgrade.pm \
-                       tools.pl Version.pm Fetch.pm Message.pm Task.pm 
Datasource.pm SQLSource.pm \
-                       LDAPSource.pm \
-                       PlainDigest.pm tt2.pl parser.pl report.pm 
time_utils.pl Lock.pm
-
-libexec_SRC    =       aliaswrapper virtualwrapper
-
-all:   queue bouncequeue familyqueue aliaswrapper virtualwrapper
-
-clean:
-       @if [ -f ./queue ]; then \
-               rm queue ; \
-       fi      
-       @if [ -f ./bouncequeue ]; then \
-               rm bouncequeue ; \
-       fi
-       @if [ -f ./familyqueue ]; then \
-               rm familyqueue ; \
-       fi
-       @if [ -f ./aliaswrapper ]; then \
-               rm aliaswrapper ; \
-       fi
-       @if [ -f ./virtualwrapper ]; then \
-               rm virtualwrapper ; \
-       fi
-
-install: 
-       echo "Please use the main Makefile for installing sources."
-
-newinstall: makedir subst $(sbin_SRC) $(lib_SRC) installqueue installwrapper 
installscenari installtask_models installetc installlisttemplates installmod 
installgeneral_task_models info
-
-
-installtask_models:
-       @echo "Installing default task models ..."
-       cp -pR etc/list_task_models/* $(DESTDIR)$(ETCBINDIR)/list_task_models
-
-installgeneral_task_models:
-       @echo "Installing general task models ..."
-       cp -pR etc/global_task_models/* 
$(DESTDIR)$(ETCBINDIR)/global_task_models
-
-installetc:
-       @echo "Installing default configuration ..."
-       cp etc/*.conf etc/*.crt $(DESTDIR)$(ETCBINDIR)/
-       @( \
-               UMASK=0664; export UMASK;\
-               INSTALLDIR=$(ETCBINDIR); export INSTALLDIR;\
-               DESTDIR=$(DESTDIR); export DESTDIR;\
-               DARK_COLOR=$(DARK_COLOR); export DARK_COLOR;\
-               LIGHT_COLOR=$(LIGHT_COLOR); export LIGHT_COLOR;\
-               BG_COLOR=$(BG_COLOR); export BG_COLOR;\
-               TEXT_COLOR=$(TEXT_COLOR); export TEXT_COLOR;\
-               ERROR_COLOR=$(ERROR_COLOR); export ERROR_COLOR;\
-               SHADED_COLOR=$(SHADED_COLOR); export SHADED_COLOR;\
-               cd etc;\
-               $(PERL) ../../subst.pl mhonarc-ressources.tt2 README \
-       )
-       @( \
-               UMASK=0664; export UMASK;\
-               INSTALLDIR=$(ETCBINDIR); export INSTALLDIR;\
-               MAILERPROGDIR=$(MAILERPROGDIR); export MAILERPROGDIR;\
-               cd etc;\
-               $(PERL) ../../subst.pl list_aliases.tt2 \
-       )
-
-installlisttemplates:
-       @echo "Installing default list templates ..."
-       cp -pR etc/create_list_templates/* 
$(DESTDIR)$(ETCBINDIR)/create_list_templates
-
-installfamilies:
-       @echo "Installing default list families ..."
-       cp -pR etc/families/* $(DESTDIR)$(ETCBINDIR)/families
-
-installscenari:
-       @echo "Installing default scenari..."
-       cp etc/scenari/*.* $(DESTDIR)$(ETCBINDIR)/scenari
-       $(PERL) ../set_symlinks.pl scenari $(DESTDIR)$(ETCBINDIR)/scenari
-
-installqueue:
-       @echo "Installing Queue binary..."
-       cp queue $(DESTDIR)$(MAILERPROGDIR)/
-       @echo "Installing BounceQueue binary..."
-       cp bouncequeue $(DESTDIR)$(MAILERPROGDIR)/
-       @echo "Installing FamilyQueue binary..."
-       cp familyqueue $(DESTDIR)$(MAILERPROGDIR)/
-
-installwrapper:
-       @echo "Installing AliasWrapper binary..."
-       cp aliaswrapper $(DESTDIR)$(LIBEXECDIR)/
-       @echo "Installing VirtualWrapper binary..."
-       cp virtualwrapper $(DESTDIR)$(LIBEXECDIR)/
-
-makedir:
-       @if [ ! -d $(DESTDIR)$(MAILERPROGDIR) ]; then \
-               echo "Creating required directory 
$(DESTDIR)$(MAILERPROGDIR)"; \
-               mkdir -p $(DESTDIR)$(MAILERPROGDIR); \
-       fi
-       @if [ ! -d $(DESTDIR)$(LIBEXECDIR) ]; then \
-               echo "Creating required directory $(DESTDIR)$(LIBEXECDIR)"; \
-               mkdir -p $(DESTDIR)$(LIBEXECDIR); \
-       fi
-       @if [ ! -d $(DESTDIR)$(BINDIR) ]; then \
-               echo "Creating required directory $(DESTDIR)$(BINDIR)"; \
-               mkdir -p $(DESTDIR)$(BINDIR); \
-       fi
-       @if [ ! -d $(DESTDIR)$(SBINDIR) ]; then \
-               echo "Creating required directory $(DESTDIR)$(SBINDIR)"; \
-               mkdir -p $(DESTDIR)$(SBINDIR); \
-       fi
-       @if [ ! -d $(DESTDIR)$(LIBDIR) ]; then \
-               echo "Creating required directory $(DESTDIR)$(LIBDIR)"; \
-               mkdir -p $(DESTDIR)$(LIBDIR); \
-       fi
-       @if [ ! -d $(DESTDIR)$(ETCBINDIR) ]; then \
-               echo "Creating required directory 
$(DESTDIR)$(ETCBINDIR)/etc"; \
-               mkdir -p $(DESTDIR)$(ETCBINDIR); \
-       fi
-       @if [ ! -d $(DESTDIR)$(ETCBINDIR)/scenari ]; then \
-               echo "Creating required directory 
$(DESTDIR)$(ETCBINDIR)/scenari"; \
-               mkdir $(DESTDIR)$(ETCBINDIR)/scenari; \
-       fi
-       @if [ ! -d $(DESTDIR)$(ETCBINDIR)/create_list_templates ]; then \
-               echo "Creating required directory 
$(DESTDIR)$(ETCBINDIR)/create_list_templates"; \
-               mkdir $(DESTDIR)$(ETCBINDIR)/create_list_templates; \
-       fi
-       @if [ ! -d $(DESTDIR)$(ETCBINDIR)/families ]; then \
-               echo "Creating required directory 
$(DESTDIR)$(ETCBINDIR)/families"; \
-               mkdir $(DESTDIR)$(ETCBINDIR)/families; \
-       fi
-       @if [ ! -d $(DESTDIR)$(ETCBINDIR)/list_task_models ]; then \
-               echo "Creating required directory 
$(DESTDIR)$(ETCBINDIR)/list_task_models"; \
-               mkdir $(DESTDIR)$(ETCBINDIR)/list_task_models; \
-       fi
-       @if [ ! -d $(DESTDIR)$(ETCBINDIR)/global_task_models ]; then \
-               echo "Creating required directory 
$(DESTDIR)$(ETCBINDIR)/global_task_models"; \
-               mkdir $(DESTDIR)$(ETCBINDIR)/global_task_models; \
-       fi
-
-installmod:
-       @echo "Setting group and owner for $(DESTDIR)$(SBINDIR)..."
-       @for file in $(sbin_SRC) ; do \
-               chown $(USER) $(DESTDIR)$(SBINDIR)/$$file; \
-               chgrp $(GROUP) $(DESTDIR)$(SBINDIR)/$$file; \
-       done
-       @echo "Setting group and owner for $(DESTDIR)$(LIBDIR)..."
-       @for file in $(lib_SRC) ; do \
-               chown $(USER) $(DESTDIR)$(LIBDIR)/$$file; \
-               chgrp $(GROUP) $(DESTDIR)$(LIBDIR)/$$file; \
-       done
-       chown -R $(USER) $(DESTDIR)$(ETCBINDIR)
-       chgrp -R $(GROUP) $(DESTDIR)$(ETCBINDIR)
-       @echo "Setting privileges..."
-       chmod 755 $(DESTDIR)$(SBINDIR) $(DESTDIR)$(ETCBINDIR) 
-       chmod 755 $(DESTDIR)$(ETCBINDIR)/scenari 
$(DESTDIR)$(ETCBINDIR)/list_task_models 
$(DESTDIR)$(ETCBINDIR)/global_task_models
-       chmod 755 $(DESTDIR)$(ETCBINDIR)/create_list_templates
-       chmod 755 $(DESTDIR)$(ETCBINDIR)/families
-       chmod 644 $(DESTDIR)$(ETCBINDIR)/*.conf $(DESTDIR)$(ETCBINDIR)/*.crt 
-       chmod 600 $(DESTDIR)$(ETCBINDIR)/ca-bundle.crt
-       @for file in $(bin_SRC) ; do \
-               chown $(USER) $(DESTDIR)$(MAILERPROGDIR)/$$file; \
-               chgrp $(GROUP) $(DESTDIR)$(MAILERPROGDIR)/$$file; \
-               chmod 4755 $(DESTDIR)$(MAILERPROGDIR)/$$file; \
-       done
-       @for file in $(libexec_SRC) ; do \
-               chown root $(DESTDIR)$(LIBEXECDIR)/$$file; \
-               chgrp $(GROUP) $(DESTDIR)$(LIBEXECDIR)/$$file; \
-               chmod 4750 $(DESTDIR)$(LIBEXECDIR)/$$file; \
-       done
-
-queue: queue.c Makefile ../Makefile
-       $(CC) $(CFLAGS) $(CDEFS) -o queue queue.c
-
-bouncequeue: bouncequeue.c Makefile ../Makefile
-       $(CC) $(CFLAGS) $(CDEFS) -o bouncequeue bouncequeue.c
-
-familyqueue: familyqueue.c Makefile ../Makefile
-       $(CC) $(CFLAGS) $(CDEFS) -o familyqueue familyqueue.c
-
-aliaswrapper: aliaswrapper.c Makefile ../Makefile
-       $(CC) $(CFLAGS) $(CDEFS) -DNEWALIASES=\"${NEWALIASES}\" \
-               -DNEWALIASES_ARG=\"${NEWALIASES_ARG}\" -o aliaswrapper 
aliaswrapper.c
-
-virtualwrapper: virtualwrapper.c Makefile ../Makefile
-       $(CC) $(CFLAGS) $(CDEFS) -DPOSTMAP=\"${POSTMAP}\" \
-               -DPOSTMAP_ARG=\"${POSTMAP_ARG}\" -o virtualwrapper 
virtualwrapper.c
-
-subst:
-       @echo "Doing multiple substitutions while installing binaries..."
-       @( \
-               PERL=$(PERL); export PERL;\
-               UMASK=0755; export UMASK;\
-               USER=$(USER); export USER;\
-               GROUP=$(GROUP); export GROUP;\
-               HOST=$(HOST); export HOST;\
-               DIR=$(DIR); export DIR;\
-               DESTDIR=$(DESTDIR); export DESTDIR;\
-               PIDDIR=$(PIDDIR); export PIDDIR;\
-               INSTALLDIR=$(SBINDIR); export INSTALLDIR;\
-               SBINDIR=$(SBINDIR); export SBINDIR;\
-               LIBDIR=$(LIBDIR); export LIBDIR;\
-               NLSDIR=$(NLSDIR); export NLSDIR;\
-               ETCBINDIR=$(ETCBINDIR); export ETCBINDIR;\
-               ETCDIR=$(ETCDIR); export ETCDIR;\
-               EXPLDIR=$(EXPLDIR); export EXPLDIR;\
-               CONFIG=$(CONFIG); export CONFIG;\
-               SYMPA_VERSION=$(SYMPA_VERSION); export SYMPA_VERSION;\
-               SENDMAIL_ALIASES=$(SENDMAIL_ALIASES); export 
SENDMAIL_ALIASES;\
-               VIRTUAL_ALIASES=$(VIRTUAL_ALIASES); export VIRTUAL_ALIASES;\
-               SPOOLDIR=$(SPOOLDIR); export SPOOLDIR;\
-               COOKIE=$(COOKIE); export COOKIE;\
-               $(PERL) ../subst.pl $(sbin_SRC) \
-       )
-       @echo "Doing multiple substitutions while installing libraries ..."
-       @( \
-               PERL=$(PERL); export PERL;\
-               UMASK=0644; export UMASK;\
-               USER=$(USER); export USER;\
-               GROUP=$(GROUP); export GROUP;\
-               DIR=$(DIR); export DIR;\
-               DESTDIR=$(DESTDIR); export DESTDIR;\
-               PIDDIR=$(PIDDIR); export PIDDIR;\
-               INSTALLDIR=$(LIBDIR); export INSTALLDIR;\
-               SCRIPTDIR=$(SCRIPTDIR); export SCRIPTDIR;\
-               SBINDIR=$(SBINDIR); export SBINDIR;\
-               LIBDIR=$(LIBDIR); export LIBDIR;\
-               ETCBINDIR=$(ETCBINDIR); export ETCBINDIR;\
-               ETCDIR=$(ETCDIR); export ETCDIR;\
-               CONFIG=$(CONFIG); export CONFIG;\
-               SYMPA_VERSION=$(SYMPA_VERSION); export SYMPA_VERSION;\
-               SENDMAIL_ALIASES=$(SENDMAIL_ALIASES); export 
SENDMAIL_ALIASES;\
-               VIRTUAL_ALIASES=$(VIRTUAL_ALIASES); export VIRTUAL_ALIASES;\
-               $(PERL) ../subst.pl $(lib_SRC) \
-       )
-
-## Dépendances
-queue:         queue.c Makefile
-
-bouncequeue:   bouncequeue.c Makefile
-
-familyqueue:   familyqueue.c Makefile
-
-info:
-       @echo ""
-       @echo "If you wish, you can contact the authors 
address@concealed"
-       @echo "Thanks to provide release number, operating system and langage 
used."
-       @echo ""
-
-
-
-
-
-
diff -Naur sympa-5.3.4-autoconf-cleanup/src/Makefile.am 
sympa-5.3.4-use-automake-correctly/src/Makefile.am
--- sympa-5.3.4-autoconf-cleanup/src/Makefile.am        1970-01-01 
01:00:00.000000000 +0100
+++ sympa-5.3.4-use-automake-correctly/src/Makefile.am  2008-02-22 
00:15:45.000000000 +0100
@@ -0,0 +1,137 @@
+# Makefile - This Makefile builds and installs Sympa sources
+# RCS Identication ; $Revision: 4190 $ ; $Date: 2007-03-19 10:53:17 +0100 
(lun, 19 mar 2007) $ 
+#
+# Sympa - SYsteme de Multi-Postage Automatique
+# Copyright (c) 1997, 1998, 1999, 2000, 2001 Comite Reseau des Universites
+# Copyright (c) 1997,1998, 1999 Institut Pasteur & Christophe Wolfhugel
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+
+SUBDIRS = etc
+
+pkgsysconfdir = $(sysconfdir)/$(PACKAGE)
+libpkgdatadir = $(pkgdatadir)/lib
+edit = sed \
+        -e 's,@pkgsysconfdir\@,$(pkgsysconfdir),g' \
+        -e 's,@libpkgdatadir\@,$(libpkgdatadir),g' \
+        -e 's,@sbindir\@,$(sbindir),g' \
+        -e 's,@PERL\@,$(PERL),g' \
+        -e 's,@VERSION\@,$(VERSION),g'
+
+bin_PROGRAMS  = queue bouncequeue familyqueue
+sbin_PROGRAMS = aliaswrapper virtualwrapper
+sbin_SCRIPTS  = sympa.pl alias_manager.pl task_manager.pl sympa_wizard.pl
+
+libpkgdata_DATA = admin.pm Archive.pm Commands.pm Conf.pm CAS.pm \
+                 Config_XML.pm Family.pm Language.pm List.pm Log.pm \
+                 mail.pm Ldap.pm Upgrade.pm tools.pl Version.pm Fetch.pm \
+                 Message.pm Task.pm Datasource.pm SQLSource.pm \
+                 LDAPSource.pm PlainDigest.pm tt2.pl parser.pl \
+                 report.pm time_utils.pl Lock.pm
+
+nosubst_modules = Archive.pm CAS.pm Config_XML.pm Language.pm Log.pm \
+                 mail.pm Ldap.pm Fetch.pm Message.pm Task.pm Datasource.pm \
+                 SQLSource.pm LDAPSource.pm PlainDigest.pm tt2.pl parser.pl \
+                 report.pm time_utils.pl Lock.pm
+subst_modules   = admin.pm Commands.pm Conf.pm Family.pm List.pm Upgrade.pm \
+                 tools.pl Version.pm
+
+EXTRA_DIST = $(nosubst_modules) \
+            $(subst_modules:.pm=.pm.in) \
+            $(sbin_SCRIPTS:.pl=.pl.in) \
+            tools.pl.in
+
+CLEANFILES = $(sbin_SCRIPTS) $(subst_modules)
+
+queue_SOURCES          = queue.c
+bouncequeue_SOURCES    = bouncequeue.c
+familyqueue_SOURCES    = familyqueue.c
+aliaswrapper_SOURCES   = aliaswrapper.c
+virtualwrapper_SOURCES = virtualwrapper.c
+
+AM_CPPFLAGS = -DCONFIG=\"$(pkgsysconfdir)\"
+
+sympa.pl: Makefile $(srcdir)/sympa.pl.in
+       rm -f sympa.pl
+       $(edit) $(srcdir)/sympa.pl.in > sympa.pl
+       chmod +x sympa.pl
+
+alias_manager.pl: Makefile $(srcdir)/alias_manager.pl.in
+       rm -f alias_manager.pl
+       $(edit) $(srcdir)/alias_manager.pl.in > alias_manager.pl
+       chmod +x alias_manager.pl
+
+task_manager.pl: Makefile $(srcdir)/task_manager.pl.in
+       rm -f task_manager.pl
+       $(edit) $(srcdir)/task_manager.pl.in > task_manager.pl
+       chmod +x task_manager.pl
+
+sympa_wizard.pl: Makefile $(srcdir)/sympa_wizard.pl.in
+       rm -f sympa_wizard.pl
+       $(edit) $(srcdir)/sympa_wizard.pl.in > sympa_wizard.pl
+       chmod +x sympa_wizard.pl
+
+Version.pm: Makefile $(srcdir)/Version.pm.in
+       rm -f Version.pm
+       $(edit) $(srcdir)/Version.pm.in > List.pm
+
+Family.pm: Makefile $(srcdir)/Family.pm.in
+       rm -f Family.pm
+       $(edit) $(srcdir)/Family.pm.in > Family.pm
+
+List.pm: Makefile $(srcdir)/List.pm.in
+       rm -f List.pm
+       $(edit) $(srcdir)/List.pm.in > List.pm
+
+Conf.pm: Makefile $(srcdir)/Conf.pm.in
+       rm -f Conf.pm
+       $(edit) $(srcdir)/Conf.pm.in > Conf.pm
+
+Commands.pm: Makefile $(srcdir)/Commands.pm.in
+       rm -f Commands.pm
+       $(edit) $(srcdir)/Commands.pm.in > Commands.pm
+
+Upgrade.pm: Makefile $(srcdir)/Upgrade.pm.in
+       rm -f Upgrade.pm
+       $(edit) $(srcdir)/Upgrade.pm.in > Upgrade.pm
+
+admin.pm: Makefile $(srcdir)/admin.pm.in
+       rm -f admin.pm
+       $(edit) $(srcdir)/admin.pm.in > admin.pm
+
+tools.pl: Makefile $(srcdir)/tools.pl.in
+       rm -f tools.pl
+       $(edit) $(srcdir)/tools.pl.in > tools.pl
+
+installtask_models:
+       @echo "Installing default task models ..."
+       cp -pR etc/list_task_models/* $(DESTDIR)$(ETCBINDIR)/list_task_models
+
+installgeneral_task_models:
+       @echo "Installing general task models ..."
+       cp -pR etc/global_task_models/* 
$(DESTDIR)$(ETCBINDIR)/global_task_models
+
+installlisttemplates:
+       @echo "Installing default list templates ..."
+       cp -pR etc/create_list_templates/* 
$(DESTDIR)$(ETCBINDIR)/create_list_templates
+
+installfamilies:
+       @echo "Installing default list families ..."
+       cp -pR etc/families/* $(DESTDIR)$(ETCBINDIR)/families
+
+installscenari:
+       @echo "Installing default scenari..."
+       cp etc/scenari/*.* $(DESTDIR)$(ETCBINDIR)/scenari
+       $(PERL) ../set_symlinks.pl scenari $(DESTDIR)$(ETCBINDIR)/scenari