Adding ability to disable widget symlinks.v0.1.9

4 files changed, 32 insertions, 5 deletions

diff --git a/ChangeLog b/ChangeLog
index 6ed34b3..f5ee506 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,7 @@ Secure Core Utilities
 Copyright (C) 2015, 2017 David M. Syzdek <david@syzdek.net>.
 
 0.2
+  - core: adding ability to disable creating widget symlinks (syzdek)
   - core: updating copyright notices (syzdek)
   - core: adding ability to change widget alias prefix at compile time (syzdek)
   - tail: allowing timeout to be modified via env variable TAILTIMEOUT (syzdek)
diff --git a/Makefile.am b/Makefile.am
index 4dbed62..1960983 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -129,11 +129,9 @@ include $(srcdir)/@bindletools_srcdir@/build-aux/makefile-version.am
 
 
 # custom targets
-.PHONY:
+.PHONY: install-widget-symlinks
 
-
-# local targets
-install-exec-local:
+install-widget-symlinks:
         ( cd $(DESTDIR)$(bindir); ln -sf securecoreutils $(SCU_PREFIX)cat; )
         ( cd $(DESTDIR)$(bindir); ln -sf securecoreutils $(SCU_PREFIX)path; )
         ( cd $(DESTDIR)$(bindir); ln -sf securecoreutils $(SCU_PREFIX)rm; )
@@ -143,7 +141,12 @@ install-exec-local:
         ( cd $(DESTDIR)$(bindir); ln -sf securecoreutils $(SCU_PREFIX)bzcat; )
         ( cd $(DESTDIR)$(bindir); ln -sf securecoreutils $(SCU_PREFIX)gzcat; )
         ( cd $(DESTDIR)$(bindir); ln -sf securecoreutils $(SCU_PREFIX)xzcat; )
+if SCU_SYMLINKS
+INSTALL_SYMLINKS = install-widget-symlinks
+endif
 
+# local targets
+install-exec-local: $(INSTALL_SYMLINKS)
 
 install-data-local:
 
diff --git a/acinclude.m4 b/acinclude.m4
index 3e873f1..8c0b90c 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -58,6 +58,27 @@ AC_DEFUN([AC_SCU_PREFIX],[dnl
 ])dnl
 
 
+# AC_SCU_SYMLINKS
+# ______________________________________________________________________________
+AC_DEFUN([AC_SCU_SYMLINKS],[dnl
+
+   enableval=""
+   AC_ARG_ENABLE(
+      symlinks,
+      [AS_HELP_STRING([--disable-symlinks], [disable creating symlinks for widgets])],
+      [ ESYMLINKS=$enableval ],
+      [ ESYMLINKS=$enableval ]
+   )
+
+   if test "x${ESYMLINKS}" != "xno";then
+      ESYMLINKS="yes"
+   fi
+   SCU_SYMLINKS=${ESYMLINKS}
+
+   AM_CONDITIONAL([SCU_SYMLINKS], [test "x$SCU_SYMLINKS" = "xyes"])
+])dnl
+
+
 # AC_SCU_WIDGET_TAIL
 # ______________________________________________________________________________
 AC_DEFUN([AC_SCU_WIDGET_TAIL],[dnl
diff --git a/configure.ac b/configure.ac
index 47fc237..f96ea1d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -164,6 +164,7 @@ AC_BINDLE_GIT_PACKAGE_VERSION([contrib/bindletools/build-aux/git-package-version
 # custom configure options
 AC_BINDLE_ENABLE_WARNINGS
 AC_SCU_PREFIX
+AC_SCU_SYMLINKS
 AC_SCU_WIDGET_TAIL
 AC_SCU_WIDGET_ZCAT
 
@@ -182,7 +183,8 @@ AC_MSG_NOTICE([ ])
 AC_MSG_NOTICE([   Secure Core Utilities $GIT_PACKAGE_VERSION ($GIT_PACKAGE_BUILD)])
 AC_MSG_NOTICE([ ])
 AC_MSG_NOTICE([   Options:])
-AC_MSG_NOTICE([      widget prefix:             "${SCU_PREFIX}"])
+AC_MSG_NOTICE([      widget prefix:             ${SCU_PREFIX}])
+AC_MSG_NOTICE([      create symlinks:           ${SCU_SYMLINKS}])
 AC_MSG_NOTICE([      tail timeout:              $SCU_TAIL_TIMEOUT])
 AC_MSG_NOTICE([ ])
 AC_MSG_NOTICE([   Support:])