From df40cd8741bb0c0f6deed0b56ced87fea6d52cb4 Mon Sep 17 00:00:00 2001 From: Sumit Bose Date: Wed, 21 Oct 2009 14:55:20 +0200 Subject: [PATCH 1/3] Add basic OS detection Detect if the OS is Fedora, RHEL or SUSE and install the SUSE start-script on SUSE systems. --- server/Makefile.am | 12 ++++++++++-- server/configure.ac | 1 + server/external/platform.m4 | 29 +++++++++++++++++++++++++++++ server/sysv/{sssd.SUSE => SUSE/sssd} | 0 4 files changed, 40 insertions(+), 2 deletions(-) create mode 100644 server/external/platform.m4 rename server/sysv/{sssd.SUSE => SUSE/sssd} (100%) diff --git a/server/Makefile.am b/server/Makefile.am index c43eb47..8f36f72 100644 --- a/server/Makefile.am +++ b/server/Makefile.am @@ -113,6 +113,7 @@ pyexec_LTLIBRARIES = \ endif dist_noinst_SCRIPTS = \ + $(EXTRA_SCRIPTS) \ config/setup.py \ config/ipachangeconf.py \ config/SSSDConfig.py @@ -750,8 +751,15 @@ SUFFIXES = .1.xml .1 .3.xml .3 .5.xml .5 .8.xml .8 # Installation Extras # ####################### -dist_init_SCRIPTS = \ - sysv/sssd +dist_init_SCRIPTS = +if HAVE_SUSE + dist_init_SCRIPTS += \ + sysv/SUSE/sssd +else + dist_init_SCRIPTS += \ + sysv/sssd +endif + dist_sssdconf_DATA = \ config/etc/sssd.api.conf diff --git a/server/configure.ac b/server/configure.ac index 696a5a4..e471c84 100644 --- a/server/configure.ac +++ b/server/configure.ac @@ -55,6 +55,7 @@ WITH_KRB5_PLUGIN_PATH WITH_PYTHON_BINDINGS WITH_SELINUX +m4_include([external/platform.m4]) m4_include([external/pkg.m4]) m4_include([external/libpopt.m4]) m4_include([external/libtalloc.m4]) diff --git a/server/external/platform.m4 b/server/external/platform.m4 new file mode 100644 index 0000000..71b4f2c --- /dev/null +++ b/server/external/platform.m4 @@ -0,0 +1,29 @@ +AC_ARG_WITH([os], + [AC_HELP_STRING([--with-os=OS_TYPE], [Type of your operation system (fedora|redhat|suse)])] + ) +osname="" +if test x"$with_os" != x ; then + if test x"$with_os" == xfedora -o \ + x"$with_os" == xredhat -o \ + x"$with_os" == xsuse ; then + osname=$with_os + else + AC_MSG_ERROR([Illegal value -$with_os- for option --with-os]) + fi +fi + +if test x"$osname" = x ; then + if test -f /etc/fedora-release ; then + osname="fedora" + elif test -f /etc/redhat-release ; then + osname="redhat" + elif test -f /etc/SuSE-release ; then + osname="suse" + fi + + AC_MSG_NOTICE([Detected operation system type: $osname]) +fi + +AM_CONDITIONAL([HAVE_FEDORA], [test x"$osname" == xfedora]) +AM_CONDITIONAL([HAVE_REDHAT], [test x"$osname" == xredhat]) +AM_CONDITIONAL([HAVE_SUSE], [test x"$osname" == xsuse]) diff --git a/server/sysv/sssd.SUSE b/server/sysv/SUSE/sssd similarity index 100% rename from server/sysv/sssd.SUSE rename to server/sysv/SUSE/sssd -- 1.6.5.2