Changeset 4794Tweet

Timestamp:

Dec 13, 2011, 11:17:42 PM (10 years ago)

Author:

Pascal Terjan

Message:

Test pam_misc.h location instead of checking for OSX

Location:

neercs/trunk

Files:

• configure.ac (modified) (1 diff)
• src/lock.c (modified) (1 diff)

neercs/trunk/configure.ac

@@ -71 +71 @@
   AC_MSG_ERROR([you need libcaca version 0.99.beta17 or later])])
 
-AC_CHECK_HEADERS(libutil.h util.h stdio.h pty.h sys/ioctl.h sys/ptrace.h sys/stat.h sys/syscall.h sys/user.h sys/wait.h linux/kdev_t.h linux/major.h security/pam_appl.h security/pam_misc.h)
+AC_CHECK_HEADERS(libutil.h util.h stdio.h pty.h sys/ioctl.h sys/ptrace.h sys/stat.h sys/syscall.h sys/user.h sys/wait.h linux/kdev_t.h linux/major.h security/pam_appl.h security/pam_misc.h pam/pam_appl.h pam/pam_misc.h)
 
-case $host_os in
-  darwin*)
-    AC_MSG_RESULT(Disabling lock support on OSX) ;;
-  *)
+if test "${ac_cv_header_security_pam_misc_h}" = "yes" -o "${ac_cv_header_pam_pam_misc_h}" = "yes"; then
     AC_CHECK_LIB(pam, pam_authenticate,
       [PAM_LIBS="${PAM_LIBS} -lpam"
-      AC_DEFINE(USE_LOCK, 1, [Locking the PTY is supported])]) ;;
-esac
+      AC_DEFINE(USE_LOCK, 1, [Locking the PTY is supported])])
+fi
 AC_SUBST(PAM_LIBS)
 

neercs/trunk/src/lock.c

@@ -23 +23 @@
 
 #if defined USE_LOCK
-#if defined(__APPLE__)
+#if defined HAVE_PAM_PAM_MISC_H
 #   include <pam/pam_appl.h>
 #   include <pam/pam_misc.h>