From 01fa6380e815a37ac5ffcf03b04c93d7b52ce765 Mon Sep 17 00:00:00 2001
From: Damien Miller <djm@mindrot.org>
Date: Wed, 17 Jan 2001 11:23:39 +1100
Subject:  - (djm) Add --with-pam to RPM spec files

---
 ChangeLog                    | 1 +
 contrib/caldera/openssh.spec | 1 +
 contrib/redhat/openssh.spec  | 3 ++-
 contrib/suse/openssh.spec    | 9 +++++++--
 4 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 49014534e..f3edcd44f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -7,6 +7,7 @@
  - (djm) Try to avoid adding -I/usr/include to CPPFLAGS during SSL tests. This
    can cause weird segfaults errors on Solaris 
  - (djm) Avoid warning in PAM code by making read_passphrase arguments const
+ - (djm) Add --with-pam to RPM spec files
 
 20010115
  - (bal) sftp-server.c change to use chmod() if fchmod() does not exist.
diff --git a/contrib/caldera/openssh.spec b/contrib/caldera/openssh.spec
index 3191c6744..d0546f256 100644
--- a/contrib/caldera/openssh.spec
+++ b/contrib/caldera/openssh.spec
@@ -142,6 +142,7 @@ CFLAGS="$RPM_OPT_FLAGS"					\
 		--prefix=/usr				\
 		--sysconfdir=/etc/ssh			\
 		--libexecdir=%{_libexecdir}/openssh	\
+		--with-pam \
 		--with-tcp-wrappers			\
 		--with-ipv4-default			\
 		--with-rsh=/usr/bin/rsh
diff --git a/contrib/redhat/openssh.spec b/contrib/redhat/openssh.spec
index 7603d0874..731fb0474 100644
--- a/contrib/redhat/openssh.spec
+++ b/contrib/redhat/openssh.spec
@@ -142,10 +142,11 @@ This package contains the GNOME passphrase dialog.
 
 %configure \
 	--libexecdir=%{_libexecdir}/openssh \
+	--with-pam \
 	--with-tcp-wrappers \
 	--with-ipv4-default \
 	--with-rsh=/usr/bin/rsh \
-	--with-default-path=/usr/local/bin:/bin:/usr/bin:/usr/X11R6/bin
+	--with-default-path=/bin:/usr/bin:/usr/local/bin:/usr/X11R6/bin
 
 make
 
diff --git a/contrib/suse/openssh.spec b/contrib/suse/openssh.spec
index 457864772..04625f64e 100644
--- a/contrib/suse/openssh.spec
+++ b/contrib/suse/openssh.spec
@@ -88,8 +88,13 @@ passphrase dialog.
 
 %build
 CFLAGS="$RPM_OPT_FLAGS" \
-./configure --prefix=/usr --sysconfdir=/etc/ssh --with-gnome-askpass \
-            --with-tcp-wrappers --with-ipv4-default --libexecdir=/usr/lib/ssh
+./configure	--prefix=/usr \
+				--sysconfdir=/etc/ssh \
+				--with-pam \
+				--with-gnome-askpass \
+            --with-tcp-wrappers \
+				--with-ipv4-default \
+				--libexecdir=/usr/lib/ssh
 make
 
 cd contrib
-- 
cgit v1.2.3