Relevant BUGIDs: none

Purpose of commit: new feature

Commit summary:
---------------

2. round of automake/autoconf/libtool changes

57 files changed, 383 insertions, 370 deletions

diff --git a/.cvsignore b/.cvsignore
index 0cb2d265..ab5defb1 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -9,3 +9,5 @@ config.log
 config.cache
 _pam_aconf.h
 Make.Rules
+Makefile
+Makefile.in
diff --git a/COPYING b/COPYING
new file mode 100644
index 00000000..2f27a2ee
--- /dev/null
+++ b/COPYING
@@ -0,0 +1,41 @@
+Unless otherwise *explicitly* stated the following text describes the
+licensed conditions under which the contents of this Linux-PAM release
+may be distributed:
+
+-------------------------------------------------------------------------
+Redistribution and use in source and binary forms of Linux-PAM, with
+or without modification, are permitted provided that the following
+conditions are met:
+
+1. Redistributions of source code must retain any existing copyright
+   notice, and this entire permission notice in its entirety,
+   including the disclaimer of warranties.
+
+2. Redistributions in binary form must reproduce all prior and current
+   copyright notices, this list of conditions, and the following
+   disclaimer in the documentation and/or other materials provided
+   with the distribution.
+
+3. The name of any author may not be used to endorse or promote
+   products derived from this software without their specific prior
+   written permission.
+
+ALTERNATIVELY, this product may be distributed under the terms of the
+GNU General Public License, in which case the provisions of the GNU
+GPL are required INSTEAD OF the above restrictions.  (This clause is
+necessary due to a potential conflict between the GNU GPL and the
+restrictions contained in a BSD-style copyright.)
+
+THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED
+WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+IN NO EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
+OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR
+TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
+USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+DAMAGE.
+-------------------------------------------------------------------------
+
diff --git a/INSTALL b/INSTALL
new file mode 100644
index 00000000..56b077d6
--- /dev/null
+++ b/INSTALL
@@ -0,0 +1,236 @@
+Installation Instructions
+*************************
+
+Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005 Free
+Software Foundation, Inc.
+
+This file is free documentation; the Free Software Foundation gives
+unlimited permission to copy, distribute and modify it.
+
+Basic Installation
+==================
+
+These are generic installation instructions.
+
+   The `configure' shell script attempts to guess correct values for
+various system-dependent variables used during compilation.  It uses
+those values to create a `Makefile' in each directory of the package.
+It may also create one or more `.h' files containing system-dependent
+definitions.  Finally, it creates a shell script `config.status' that
+you can run in the future to recreate the current configuration, and a
+file `config.log' containing compiler output (useful mainly for
+debugging `configure').
+
+   It can also use an optional file (typically called `config.cache'
+and enabled with `--cache-file=config.cache' or simply `-C') that saves
+the results of its tests to speed up reconfiguring.  (Caching is
+disabled by default to prevent problems with accidental use of stale
+cache files.)
+
+   If you need to do unusual things to compile the package, please try
+to figure out how `configure' could check whether to do them, and mail
+diffs or instructions to the address given in the `README' so they can
+be considered for the next release.  If you are using the cache, and at
+some point `config.cache' contains results you don't want to keep, you
+may remove or edit it.
+
+   The file `configure.ac' (or `configure.in') is used to create
+`configure' by a program called `autoconf'.  You only need
+`configure.ac' if you want to change it or regenerate `configure' using
+a newer version of `autoconf'.
+
+The simplest way to compile this package is:
+
+  1. `cd' to the directory containing the package's source code and type
+     `./configure' to configure the package for your system.  If you're
+     using `csh' on an old version of System V, you might need to type
+     `sh ./configure' instead to prevent `csh' from trying to execute
+     `configure' itself.
+
+     Running `configure' takes awhile.  While running, it prints some
+     messages telling which features it is checking for.
+
+  2. Type `make' to compile the package.
+
+  3. Optionally, type `make check' to run any self-tests that come with
+     the package.
+
+  4. Type `make install' to install the programs and any data files and
+     documentation.
+
+  5. You can remove the program binaries and object files from the
+     source code directory by typing `make clean'.  To also remove the
+     files that `configure' created (so you can compile the package for
+     a different kind of computer), type `make distclean'.  There is
+     also a `make maintainer-clean' target, but that is intended mainly
+     for the package's developers.  If you use it, you may have to get
+     all sorts of other programs in order to regenerate files that came
+     with the distribution.
+
+Compilers and Options
+=====================
+
+Some systems require unusual options for compilation or linking that the
+`configure' script does not know about.  Run `./configure --help' for
+details on some of the pertinent environment variables.
+
+   You can give `configure' initial values for configuration parameters
+by setting variables in the command line or in the environment.  Here
+is an example:
+
+     ./configure CC=c89 CFLAGS=-O2 LIBS=-lposix
+
+   *Note Defining Variables::, for more details.
+
+Compiling For Multiple Architectures
+====================================
+
+You can compile the package for more than one kind of computer at the
+same time, by placing the object files for each architecture in their
+own directory.  To do this, you must use a version of `make' that
+supports the `VPATH' variable, such as GNU `make'.  `cd' to the
+directory where you want the object files and executables to go and run
+the `configure' script.  `configure' automatically checks for the
+source code in the directory that `configure' is in and in `..'.
+
+   If you have to use a `make' that does not support the `VPATH'
+variable, you have to compile the package for one architecture at a
+time in the source code directory.  After you have installed the
+package for one architecture, use `make distclean' before reconfiguring
+for another architecture.
+
+Installation Names
+==================
+
+By default, `make install' will install the package's files in
+`/usr/local/bin', `/usr/local/man', etc.  You can specify an
+installation prefix other than `/usr/local' by giving `configure' the
+option `--prefix=PREFIX'.
+
+   You can specify separate installation prefixes for
+architecture-specific files and architecture-independent files.  If you
+give `configure' the option `--exec-prefix=PREFIX', the package will
+use PREFIX as the prefix for installing programs and libraries.
+Documentation and other data files will still use the regular prefix.
+
+   In addition, if you use an unusual directory layout you can give
+options like `--bindir=DIR' to specify different values for particular
+kinds of files.  Run `configure --help' for a list of the directories
+you can set and what kinds of files go in them.
+
+   If the package supports it, you can cause programs to be installed
+with an extra prefix or suffix on their names by giving `configure' the
+option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'.
+
+Optional Features
+=================
+
+Some packages pay attention to `--enable-FEATURE' options to
+`configure', where FEATURE indicates an optional part of the package.
+They may also pay attention to `--with-PACKAGE' options, where PACKAGE
+is something like `gnu-as' or `x' (for the X Window System).  The
+`README' should mention any `--enable-' and `--with-' options that the
+package recognizes.
+
+   For packages that use the X Window System, `configure' can usually
+find the X include and library files automatically, but if it doesn't,
+you can use the `configure' options `--x-includes=DIR' and
+`--x-libraries=DIR' to specify their locations.
+
+Specifying the System Type
+==========================
+
+There may be some features `configure' cannot figure out automatically,
+but needs to determine by the type of machine the package will run on.
+Usually, assuming the package is built to be run on the _same_
+architectures, `configure' can figure that out, but if it prints a
+message saying it cannot guess the machine type, give it the
+`--build=TYPE' option.  TYPE can either be a short name for the system
+type, such as `sun4', or a canonical name which has the form:
+
+     CPU-COMPANY-SYSTEM
+
+where SYSTEM can have one of these forms:
+
+     OS KERNEL-OS
+
+   See the file `config.sub' for the possible values of each field.  If
+`config.sub' isn't included in this package, then this package doesn't
+need to know the machine type.
+
+   If you are _building_ compiler tools for cross-compiling, you should
+use the `--target=TYPE' option to select the type of system they will
+produce code for.
+
+   If you want to _use_ a cross compiler, that generates code for a
+platform different from the build platform, you should specify the
+"host" platform (i.e., that on which the generated programs will
+eventually be run) with `--host=TYPE'.
+
+Sharing Defaults
+================
+
+If you want to set default values for `configure' scripts to share, you
+can create a site shell script called `config.site' that gives default
+values for variables like `CC', `cache_file', and `prefix'.
+`configure' looks for `PREFIX/share/config.site' if it exists, then
+`PREFIX/etc/config.site' if it exists.  Or, you can set the
+`CONFIG_SITE' environment variable to the location of the site script.
+A warning: not all `configure' scripts look for a site script.
+
+Defining Variables
+==================
+
+Variables not defined in a site shell script can be set in the
+environment passed to `configure'.  However, some packages may run
+configure again during the build, and the customized values of these
+variables may be lost.  In order to avoid this problem, you should set
+them in the `configure' command line, using `VAR=value'.  For example:
+
+     ./configure CC=/usr/local2/bin/gcc
+
+causes the specified `gcc' to be used as the C compiler (unless it is
+overridden in the site shell script).  Here is a another example:
+
+     /bin/bash ./configure CONFIG_SHELL=/bin/bash
+
+Here the `CONFIG_SHELL=/bin/bash' operand causes subsequent
+configuration-related scripts to be executed by `/bin/bash'.
+
+`configure' Invocation
+======================
+
+`configure' recognizes the following options to control how it operates.
+
+`--help'
+`-h'
+     Print a summary of the options to `configure', and exit.
+
+`--version'
+`-V'
+     Print the version of Autoconf used to generate the `configure'
+     script, and exit.
+
+`--cache-file=FILE'
+     Enable the cache: use and save the results of the tests in FILE,
+     traditionally `config.cache'.  FILE defaults to `/dev/null' to
+     disable caching.
+
+`--config-cache'
+`-C'
+     Alias for `--cache-file=config.cache'.
+
+`--quiet'
+`--silent'
+`-q'
+     Do not print messages saying which checks are being made.  To
+     suppress all normal output, redirect it to `/dev/null' (any error
+     messages will still be shown).
+
+`--srcdir=DIR'
+     Look for the package's source code in directory DIR.  Usually
+     `configure' can determine that directory automatically.
+
+`configure' also accepts some other, not widely useful, options.  Run
+`configure --help' for more details.
+
diff --git a/Make.Rules.in b/Make.Rules.in
deleted file mode 100644
index d8bc3636..00000000
--- a/Make.Rules.in
+++ /dev/null
@@ -1,125 +0,0 @@
-##
-## $Id$
-##
-## @configure_input@
-##
-
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-VPATH = @srcdir@
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-
-bindir = @bindir@
-sbindir = @sbindir@
-libexecdir = @libexecdir@
-datadir = @datadir@
-sysconfdir = @sysconfdir@
-sharedstatedir = @sharedstatedir@
-localstatedir = @localstatedir@
-libdir = @libdir@
-infodir = @infodir@
-includedir = @includedir@
-mandir = @mandir@
-
-absolute_srcdir = @LOCALSRCDIR@
-absolute_objdir = @LOCALOBJDIR@
-
-# major and minor numbers of this release
-MAJOR_REL=@LIBPAM_VERSION_MAJOR@
-MINOR_REL=@LIBPAM_VERSION_MINOR@
-
-# The following is the generic set of compiler options for compiling
-# Linux-PAM. True, they are a little anal. Pay attention to the comments
-# they generate.
-
-HEADER_DIRS=-I./include -I$(absolute_srcdir)/libpam/include \
-	-I$(absolute_objdir) -I$(absolute_srcdir)/libpamc/include
-WARNINGS=@WARNINGS@
-OS_CFLAGS=@OS_CFLAGS@
-PIC=@PIC@
-
-# Mode to install shared libraries with
-SHLIBMODE=@SHLIBMODE@
-# Mode to install man pages with
-MANMODE=@MANMODE@
-
-NEED_LINK_LIB_C=@PAM_NEEDS_LIBC@
-HAVE_LCKPWDF=@HAVE_LCKPWDF@
-HAVE_LIBCRACK=@HAVE_LIBCRACK@
-HAVE_LIBCAP=@HAVE_LIBCAP@
-HAVE_LIBCRYPT=@HAVE_LIBCRYPT@
-HAVE_LIBUTIL=@HAVE_LIBUTIL@
-HAVE_NDBM_H=@HAVE_NDBM_H@
-HAVE_LIBNDBM=@HAVE_LIBNDBM@
-HAVE_LIBDB=@HAVE_LIBDB@
-HAVE_LIBFL=@HAVE_LIBFL@
-HAVE_LIBNSL=@HAVE_LIBNSL@
-HAVE_LIBPWDB=@HAVE_LIBPWDB@
-HAVE_LIBSELINUX=@HAVE_LIBSELINUX@
-
-ifeq (@HAVE_LIBFLEX@,yes)
-LINK_LIBLEX=-lfl
-else
-ifeq (@HAVE_LIBLEX@,yes)
-LINK_LIBLEX=-ll
-endif
-endif
-
-# documentation support
-HAVE_SGML2TXT=@HAVE_SGML2TXT@
-HAVE_SGML2HTML=@HAVE_SGML2HTML@
-HAVE_PS2PDF=@HAVE_PS2PDF@
-PSER=@PSER@
-DOCDIR=@DOCDIR@
-MANDIR=@MANDIR@
-
-# configuration settings
-WITH_DEBUG=@WITH_DEBUG@
-WITH_MEMORY_DEBUG=@WITH_MEMORY_DEBUG@
-WITH_LIBDEBUG=@WITH_LIBDEBUG@
-WITH_PRELUDE=@WITH_PRELUDE@
-WITH_PAMLOCKING=@WITH_PAMLOCKING@
-WITH_LCKPWDF=@WITH_LCKPWDF@
-STATIC_LIBPAM=@STATIC_LIBPAM@
-DYNAMIC_LIBPAM=@DYNAMIC_LIBPAM@
-STATIC=@STATIC@
-DYNAMIC=@DYNAMIC@
-
-# Location of libraries when installed on the system
-FAKEROOT=@FAKEROOT@
-SECUREDIR=@SECUREDIR@
-SCONFIGD=@SCONFIGDIR@
-SUPLEMENTED=@SUPLEMENTED@
-INCLUDED=@INCLUDEDIR@/security
-CRACKLIB_DICTPATH=@CRACKLIB_DICTPATH@
-
-# generic build setup
-OS=@OS@
-CC=@CC@
-CFLAGS=$(WARNINGS) -D$(OS) @CFLAGS@ @CPPFLAGS@ $(OS_CFLAGS) $(HEADER_DIRS) @CONF_CFLAGS@
-LDFLAGS=@LDFLAGS@
-LD=@LD@
-LD_D=@LD_D@
-LD_L=@LD_L@
-MV=@MV@
-LDCONFIG=@LDCONFIG@
-DYNTYPE=@DYNTYPE@
-USESONAME=@USESONAME@
-NEEDSONAME=@NEEDSONAME@
-SOSWITCH=@SOSWITCH@
-LIBDL=@LIBDL@
-MKDIR=@MKDIR@
-INSTALL=@INSTALL@
-RANLIB=@RANLIB@
-STRIP=@STRIP@
-CC_STATIC=@CC_STATIC@
-
-LINKLIBS = $(NEED_LINK_LIB_C) $(LIBDL)
-
-USESONAME=@USESONAME@
-SOSWITCH=@SOSWITCH@
-
-ifdef DYNAMIC
-CFLAGS += $(PIC)
-endif
diff --git a/autogen.sh b/autogen.sh
new file mode 100755
index 00000000..b0ff32f4
--- /dev/null
+++ b/autogen.sh
@@ -0,0 +1,10 @@
+#!/bin/sh -x
+
+#aclocal -I m4
+aclocal
+autoheader
+libtoolize --automake --copy
+automake --add-missing --copy
+autoconf
+automake
+
diff --git a/conf/.cvsignore b/conf/.cvsignore
index 93724758..aff70271 100644
--- a/conf/.cvsignore
+++ b/conf/.cvsignore
@@ -1,2 +1,4 @@
 .ignore_age
 .md5sum
+Makefile
+Makefile.in
diff --git a/conf/pam_conv1/.cvsignore b/conf/pam_conv1/.cvsignore
index 200a991e..d4ad3439 100644
--- a/conf/pam_conv1/.cvsignore
+++ b/conf/pam_conv1/.cvsignore
@@ -1,3 +1,5 @@
 lex.yy.c
 pam_conv.tab.c
 pam_conv1
+Makefile
+Makefile.in
diff --git a/doc/.cvsignore b/doc/.cvsignore
index 7ac74f9d..407e0ce1 100644
--- a/doc/.cvsignore
+++ b/doc/.cvsignore
@@ -1,2 +1,4 @@
 pam.sgml
 MODULES-SGML
+Makefile
+Makefile.in
diff --git a/doc/Makefile.am b/doc/Makefile.am
index b1be7c36..f47882db 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -3,7 +3,7 @@
 #
 
 FILES=pam pam_appl pam_modules
-FSRCS=pam.sgml pam_appl.sgml pam_modules.sgml
+FSRCS=pam_appl.sgml pam_modules.sgml
 
 TEXTS=txts/pam.txt txts/pam_appl.txt txts/pam_modules.txt
 HTMLS=html/pam.html html/pam_appl.html html/pam_modules.html
@@ -32,7 +32,7 @@ all: html text postscript pdf
 
 html: $(HTMLS)
 
-$(HTMLS) : $(FSRCS)
+$(HTMLS) : $(FSRCS) pam.sgml
 	@echo 'Building html documentation from files in modules/*.sgml'
 if HAVE_SGML2HTML
 	@for i in $(FILES) ; do \
@@ -49,7 +49,7 @@ endif
 
 text: $(TEXTS)
 
-$(TEXTS) : $(FSRCS)
+$(TEXTS) : $(FSRCS) pam.sgml
 	@echo 'Building text documentation from files in modules/*.sgml'
 if HAVE_SGML2TXT
 	@for i in $(FILES) ; do \
@@ -64,7 +64,7 @@ endif
 
 postscript: $(PSFILES)
 
-$(PSFILES): $(FSRCS)
+$(PSFILES): $(FSRCS) pam.sgml
 	@echo 'Building postscript documentation from files in modules/*.sgml'
 if HAVE_SGML2PS
 	@for i in $(FILES) ; do \
diff --git a/doc/html/.cvsignore b/doc/html/.cvsignore
index 3b358a3a..63fb4028 100644
--- a/doc/html/.cvsignore
+++ b/doc/html/.cvsignore
@@ -1 +1,2 @@
-pam*.html
\ No newline at end of file
+pam*.htmlMakefile
+Makefile.in
diff --git a/doc/pdf/.cvsignore b/doc/pdf/.cvsignore
index a1363379..76866b7e 100644
--- a/doc/pdf/.cvsignore
+++ b/doc/pdf/.cvsignore
@@ -1 +1,3 @@
 *.pdf
+Makefile
+Makefile.in
diff --git a/doc/ps/.cvsignore b/doc/ps/.cvsignore
index fa1d1137..442d5daf 100644
--- a/doc/ps/.cvsignore
+++ b/doc/ps/.cvsignore
@@ -1 +1,3 @@
 pam*.ps
+Makefile
+Makefile.in
diff --git a/doc/specs/.cvsignore b/doc/specs/.cvsignore
index d564ba7e..bac7934f 100644
--- a/doc/specs/.cvsignore
+++ b/doc/specs/.cvsignore
@@ -1 +1,3 @@
 draft-morgan-pam-*.txt
+Makefile
+Makefile.in
diff --git a/doc/specs/formatter/.cvsignore b/doc/specs/formatter/.cvsignore
index 8af8c897..ea34fc5f 100644
--- a/doc/specs/formatter/.cvsignore
+++ b/doc/specs/formatter/.cvsignore
@@ -1,3 +1,5 @@
 lex.yy.c
 parse.tab.c
 padout
+Makefile
+Makefile.in
diff --git a/doc/txts/.cvsignore b/doc/txts/.cvsignore
index f35c3921..238919c1 100644
--- a/doc/txts/.cvsignore
+++ b/doc/txts/.cvsignore
@@ -1 +1,3 @@
 pam*.txt
+Makefile
+Makefile.in
diff --git a/examples/.cvsignore b/examples/.cvsignore
index 2769a41e..bb983de6 100644
--- a/examples/.cvsignore
+++ b/examples/.cvsignore
@@ -1,3 +1,5 @@
 blank
 xsh
 check_user
+Makefile
+Makefile.in
diff --git a/libpam/.cvsignore b/libpam/.cvsignore
index dd17fdcf..ed4eaf3b 100644
--- a/libpam/.cvsignore
+++ b/libpam/.cvsignore
@@ -1,2 +1,4 @@
 dynamic
 static
+Makefile
+Makefile.in
diff --git a/libpam_misc/.cvsignore b/libpam_misc/.cvsignore
index b6cfd742..abf21675 100644
--- a/libpam_misc/.cvsignore
+++ b/libpam_misc/.cvsignore
@@ -7,3 +7,5 @@ misc_conv.o
 xstrdup.o
 dynamic
 static
+Makefile
+Makefile.in
diff --git a/libpam_misc/xstrdup.c b/libpam_misc/xstrdup.c
deleted file mode 100644
index 6a4ca6f7..00000000
--- a/libpam_misc/xstrdup.c
+++ /dev/null
@@ -1,31 +0,0 @@
-/* $Id$ */
-
-#include <malloc.h>
-#include <string.h>
-#include <security/pam_misc.h>
-
-/*
- * Safe duplication of character strings. "Paranoid"; don't leave
- * evidence of old token around for later stack analysis.
- */
-
-char *xstrdup(const char *x)
-{
-     register char *new=NULL;
-
-     if (x != NULL) {
-	  register int i;
-
-	  for (i=0; x[i]; ++i);                       /* length of string */
-	  if ((new = malloc(++i)) == NULL) {
-	       i = 0;
-	  } else {
-	       while (i-- > 0) {
-		    new[i] = x[i];
-	       }
-	  }
-	  x = NULL;
-     }
-
-     return new;                 /* return the duplicate or NULL on error */
-}
diff --git a/libpamc/.cvsignore b/libpamc/.cvsignore
index ce01b11d..fe478f9c 100644
--- a/libpamc/.cvsignore
+++ b/libpamc/.cvsignore
@@ -1,3 +1,5 @@
 libpamc.so*
 static
 dynamic
+Makefile
+Makefile.in
diff --git a/modules/Simple.Rules b/modules/Simple.Rules
deleted file mode 100644
index c12ede3a..00000000
--- a/modules/Simple.Rules
+++ /dev/null
@@ -1,109 +0,0 @@
-# $Id$
-#
-# For simple modules with no significant dependencies, set $(TITLE)
-# and include this file.
-#
-# There are a few ways to customize this set of rules. Namely, define
-#
-#   $(MODULE_SIMPLE_EXTRACLEAN)
-#   $(MODULE_SIMPLE_CLEAN)
-#   $(MODULE_SIMPLE_REMOVE)
-#   $(MODULE_SIMPLE_INSTALL)
-#   $(MODULE_SIMPLE_EXTRALIBS)  - other things to link with the module
-#   $(MODULE_SIMPLE_EXTRAFILES) - other files to build (no .c suffix)
-#
-
--include ../Make.Rules
-
-LIBFILES = $(TITLE) $(MODULE_SIMPLE_EXTRAFILES)
-LIBSRC = $(addsuffix .c,$(LIBFILES))
-LIBOBJ = $(addsuffix .o,$(LIBFILES))
-LIBOBJD = $(addprefix dynamic/,$(LIBOBJ))
-LIBOBJS = $(addprefix static/,$(LIBOBJ))
-
-LINK_PAMMODUTILS = -L../pammodutil -lpammodutil -L../../libpam -lpam
-INCLUDE_PAMMODUTILS = -I../pammodutil/include
-
-ifdef DYNAMIC
-LIBSHARED = $(TITLE).so
-endif
-
-ifdef STATIC
-LIBSTATIC = lib$(TITLE).o
-endif
-
-####################### don't edit below #######################
-
-all: dirs $(LIBSHARED) $(LIBSTATIC) register
-
-dynamic/%.o : %.c
-	$(CC) $(CFLAGS) $(INCLUDE_PAMMODUTILS) $(DYNAMIC) $(TARGET_ARCH) -c $< -o $@
-
-static/%.o : %.c
-	$(CC) $(CFLAGS) $(INCLUDE_PAMMODUTILS) $(STATIC) $(TARGET_ARCH) -c $< -o $@
-
-dirs:
-ifdef DYNAMIC
-	$(MKDIR) ./dynamic
-endif
-ifdef STATIC
-	$(MKDIR) ./static
-endif
-
-register:
-ifdef STATIC
-	( cd .. ; ./register_static $(TITLE) $(TITLE)/$(LIBSTATIC) )
-endif
-
-ifdef DYNAMIC
-$(LIBOBJD): $(LIBSRC)
-endif
-
-ifdef DYNAMIC
-$(LIBSHARED):	$(LIBOBJD)
-	$(LD_D) -o $@ $(LIBOBJD) $(MODULE_SIMPLE_EXTRALIBS) $(NEED_LINK_LIB_C) $(LINK_PAMMODUTILS)
-
-endif
-
-ifdef STATIC
-$(LIBOBJS): $(LIBSRC)
-endif
-
-ifdef STATIC
-$(LIBSTATIC): $(LIBOBJS)
-	$(LD) -r -o $@ $(LIBOBJS) $(MODULE_SIMPLE_EXTRALIBS) $(LINK_PAMMODUTILS)
-endif
-
-install: all
-	$(MKDIR) $(FAKEROOT)$(SECUREDIR)
-ifdef DYNAMIC
-	$(INSTALL) -m $(SHLIBMODE) $(LIBSHARED) $(FAKEROOT)$(SECUREDIR)
-endif
-ifdef MAN3
-	test -d $(FAKEROOT)$(mandir)/man3 || $(MKDIR) $(FAKEROOT)$(mandir)/man3
-	$(INSTALL) -m $(MANMODE) $(MAN3) $(FAKEROOT)$(mandir)/man3/
-endif
-ifdef MAN5
-	test -d $(FAKEROOT)$(mandir)/man5 || $(MKDIR) $(FAKEROOT)$(mandir)/man5
-	$(INSTALL) -m $(MANMODE) $(MAN5) $(FAKEROOT)$(mandir)/man5/
-endif
-ifdef MAN8
-	test -d $(FAKEROOT)$(mandir)/man8 || $(MKDIR) $(FAKEROOT)$(mandir)/man8
-	$(INSTALL) -m $(MANMODE) $(MAN8) $(FAKEROOT)$(mandir)/man8/
-endif
-	$(MODULE_SIMPLE_INSTALL)
-
-remove:
-	rm -f $(FAKEROOT)$(SECUREDIR)/$(TITLE).so
-	$(MODULE_SIMPLE_REMOVE)
-
-clean:
-	rm -f $(LIBOBJD) $(LIBOBJS) core *~
-	$(MODULE_SIMPLE_CLEAN)
-	rm -f *.a *.o *.so *.bak
-	rm -rf dynamic static
-	$(MODULE_SIMPLE_EXTRACLEAN)
-
-.c.o:	
-	$(CC) $(CFLAGS) -c $<
-
diff --git a/modules/dont_makefile b/modules/dont_makefile
deleted file mode 100644
index b7e11834..00000000
--- a/modules/dont_makefile
+++ /dev/null
@@ -1,21 +0,0 @@
-#########################################################################
-# $Id$
-#########################################################################
-# This is a makefile that does nothing. It is designed to be included
-# by module Makefile-s when they are not compatable with the local
-# system
-#########################################################################
-
-all:
-	@echo "This module will not be compiled on this system"
-
-remove: clean
-
-install: clean
-
-clean:
-	@echo "Nothing to do"
-
-#########################################################################
-# all over..
-#########################################################################
diff --git a/modules/download-all b/modules/download-all
deleted file mode 100755
index 427d0bba..00000000
--- a/modules/download-all
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/bin/sh
-#
-# $Id$
-#
-cat <<EOT
-For a number of reasons it is not practical for Linux-PAM to be
-distributed with every module out there.  However, this shell script
-is intended as a convenient way for users to download modules from the
-'net in some semiautomated fashion.
-
-Please feel free to send (pam-list@redhat.com) snippets of code that
-will help others to download and unpack your favorite module into the
-Linux-PAM source tree.  Especially welcome are snippets of the
-following form:
-
-ncftp ftp://my.ftpsite.org/pub/fluff/pam_fluff.tar.gz
-rm -fr pam_fluff
-tar zvfx pam_fluff.tar.gz
-
-Cheers
-
-Andrew
-morgan@linux.kernel.org
-EOT
-
-# --- insert your snippets below ---
-
-# --- insert your snippets above ---
-
-exit 0
diff --git a/modules/install_conf b/modules/install_conf
deleted file mode 100755
index 80f6be29..00000000
--- a/modules/install_conf
+++ /dev/null
@@ -1,49 +0,0 @@
-#!/bin/bash
-
-FAKEROOT=$1
-CONFD=$1$2
-CONFILE=$1$3
-MODULE=$4
-CONF=$5
-
-IGNORE_AGE=./.ignore_age
-QUIET_INSTALL=../../.quiet_install
-
-echo
-
-if [ -f "$QUIET_INSTALL" ]; then
-    if [ ! -f "$CONFILE" ]; then
-        yes="y"
-    else
-        yes="skip"
-    fi
-elif [ -f "$IGNORE_AGE" ]; then
-    echo "you don't want to be bothered with the age of your $CONFILE file"
-    yes="n"
-elif [ ! -f "$CONFILE" ] || [ "$CONF" -nt "$CONFILE" ]; then
-    if [ -f "$CONFILE" ]; then
-	echo "An older $MODULE configuration file already exists ($CONFILE)"
-	echo "Do you wish to copy the $CONF file in this distribution"
-	echo "to $CONFILE ? (y/n) [skip] "
-        read yes
-    else
-	yes="y"
-    fi
-else
-    yes="skip"
-fi
-
-if [ "$yes" = "y" ]; then
-    mkdir -p $CONFD
-    echo "  copying $CONF to $CONFILE"
-    cp $CONF $CONFILE
-else
-    echo "  Skipping $CONF installation"
-    if [ "$yes" = "n" ]; then
-	touch "$IGNORE_AGE"
-    fi
-fi
-
-echo
-
-exit 0
diff --git a/modules/pam_access/.cvsignore b/modules/pam_access/.cvsignore
index 380a834a..7361e6d2 100644
--- a/modules/pam_access/.cvsignore
+++ b/modules/pam_access/.cvsignore
@@ -1 +1,3 @@
 dynamic
+Makefile
+Makefile.in
diff --git a/modules/pam_cracklib/.cvsignore b/modules/pam_cracklib/.cvsignore
index 380a834a..7361e6d2 100644
--- a/modules/pam_cracklib/.cvsignore
+++ b/modules/pam_cracklib/.cvsignore
@@ -1 +1,3 @@
 dynamic
+Makefile
+Makefile.in
diff --git a/modules/pam_debug/.cvsignore b/modules/pam_debug/.cvsignore
index dd17fdcf..ed4eaf3b 100644
--- a/modules/pam_debug/.cvsignore
+++ b/modules/pam_debug/.cvsignore
@@ -1,2 +1,4 @@
 dynamic
 static
+Makefile
+Makefile.in
diff --git a/modules/pam_deny/.cvsignore b/modules/pam_deny/.cvsignore
index 380a834a..7361e6d2 100644
--- a/modules/pam_deny/.cvsignore
+++ b/modules/pam_deny/.cvsignore
@@ -1 +1,3 @@
 dynamic
+Makefile
+Makefile.in
diff --git a/modules/pam_env/.cvsignore b/modules/pam_env/.cvsignore
index 380a834a..7361e6d2 100644
--- a/modules/pam_env/.cvsignore
+++ b/modules/pam_env/.cvsignore
@@ -1 +1,3 @@
 dynamic
+Makefile
+Makefile.in
diff --git a/modules/pam_filter/.cvsignore b/modules/pam_filter/.cvsignore
index 877dafe0..9255c987 100644
--- a/modules/pam_filter/.cvsignore
+++ b/modules/pam_filter/.cvsignore
@@ -1,2 +1,4 @@
 dynamic
 security
+Makefile
+Makefile.in
diff --git a/modules/pam_filter/upperLOWER/.cvsignore b/modules/pam_filter/upperLOWER/.cvsignore
index bcd63650..9459dbe2 100644
--- a/modules/pam_filter/upperLOWER/.cvsignore
+++ b/modules/pam_filter/upperLOWER/.cvsignore
@@ -1 +1,3 @@
 upperLOWER
+Makefile
+Makefile.in
diff --git a/modules/pam_ftp/.cvsignore b/modules/pam_ftp/.cvsignore
index 380a834a..7361e6d2 100644
--- a/modules/pam_ftp/.cvsignore
+++ b/modules/pam_ftp/.cvsignore
@@ -1 +1,3 @@
 dynamic
+Makefile
+Makefile.in
diff --git a/modules/pam_group/.cvsignore b/modules/pam_group/.cvsignore
index 380a834a..7361e6d2 100644
--- a/modules/pam_group/.cvsignore
+++ b/modules/pam_group/.cvsignore
@@ -1 +1,3 @@
 dynamic
+Makefile
+Makefile.in
diff --git a/modules/pam_issue/.cvsignore b/modules/pam_issue/.cvsignore
index 380a834a..7361e6d2 100644
--- a/modules/pam_issue/.cvsignore
+++ b/modules/pam_issue/.cvsignore
@@ -1 +1,3 @@
 dynamic
+Makefile
+Makefile.in
diff --git a/modules/pam_lastlog/.cvsignore b/modules/pam_lastlog/.cvsignore
index 380a834a..7361e6d2 100644
--- a/modules/pam_lastlog/.cvsignore
+++ b/modules/pam_lastlog/.cvsignore
@@ -1 +1,3 @@
 dynamic
+Makefile
+Makefile.in
diff --git a/modules/pam_limits/.cvsignore b/modules/pam_limits/.cvsignore
index 380a834a..7361e6d2 100644
--- a/modules/pam_limits/.cvsignore
+++ b/modules/pam_limits/.cvsignore
@@ -1 +1,3 @@
 dynamic
+Makefile
+Makefile.in
diff --git a/modules/pam_limits/limits.skel b/modules/pam_limits/limits.conf
index c52778b1..c52778b1 100644
--- a/modules/pam_limits/limits.skel
+++ b/modules/pam_limits/limits.conf
diff --git a/modules/pam_listfile/.cvsignore b/modules/pam_listfile/.cvsignore
index 380a834a..7361e6d2 100644
--- a/modules/pam_listfile/.cvsignore
+++ b/modules/pam_listfile/.cvsignore
@@ -1 +1,3 @@
 dynamic
+Makefile
+Makefile.in
diff --git a/modules/pam_mail/.cvsignore b/modules/pam_mail/.cvsignore
index 380a834a..7361e6d2 100644
--- a/modules/pam_mail/.cvsignore
+++ b/modules/pam_mail/.cvsignore
@@ -1 +1,3 @@
 dynamic
+Makefile
+Makefile.in
diff --git a/modules/pam_mkhomedir/.cvsignore b/modules/pam_mkhomedir/.cvsignore
index 380a834a..7361e6d2 100644
--- a/modules/pam_mkhomedir/.cvsignore
+++ b/modules/pam_mkhomedir/.cvsignore
@@ -1 +1,3 @@
 dynamic
+Makefile
+Makefile.in
diff --git a/modules/pam_motd/.cvsignore b/modules/pam_motd/.cvsignore
index 380a834a..7361e6d2 100644
--- a/modules/pam_motd/.cvsignore
+++ b/modules/pam_motd/.cvsignore
@@ -1 +1,3 @@
 dynamic
+Makefile
+Makefile.in
diff --git a/modules/pam_nologin/.cvsignore b/modules/pam_nologin/.cvsignore
index 380a834a..7361e6d2 100644
--- a/modules/pam_nologin/.cvsignore
+++ b/modules/pam_nologin/.cvsignore
@@ -1 +1,3 @@
 dynamic
+Makefile
+Makefile.in
diff --git a/modules/pam_permit/.cvsignore b/modules/pam_permit/.cvsignore
index 380a834a..7361e6d2 100644
--- a/modules/pam_permit/.cvsignore
+++ b/modules/pam_permit/.cvsignore
@@ -1 +1,3 @@
 dynamic
+Makefile
+Makefile.in
diff --git a/modules/pam_pwdb/.cvsignore b/modules/pam_pwdb/.cvsignore
index f0420bac..f9e10e18 100644
--- a/modules/pam_pwdb/.cvsignore
+++ b/modules/pam_pwdb/.cvsignore
@@ -1,2 +1,4 @@
 dynamic
 pwdb_chkpwd
+Makefile
+Makefile.in
diff --git a/modules/pam_radius/.cvsignore b/modules/pam_radius/.cvsignore
index 380a834a..7361e6d2 100644
--- a/modules/pam_radius/.cvsignore
+++ b/modules/pam_radius/.cvsignore
@@ -1 +1,3 @@
 dynamic
+Makefile
+Makefile.in
diff --git a/modules/pam_rhosts/.cvsignore b/modules/pam_rhosts/.cvsignore
index 380a834a..7361e6d2 100644
--- a/modules/pam_rhosts/.cvsignore
+++ b/modules/pam_rhosts/.cvsignore
@@ -1 +1,3 @@
 dynamic
+Makefile
+Makefile.in
diff --git a/modules/pam_rootok/.cvsignore b/modules/pam_rootok/.cvsignore
index 380a834a..7361e6d2 100644
--- a/modules/pam_rootok/.cvsignore
+++ b/modules/pam_rootok/.cvsignore
@@ -1 +1,3 @@
 dynamic
+Makefile
+Makefile.in
diff --git a/modules/pam_securetty/.cvsignore b/modules/pam_securetty/.cvsignore
index 380a834a..7361e6d2 100644
--- a/modules/pam_securetty/.cvsignore
+++ b/modules/pam_securetty/.cvsignore
@@ -1 +1,3 @@
 dynamic
+Makefile
+Makefile.in
diff --git a/modules/pam_shells/.cvsignore b/modules/pam_shells/.cvsignore
index 380a834a..7361e6d2 100644
--- a/modules/pam_shells/.cvsignore
+++ b/modules/pam_shells/.cvsignore
@@ -1 +1,3 @@
 dynamic
+Makefile
+Makefile.in
diff --git a/modules/pam_stress/.cvsignore b/modules/pam_stress/.cvsignore
index 380a834a..7361e6d2 100644
--- a/modules/pam_stress/.cvsignore
+++ b/modules/pam_stress/.cvsignore
@@ -1 +1,3 @@
 dynamic
+Makefile
+Makefile.in
diff --git a/modules/pam_tally/.cvsignore b/modules/pam_tally/.cvsignore
index e1a4f48f..092d1253 100644
--- a/modules/pam_tally/.cvsignore
+++ b/modules/pam_tally/.cvsignore
@@ -1,2 +1,4 @@
 dynamic
 pam_tally
+Makefile
+Makefile.in
diff --git a/modules/pam_time/.cvsignore b/modules/pam_time/.cvsignore
index 380a834a..7361e6d2 100644
--- a/modules/pam_time/.cvsignore
+++ b/modules/pam_time/.cvsignore
@@ -1 +1,3 @@
 dynamic
+Makefile
+Makefile.in
diff --git a/modules/pam_unix/.cvsignore b/modules/pam_unix/.cvsignore
index 64c5ce5c..699aea32 100644
--- a/modules/pam_unix/.cvsignore
+++ b/modules/pam_unix/.cvsignore
@@ -2,3 +2,5 @@ dynamic
 unix_chkpwd
 *.so
 *~
+Makefile
+Makefile.in
diff --git a/modules/pam_userdb/.cvsignore b/modules/pam_userdb/.cvsignore
index 380a834a..7361e6d2 100644
--- a/modules/pam_userdb/.cvsignore
+++ b/modules/pam_userdb/.cvsignore
@@ -1 +1,3 @@
 dynamic
+Makefile
+Makefile.in
diff --git a/modules/pam_warn/.cvsignore b/modules/pam_warn/.cvsignore
index 380a834a..7361e6d2 100644
--- a/modules/pam_warn/.cvsignore
+++ b/modules/pam_warn/.cvsignore
@@ -1 +1,3 @@
 dynamic
+Makefile
+Makefile.in
diff --git a/modules/pam_wheel/.cvsignore b/modules/pam_wheel/.cvsignore
index 380a834a..7361e6d2 100644
--- a/modules/pam_wheel/.cvsignore
+++ b/modules/pam_wheel/.cvsignore
@@ -1 +1,3 @@
 dynamic
+Makefile
+Makefile.in
diff --git a/modules/pammodutil/.cvsignore b/modules/pammodutil/.cvsignore
index 7b4d4ba2..99d2856d 100644
--- a/modules/pammodutil/.cvsignore
+++ b/modules/pammodutil/.cvsignore
@@ -1 +1,3 @@
 static
+Makefile
+Makefile.in