scummvm random work

[patches.git] / shadow-friendly-selinux.patch

Index: configure.in
===================================================================
RCS file: /cvsroot/shadow/configure.in,v
retrieving revision 1.150
diff -u -p -r1.150 configure.in
--- configure.in	3 Aug 2006 10:14:05 -0000	1.150
+++ configure.in	5 Aug 2006 18:51:34 -0000
@@ -220,7 +220,7 @@ AC_ARG_WITH(libpam,
 	[with_libpam=$withval], [with_libpam=yes])
 AC_ARG_WITH(selinux,
 	[AC_HELP_STRING([--with-selinux], [use SELinux support @<:@default=autodetect@:>@])],
-	[with_selinux=$withval], [with_selinux=yes])
+	[with_selinux=$withval], [with_selinux=maybe])
 AC_ARG_WITH(skey,
 	[AC_HELP_STRING([--with-skey], [use S/Key support @<:@default=no@:>@])],
 	[with_skey=$withval], [with_skey=no])
@@ -282,15 +282,21 @@ if test "$with_libcrack" = "yes"; then
 		AC_DEFINE(HAVE_LIBCRACK_PW, 1, [Defined if it includes *Pw functions.]))
 fi
 
-if test "$with_selinux" = "yes"; then
+if test "$with_selinux" != "no" ; then
+	have_selinux="yes"
 	AC_CHECK_LIB(selinux, is_selinux_enabled,
 		[LIBSELINUX="-lselinux"
 		AC_SUBST(LIBSELINUX)
 		AC_CHECK_HEADERS(selinux/selinux.h, [],
-			[AC_MSG_ERROR([selinux/selinux.h is missing])])
+			[have_selinux="no"])
 		AC_DEFINE(WITH_SELINUX, 1, [Build shadow with SELinux support])
 		],
-		[AC_MSG_ERROR([libselinux not found])])
+		[have_selinux="no"])
+	if test "x$have_selinux$with_selinux" = "xnoyes" ; then
+		AC_MSG_ERROR([selinux support not found])
+	else
+		with_selinux="$have_selinux"
+	fi
 fi
 
 AC_SUBST(LIBPAM)