From f55b89c867ab63aaf69daae0aec0c19f1c52d521 Mon Sep 17 00:00:00 2001 From: Michael Rash Date: Sun, 30 Jun 2013 14:50:12 -0400 Subject: [PATCH] [libfko] Have 'make install' run ldconfig if basic fwknop/fwknopd -h exec fails This commit makes sure that if running 'fwknop -h' or 'fwknopd -h' appears to fail then run ldconfig under the 'make install' step. George Herlin reported that on some systems ldconfig was not automatically getting executed via the autoconf Makefile config, and since fwknop/fwknopd depend on a shared library (libfko), ldconfig needs to be executed by 'make install' if it wasn't already done. --- CREDITS | 3 +++ Makefile.am | 11 +++++++++++ 2 files changed, 14 insertions(+) diff --git a/CREDITS b/CREDITS index 58708a32..41e8440e 100644 --- a/CREDITS +++ b/CREDITS @@ -115,6 +115,9 @@ George Herlin test suite operate equivalently regardless of whether valgrind is used or whether fwknop is being tested on an embedded system with very limited resources. + - Suggested that 'make install' run ldconfig since on some systems it + appears that ldconfig is not automatically run via the autoconf generated + Makefile configs. Ruhsam Bernhard - Reported an issue where the message size test would result in long diff --git a/Makefile.am b/Makefile.am index a480d194..b6c92058 100644 --- a/Makefile.am +++ b/Makefile.am @@ -345,3 +345,14 @@ install-exec-hook: if test -f $(DESTDIR)$(sysconfdir)/fwknop/access.conf; then \ chmod 600 $(DESTDIR)$(sysconfdir)/fwknop/access.conf; \ fi + if test -f $(DESTDIR)$(bindir)/fwknop; then \ + if ! $(DESTDIR)$(bindir)/fwknop -h > /dev/null 2>&1; then \ + ldconfig; \ + fi \ + else \ + if test -f $(DESTDIR)$(sbindir)/fwknopd; then \ + if ! $(DESTDIR)$(sbindir)/fwknopd -h > /dev/null 2>&1; then \ + ldconfig -v; \ + fi \ + fi \ + fi