Check for /etc/pam.d before setting PAMDIR.

git-svn-id: svn+ssh://src.apple.com/svn/cups/cups.org/trunk@1729 7a7537e8-13f0-0310-91df-b6672ffda945

diff --git a/CHANGES.txt b/CHANGES.txt
index 1effbfc442be1dd117bcabde276c23ca109f0ddc..3d868f07614fa49a3a7ce13f3744b7f99c569b23 100644 (file)
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,8 +1,10 @@
-CHANGES.txt - 05/16/2001
+CHANGES.txt - 05/18/2001
 ------------------------
 
 CHANGES IN CUPS V1.1.8
 
+       - Updated configure script to check for /etc/pam.d and
+         to only set PAMDIR if it exists.
        - Updated spec file to generate separate cups-pstoraster
          package for pstoraster.
        - The spec file wasn't setting LOGDIR in the install.

diff --git a/configure.in b/configure.in
index ae436297b6ae53344020a1e87f3a0aded2052ad3..135f1aadb7e7dd990852c5efdd172ee09dd2727a 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1,5 +1,5 @@
 dnl
-dnl "$Id: configure.in,v 1.90 2001/05/11 21:11:44 mike Exp $"
+dnl "$Id: configure.in,v 1.91 2001/05/18 17:50:24 mike Exp $"
 dnl
 dnl   Configuration script for the Common UNIX Printing System (CUPS).
 dnl
@@ -191,7 +191,9 @@ if test "$enable_pam" != "no"; then
        AC_CHECK_LIB(dl,dlopen)
        AC_CHECK_LIB(pam,pam_start)
        if test "$ac_cv_lib_pam_pam_start" != "no"; then
-               PAMDIR="/etc/pam.d"
+               if test -d /etc/pam.d; then
+                       PAMDIR="/etc/pam.d"
+               fi
        else
                PAMDIR=""
                LIBS="$OLDLIBS"
@@ -698,5 +700,5 @@ AC_DEFINE_UNQUOTED(CUPS_FONTPATH, "$fontpath")
 AC_OUTPUT(Makedefs cups.sh)
 
 dnl
-dnl End of "$Id: configure.in,v 1.90 2001/05/11 21:11:44 mike Exp $".
+dnl End of "$Id: configure.in,v 1.91 2001/05/18 17:50:24 mike Exp $".
 dnl

diff --git a/data/Makefile b/data/Makefile
index 9b4b1e4b30c54c59b65f390d074308de35eae6d6..f58701861c8170ae7df1e1358d67c60ed43776c5 100644 (file)
--- a/data/Makefile
+++ b/data/Makefile
@@ -1,5 +1,5 @@
 #
-# "$Id: Makefile,v 1.12 2001/01/22 15:03:32 mike Exp $"
+# "$Id: Makefile,v 1.13 2001/05/18 17:50:25 mike Exp $"
 #
 #   Datafile makefile for the Common UNIX Printing System (CUPS).
 #
@@ -91,7 +91,7 @@ install:
        -$(MKDIR) $(DATADIR)/data
        $(CHMOD) ugo+rx $(DATADIR)/data
        $(INSTALL_DATA) $(DATAFILES) $(DATADIR)/data
-       -if test "$(PAMDIR)" != ""; then \
+       -if test x$(PAMDIR) != x; then \
                $(MKDIR) $(PAMDIR); \
                $(CHMOD) ugo+rx $(PAMDIR); \
                if test -f /lib/security/pam_unix.so; then \
@@ -103,5 +103,5 @@ install:
 
 
 #
-# End of "$Id: Makefile,v 1.12 2001/01/22 15:03:32 mike Exp $".
+# End of "$Id: Makefile,v 1.13 2001/05/18 17:50:25 mike Exp $".
 #