Mirror 1.1.x changes.

git-svn-id: svn+ssh://src.apple.com/svn/cups/cups.org/branches/branch-1.2@2758 7a7537e8-13f0-0310-91df-b6672ffda945

diff --git a/conf/Makefile b/conf/Makefile
index 91bb5d34ac05bc722c3a257235dfcf5fd8e4886b..87d4258c26367f9a92daa7635e950c9a8746675a 100644 (file)
--- a/conf/Makefile
+++ b/conf/Makefile
@@ -1,5 +1,5 @@
 #
-# "$Id: Makefile,v 1.10.2.2 2002/01/02 18:04:22 mike Exp $"
+# "$Id: Makefile,v 1.10.2.3 2002/08/30 20:58:20 mike Exp $"
 #
 #   Configuration file makefile for the Common UNIX Printing System (CUPS).
 #
@@ -65,8 +65,12 @@ install:
                fi ; \
                $(INSTALL_DATA) $$file $(SERVERROOT) ; \
        done
+       -if test x$(PAMDIR) != x$(BUILDROOT); then \
+               $(INSTALL_DIR) $(PAMDIR); \
+               $(INSTALL_DATA) pam.conf $(PAMDIR)/cups; \
+       fi
 
 
 #
-# End of "$Id: Makefile,v 1.10.2.2 2002/01/02 18:04:22 mike Exp $".
+# End of "$Id: Makefile,v 1.10.2.3 2002/08/30 20:58:20 mike Exp $".
 #

diff --git a/config-scripts/cups-pam.m4 b/config-scripts/cups-pam.m4
index 310a5a85bd6ec0f23c887688df45512ff6417df5..1055aa0a285e590d25804b7e9d909d336f59ab4f 100644 (file)
--- a/config-scripts/cups-pam.m4
+++ b/config-scripts/cups-pam.m4
@@ -1,5 +1,5 @@
 dnl
-dnl "$Id: cups-pam.m4,v 1.2.2.4 2002/06/04 21:15:57 mike Exp $"
+dnl "$Id: cups-pam.m4,v 1.2.2.5 2002/08/30 20:58:21 mike Exp $"
 dnl
 dnl   PAM stuff for the Common UNIX Printing System (CUPS).
 dnl
@@ -31,6 +31,7 @@ fi
 
 PAMDIR=""
 PAMLIBS=""
+PAMMOD="pam_unknown.so"
 
 if test x$enable_pam != xno; then
        SAVELIBS="$LIBS"
@@ -51,11 +52,20 @@ if test x$enable_pam != xno; then
        fi
 
        LIBS="$SAVELIBS"
+
+       # This test might need to be updated as Linux distributors move
+       # things around...
+       for mod in pam_unix2.so pam_unix.so pam_pwdb.so; do
+               if test -f /lib/security/$mod; then
+                       PAMMOD="$mod"
+               fi
+       done
 fi
 
 AC_SUBST(PAMDIR)
 AC_SUBST(PAMLIBS)
+AC_SUBST(PAMMOD)
 
 dnl
-dnl End of "$Id: cups-pam.m4,v 1.2.2.4 2002/06/04 21:15:57 mike Exp $".
+dnl End of "$Id: cups-pam.m4,v 1.2.2.5 2002/08/30 20:58:21 mike Exp $".
 dnl

diff --git a/configure.in b/configure.in
index d3397a7682ada7ea564e964b23f577bfebb8b07e..5c8199065355513ee32a1fa74e00bd405dcd8e93 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1,5 +1,5 @@
 dnl
-dnl "$Id: configure.in,v 1.83.2.7 2002/05/09 02:22:03 mike Exp $"
+dnl "$Id: configure.in,v 1.83.2.8 2002/08/30 20:58:20 mike Exp $"
 dnl
 dnl   Configuration script for the Common UNIX Printing System (CUPS).
 dnl
