[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-core-devel
Subject:    Re: [PATCH] fix for warning in pam check
From:       Benjamin Reed <ranger () befunk ! com>
Date:       2003-07-04 2:21:52
[Download RAW message or body]

On Tuesday, July 1, 2003, at 11:50PM, Benjamin Reed wrote:

> My previous OSX admin patch introduced a buglet in the pam check that
> makes it try setting a HAVE_* variable inside an AC_CACHE_VAL, which 
> is a
> no-no.
>
> Attached is a patch to fix it.<acinclude-pam.patch>

And attached is a patch that sucks less and works more.  ;)

Not sure if it's the most efficient way to do it, but this works for 
me, and makes more sense.  Could someone with karma apply it?



["acinclude-pam.patch" (acinclude-pam.patch)]

Index: admin/acinclude.m4.in
===================================================================
RCS file: /home/kde/kde-common/admin/acinclude.m4.in,v
retrieving revision 2.372
diff -u -u -r2.372 acinclude.m4.in
--- admin/acinclude.m4.in	30 Jun 2003 11:18:09 -0000	2.372
+++ admin/acinclude.m4.in	4 Jul 2003 02:19:48 -0000
@@ -3611,18 +3611,12 @@
       AC_CACHE_VAL(ac_cv_path_pam,
         [ use_pam=no
           AC_CHECK_LIB(pam, pam_start,
-            [ AC_CHECK_HEADER(security/pam_appl.h,
-                [ use_pam=yes
-		  pam_header=security/pam_appl.h
-                  pam_service=kde ],
-		[ AC_CHECK_HEADER(pam/pam_appl.h,
-			[ use_pam=yes
-			  pam_header=pam/pam_appl.h
-			  pam_service=kde
-    			  AC_DEFINE(HAVE_PAM_PAM_APPL_H, 1, [Define if your pam headers are in pam/ \
                instead of security/])
-			])
-		]) 
-            ], , $LIBDL)
+            [ AC_CHECK_HEADERS(security/pam_appl.h pam/pam_appl.h)
+              if test "$ac_cv_header_security_pam_appl_h" = "yes" || test \
"$ac_cv_header_pam_pam_appl_h" = "yes"; then +                use_pam=yes
+                pam_service=kde
+              fi
+          ], , $LIBDL)
           ac_cv_path_pam="use_pam=$use_pam pam_service=$pam_service"
         ])
     ])
@@ -3646,6 +3640,9 @@
                         AC_DEFINE(PAM_MESSAGE_NONCONST, 1, [Define if your PAM \
support takes non-const arguments (Solaris)])]  )],
       [AC_MSG_RESULT([not found - assume const, Linux-type PAM])])
+
+    AC_CHECK_HEADERS(pam/pam_appl.h)
+
   fi
 
   AC_SUBST(PAMLIBS)





[prev in list] [next in list] [prev in thread] [next in thread]