PolicyKit: Branch 'master'

[David Zeuthen]

 configure.in |    8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

New commits:
diff-tree 3406f9f20826473dbf2de8c0dbd71f0b5bb8c8e7 (from 1b8d31e1fef50dd4ff3ddc5bee539175dc93daa5)
Author: Doug Goldstein <cardoe at gentoo.org>
Date:   Thu Sep 6 12:07:20 2007 -0400

    gentoo OS type support
    
    Adds Gentoo as a valid OS type

diff --git a/configure.in b/configure.in
index 054cbf4..a2bb3a8 100644
--- a/configure.in
+++ b/configure.in
@@ -295,12 +295,13 @@ fi
 
 AC_SUBST(PAM_MODULE_DIR)
 
-AC_ARG_WITH(os-type,     [  --with-os-type=<os>        distribution or OS (redhat)])
+AC_ARG_WITH(os-type,     [  --with-os-type=<os>        distribution or OS (redhat/suse/gentoo)])
 
 #### Check our operating system (distro-tweaks required)
 if test "z$with_os_type" = "z"; then
 	AC_CHECK_FILE(/etc/redhat-release,distro_type="redhat")
 	AC_CHECK_FILE(/etc/SuSE-release,distro_type="suse")
+	AC_CHECK_FILE(/etc/gentoo-release,distro_type="gentoo")
 	if test "z$distro_type" = "z"; then
 		echo "Linux distribution autodetection failed, specify the distribution to target using --with-os-type="
 	else
@@ -314,6 +315,8 @@ if test x$with_os_type = x; then
         with_os_type=redhat
     elif test x$operating_system = xsuse ; then
         with_os_type=suse
+    elif test x$operating_system = xgentoo ; then
+        with_os_type=gentoo
     else
         with_os_type=unknown
     fi
@@ -323,6 +326,7 @@ fi
 AM_CONDITIONAL(OS_TYPE_UNKNOWN, test x$with_os_type = xunknown, [Running on unknown OS])
 AM_CONDITIONAL(OS_TYPE_RED_HAT, test x$with_os_type = xredhat, [Running on Red Hat OS'es])
 AM_CONDITIONAL(OS_TYPE_SUSE, test x$with_os_type = xsuse, [Running on SUSE OS'es])
+AM_CONDITIONAL(OS_TYPE_GENTOO, test x$with_os_type = xgentoo, [Running on Gentoo OS'es])
 
 AC_ARG_WITH(pam-include, [  --with-pam-include=<file>  pam file to include])
 
@@ -332,7 +336,7 @@ if ! test -z "$with_pam_include"; then
    PAM_FILE_INCLUDE_ACCOUNT=$with_pam_include
    PAM_FILE_INCLUDE_PASSWORD=$with_pam_include
    PAM_FILE_INCLUDE_SESSION=$with_pam_include
-elif test x$with_os_type = xredhat ; then
+elif test x$with_os_type = xredhat -o x$with_os_type = xgentoo ; then
    PAM_FILE_INCLUDE_AUTH=system-auth
    PAM_FILE_INCLUDE_ACCOUNT=system-auth
    PAM_FILE_INCLUDE_PASSWORD=system-auth