@@ -42,10 +42,10 @@ sinclude(config-scripts/cups-pam.m4)
 MAKEDEFS="../Makedefs"
 AC_SUBST(MAKEDEFS)
 
-AC_OUTPUT(Makedefs cups.list cups.sh cups-config conf/cupsd.conf)
+AC_OUTPUT(Makedefs cups.list cups.sh cups-config conf/cupsd.conf conf/pam.conf)
 
 chmod +x cups-config
 
 dnl
-dnl End of "$Id: configure.in,v 1.83.2.7 2002/05/09 02:22:03 mike Exp $".
+dnl End of "$Id: configure.in,v 1.83.2.8 2002/08/30 20:58:20 mike Exp $".
 dnl

diff --git a/cups.list.in b/cups.list.in
index a7a5302455a115d58f7f91788bb2bb21cf60098c..b4c870b2192d626a9f55d50ed0077d5b173224e5 100644 (file)
--- a/cups.list.in
+++ b/cups.list.in
@@ -1,5 +1,5 @@
 #
-# "$Id: cups.list.in,v 1.13.2.8 2002/03/22 15:54:23 mike Exp $"
+# "$Id: cups.list.in,v 1.13.2.9 2002/08/30 20:58:20 mike Exp $"
 #
 #   ESP Package Manager (EPM) file list for the Common UNIX Printing
 #   System (CUPS).
@@ -264,11 +264,7 @@ c 0600 root sys $SERVERROOT/mime.types conf/mime.types
 
 %system linux
 d 0555 root sys $PAMDIR -
-c 0644 root sys $PAMDIR/cups data/cups.pam
-c 0644 root sys $PAMDIR/cups.suse data/cups.suse
-%install if test -f /lib/security/pam_unix.so; then
-%install     mv $PAMDIR/cups.suse $PAMDIR/cups
-%install fi
+c 0644 root sys $PAMDIR/cups conf/pam.conf
 
 # IRIX doesn't normally support PAM, but the freeware project
 # includes a version of PAM that can be used...
@@ -385,5 +381,5 @@ f 0444 root sys $AMANDIR/man$MAN8DIR/lpmove.$MAN8EXT man/lpmove.man
 i 0555 root sys cups cups.sh
 
 #
-# End of "$Id: cups.list.in,v 1.13.2.8 2002/03/22 15:54:23 mike Exp $".
+# End of "$Id: cups.list.in,v 1.13.2.9 2002/08/30 20:58:20 mike Exp $".
 #

diff --git a/data/Makefile b/data/Makefile
index b681b70ead014d95ac3a087f7591e7bfc4a7c56f..5c371dc57c34e30ee6a73d68f15a7119b32838d0 100644 (file)
--- a/data/Makefile
+++ b/data/Makefile
@@ -1,5 +1,5 @@
 #
-# "$Id: Makefile,v 1.12.2.4 2002/08/19 01:15:21 mike Exp $"
+# "$Id: Makefile,v 1.12.2.5 2002/08/30 20:58:22 mike Exp $"
 #
 #   Datafile makefile for the Common UNIX Printing System (CUPS).
 #
@@ -131,16 +131,8 @@ install:
        for file in $(DATAFILES); do \
                $(INSTALL_DATA) $$file $(DATADIR)/data; \
        done
-       -if test x$(PAMDIR) != x; then \
-               $(INSTALL_DIR) $(PAMDIR); \
-               if test -f /lib/security/pam_unix.so; then \
-                       $(INSTALL_DATA) cups.suse $(PAMDIR)/cups; \
-               else \
-                       $(INSTALL_DATA) cups.pam $(PAMDIR)/cups; \
-               fi \
-       fi
 
 
 #
-# End of "$Id: Makefile,v 1.12.2.4 2002/08/19 01:15:21 mike Exp $".
+# End of "$Id: Makefile,v 1.12.2.5 2002/08/30 20:58:22 mike Exp $".
 #