[gssproxy] 01/01: Remove sysvinit support

This is an automated email from the git hooks/post-receive script. simo pushed a commit to branch master in repository gssproxy. commit 1211ec865b28f5e9c985f7eb75349abb5af26d4c Author: Robbie Harwood <rharwood(a)redhat.com&gt; Date: Wed Jan 11 20:06:58 2017 +0000 Remove sysvinit support Also set the default to systemd and add an option for no init. Signed-off-by: Robbie Harwood <rharwood(a)redhat.com&gt; Reviewed-by: Simo Sorce <simo(a)redhat.com&gt; Merges #37 --- proxy/Makefile.am | 4 ---- proxy/conf_macros.m4 | 26 ++++---------------------- proxy/configure.ac | 2 -- 3 files changed, 4 insertions(+), 28 deletions(-) diff --git a/proxy/Makefile.am b/proxy/Makefile.am index 4359938..fa1264c 100644 --- a/proxy/Makefile.am +++ b/proxy/Makefile.am @@ -21,7 +21,6 @@ gssconfdir = $(sysconfdir)/gss localedir = @localedir@ ccpath = @ccpath@ -initdir = @initdir@ systemdunitdir = @systemdunitdir@ examplesdir= @datarootdir@/examples logpath = @logpath@ @@ -233,7 +232,6 @@ endif # Installation Extras # ####################### -dist_init_SCRIPTS = systemdunit_DATA = if HAVE_SYSTEMD_UNIT systemdunit_DATA += \ @@ -306,8 +304,6 @@ install-exec-hook: installgsspdirs mkdir -p doc $(DESTDIR)/$(docdir); cp -a doc $(DESTDIR)/$(docdir)/ if HAVE_SYSTEMD_UNIT mkdir -p $(DESTDIR)$(systemdunitdir) -else - mkdir -p $(DESTDIR)$(initdir) endif clean-local: diff --git a/proxy/conf_macros.m4 b/proxy/conf_macros.m4 index b35eae1..331a01d 100644 --- a/proxy/conf_macros.m4 +++ b/proxy/conf_macros.m4 @@ -80,44 +80,26 @@ AC_DEFUN([WITH_PID_FILE], AC_DEFUN([WITH_INITSCRIPT], [ AC_ARG_WITH([initscript], [AC_HELP_STRING([--with-initscript=INITSCRIPT_TYPE], - [Type of your init script (sysv|systemd). [sysv]] + [Type of your init script (systemd|none). [systemd]] ) ] ) - default_initscript=sysv + default_initscript=systemd if test x"$with_initscript" = x; then with_initscript=$default_initscript fi - if test x"$with_initscript" = xsysv || \ - test x"$with_initscript" = xsystemd; then + if test x"$with_initscript" = xsystemd || \ + test x"$with_initscript" = xnone; then initscript=$with_initscript else AC_MSG_ERROR([Illegal value -$with_initscript- for option --with-initscript]) fi - AM_CONDITIONAL([HAVE_SYSV], [test x"$initscript" = xsysv]) AM_CONDITIONAL([HAVE_SYSTEMD_UNIT], [test x"$initscript" = xsystemd]) AC_MSG_NOTICE([Will use init script type: $initscript]) ]) -AC_DEFUN([WITH_INIT_DIR], - [ AC_ARG_WITH([init-dir], - [AC_HELP_STRING([--with-init-dir=DIR], - [Where to store init script for gssproxy [/etc/rc.d/init.d]] - ) - ] - ) - initdir="${sysconfdir}/rc.d/init.d" - if test x$osname == xgentoo; then - initdir="${sysconfdir}/init.d" - fi - if test x"$with_init_dir" != x; then - initdir=$with_init_dir - fi - AC_SUBST(initdir) - ]) - dnl A macro to configure the directory to install the systemd unit files to AC_DEFUN([WITH_SYSTEMD_UNIT_DIR], [ AC_ARG_WITH([systemdunitdir], diff --git a/proxy/configure.ac b/proxy/configure.ac index c75515e..63c0edf 100644 --- a/proxy/configure.ac +++ b/proxy/configure.ac @@ -50,7 +50,6 @@ AC_COMPILE_IFELSE( [AC_DEFINE([HAVE_PTHREAD], [1], [Pthread mutexes available.])], [AC_MSG_WARN([Pthread library not found! Clients will not be thread safe...])]) -#Include here cause WITH_INIT_DIR requires $osname set in platform.m4 m4_include([external/platform.m4]) m4_include(conf_macros.m4) @@ -60,7 +59,6 @@ WITH_LOG_PATH WITH_PUBCONF_PATH WITH_SOCKET_NAME WITH_PID_FILE -WITH_INIT_DIR WITH_TEST_DIR WITH_MANPAGES WITH_XML_CATALOG -- To stop receiving notification emails like this one, please contact the administrator of this repository.