pam: configure.in - cleaning up selinux and prelude

[baggins]

Author: baggins                      Date: Tue Jul 12 12:15:08 2005 GMT
Module: pam                           Tag: HEAD
---- Log message:
- cleaning up selinux and prelude

---- Files affected:
pam:
   configure.in (1.57 -> 1.58) 

---- Diffs:

================================================================
Index: pam/configure.in
diff -u pam/configure.in:1.57 pam/configure.in:1.58
--- pam/configure.in:1.57	Mon Jul 11 18:54:09 2005
+++ pam/configure.in	Tue Jul 12 14:15:03 2005
@@ -174,40 +174,46 @@
 AC_CHECK_LIB(selinux, getfilecon, selinux_present=true, selinux_present=false)
 AC_MSG_CHECKING([whether to use SELinux])
 AC_ARG_ENABLE(selinux, [  --enable-selinux    Enable SELinux support [default=yes]],
-  if test \( "$enableval" = "yes" -o "$selinux" = "yes" \) -a "$selinux_present" = "true" ; then
-	AC_MSG_RESULT([yes])
+  if test "$enableval" = "yes" -o "$selinux" = "yes"; then
+        if test "$selinux_present" = "false"; then
+		AC_MSG_RESULT([no])
+		AC_MSG_ERROR(Cannot find libselinux)
+	else
+		AC_MSG_RESULT([yes])
+	fi
   else
+	AC_MSG_RESULT([no])
 	AC_MSG_WARN(SELinux support will not be enabled. pam_selinux and pam_selinux_check module will not be built!)
-  fi
-  AM_CONDITIONAL(SELINUX_PRESENT, test x$selinux_present = xtrue)
-  AC_DEFINE(WITH_SELINUX),
-  AM_CONDITIONAL(SELINUX_PRESENT, test x$selinux_present = xtrue)
-  AC_DEFINE(WITH_SELINUX)
+  fi,
   if test "$selinux_present" = "false"; then
+	AC_MSG_RESULT([no])
 	AC_MSG_WARN(SELinux support will not be enabled. pam_selinux and pam_selinux_check module will not be built!)
   else
 	AC_MSG_RESULT([yes])
   fi
 )
+AM_CONDITIONAL(SELINUX_PRESENT, test x$selinux_present = xtrue)
+AC_DEFINE(WITH_SELINUX)
 
-AC_CHECK_LIB(prelude, getfilecon, prelude_present=true, prelude_present=false)
+AM_PATH_LIBPRELUDE(0.9.0, prelude_present=true, prelude_present=false)
 AC_MSG_CHECKING([whether to use Prelude IDS])
 AC_ARG_ENABLE(prelude, [  --enable-prelude    Enable Prelude IDS support in libpam [default=yes]],
-  if test \( "$enableval" = "yes" -o "$prelude" = "yes" \) -a "$prelude_present" = "true" ; then
+  if test "$enableval" = "yes" -o "$prelude" = "yes"; then
 	AC_MSG_RESULT([yes])
+	if test "$prelude_present" = "false"; then
+		AC_MSG_ERROR(Cannot find libprelude: Is libprelude-config in the path?)
+	fi
   else
-	AC_MSG_WARN(Prelude support will not be enabled.)
-  fi
-  AM_CONDITIONAL(PRELUDE_PRESENT, test x$prelude_present = xtrue)
-  AC_DEFINE(WITH_PRELUDE),
-  AM_CONDITIONAL(PRELUDE_PRESENT, test x$prelude_present = xtrue)
-  AC_DEFINE(WITH_PRELUDE),
+	AC_MSG_RESULT([no])
+	AC_MSG_WARN(Prelude IDS support in libpam will not be enabled.)
+  fi,
+  AC_MSG_RESULT([yes])
   if test "$prelude_present" = "false"; then
-	AC_MSG_WARN(Prelude support will not be enabled.)
-  else
-	AC_MSG_RESULT([yes])
+	AC_MSG_WARN(Prelude IDS support in libpam will not be enabled.)
   fi
 )
+AM_CONDITIONAL(PRELUDE_PRESENT, test x$prelude_present = xtrue)
+AC_DEFINE(WITH_PRELUDE)
 
 dnl Checks for programs.
 AC_PROG_CC
@@ -330,8 +336,6 @@
 	AC_MSG_WARN(pam_cap module will not be built!))
 AC_CHECK_LIB(opie, opieverify, opielib_present=true,
 	AC_MSG_WARN(pam_opie modules will not be built!))
-AC_CHECK_LIB(prelude, getfilecon, prelude_present=true,
-	AC_MSG_WARN(Prelude IDS support will not be enabled!))
 AC_MSG_CHECKING(for hosts_access in -lwrap)
 oldLIBS=$LIBS
 LIBS="$LIBS -lwrap"
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/pam/configure.in?r1=1.57&r2=1.58&f=u