Relevant BUGIDs:

Purpose of commit: new feature

Commit summary:
---------------

2006-06-27  Thorsten Kukuk <kukuk@thkukuk.de>

        * configure.in: Allow disabling of SELinux support, check for
        rootok_af.

diff --git a/ChangeLog b/ChangeLog
index 8733958a1e980408fcf0cc83a59e653336e03f88..06c822f5bc8feca89c2a7dc60b9b78cf3924d0ff 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-06-27  Thorsten Kukuk <kukuk@thkukuk.de>
+
+       * configure.in: Allow disabling of SELinux support, check for
+       rootok_af.
+
 2006-06-27  Tomas Mraz <t8m@centrum.cz>
 
        * modules/pam_namespace/pam_namespace.c: New module

diff --git a/configure.in b/configure.in
index 6242e48d8d93fdd16870bd3ab5094d0f87057d86..c21f6295a3d445d9d8d39780cdc867129e26bdd8 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -352,7 +352,14 @@ AC_CHECK_FUNCS(yp_get_default_domain)
 LIBS=$BACKUP_LIBS
 AC_SUBST(LIBNSL)
 
-AC_CHECK_LIB([selinux],[getfilecon], LIBSELINUX="-lselinux", LIBSELINUX="")
+AC_ARG_ENABLE([selinux],
+        AC_HELP_STRING([--disable-selinux],[do not use SELinux]),
+        WITH_SELINUX=$enableval, WITH_SELINUX=yes)
+if test "$WITH_SELINUX" == "yes" ; then
+  AC_CHECK_LIB([selinux],[getfilecon], LIBSELINUX="-lselinux", LIBSELINUX="")
+else
+  LIBSELINUX=""
+fi
 AC_SUBST(LIBSELINUX)
 AM_CONDITIONAL([HAVE_LIBSELINUX], [test ! -z "$LIBSELINUX"])
 if test ! -z "$LIBSELINUX" ; then
@@ -390,7 +397,8 @@ AC_CHECK_FUNCS(fseeko gethostname gettimeofday lckpwdf mkdir select)
 AC_CHECK_FUNCS(strcspn strdup strspn strstr strtol uname)
 AC_CHECK_FUNCS(getpwnam_r getpwuid_r getgrnam_r getgrgid_r getspnam_r)
 AC_CHECK_FUNCS(getgrouplist getline getdelim)
-AC_CHECK_FUNCS(inet_ntop inet_pton)
+AC_CHECK_FUNCS(inet_ntop inet_pton ruserok_af)
+
 AC_CHECK_FUNCS(unshare, [UNSHARE=yes], [UNSHARE=no])
 AM_CONDITIONAL([HAVE_UNSHARE], [test "$UNSHARE" = yes])