Minor installation fixes

Link against json-c if available

diff --git a/src/include/autoconf.h.in b/src/include/autoconf.h.in
index 07b0ced7394cfb70da0aabccd501f0ee73c00be5..f92f61ac78ddc161f37a89c3e8f989e08d011c32 100644 (file)
--- a/src/include/autoconf.h.in
+++ b/src/include/autoconf.h.in
@@ -422,7 +422,7 @@
 /* Commit HEAD at time of configuring */
 #undef RADIUSD_VERSION_COMMIT
 
-/* Raw version string from VERSION */
+/* Raw version string from VERSION file */
 #undef RADIUSD_VERSION_STRING
 
 /* Define as the return type of signal handlers (`int' or `void'). */

diff --git a/src/modules/rlm_perl/all.mk.in b/src/modules/rlm_perl/all.mk.in
index 2a4b521982c1090302a1d2ce38b7342f4382dfc7..cb2722d48f51c04df44a56d05027473b2a710f26 100644 (file)
--- a/src/modules/rlm_perl/all.mk.in
+++ b/src/modules/rlm_perl/all.mk.in
@@ -12,4 +12,5 @@ TGT_LDLIBS    = @perl_ldflags@
 install: install.raddbdir $(R)$(raddbdir)/example.pl
 
 $(R)$(raddbdir)/example.pl: src/modules/rlm_perl/example.pl
-       @$(INSTALL) -m 755 src/modules/rlm_perl/example.pl $(R)$(raddbdir)/
+       @$(ECHO) INSTALL $(notdir $<)
+       @$(INSTALL) -m 755 $< $(R)$(raddbdir)/

diff --git a/src/modules/rlm_python/all.mk.in b/src/modules/rlm_python/all.mk.in
index 96f79b7bd59a1cccd7b55e8dec4b349a1dfafe0e..b21cd18e0b9b4f2f933fbfbe2e997ab6bbab0cd9 100644 (file)
--- a/src/modules/rlm_python/all.mk.in
+++ b/src/modules/rlm_python/all.mk.in
@@ -9,5 +9,8 @@ SOURCES         := $(TARGETNAME).c
 TGT_LDLIBS     := @python_ldflags@
 SRC_CFLAGS     := @python_cflags@
 
+install: install.raddbdir $(R)$(raddbdir)/example.py
+
 $(R)$(raddbdir)/example.py: src/modules/rlm_python/example.py
-       @$(INSTALL) -m 755 src/modules/rlm_python/example.py $(R)$(raddbdir)/
+       @$(ECHO) INSTALL $(notdir $<)
+       @$(INSTALL) -m 755 $< $(R)$(raddbdir)/

diff --git a/src/modules/rlm_rest/configure b/src/modules/rlm_rest/configure
index 75431fd0ce3de294ac57dac0f6da8619411516b9..76b234e0d76e9a2950569bbc44e200cccfd0a5dd 100755 (executable)
--- a/src/modules/rlm_rest/configure
+++ b/src/modules/rlm_rest/configure
@@ -3737,6 +3737,8 @@ done
        if test "$ac_cv_header_json_json_h" != "yes"; then
                { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: silently building without JSON support. requires: json-c." >&5
 $as_echo "$as_me: WARNING: silently building without JSON support. requires: json-c." >&2;}
+       else
+               rest_ldflags+=-ljson-c
        fi
 
        targetname=rlm_rest     # keep this!  Don't change!

diff --git a/src/modules/rlm_rest/configure.in b/src/modules/rlm_rest/configure.in
index aaa5385c964c2f440b99707c15058104cec2214f..06493493dbe2f343ef87aa5b09ca33fdd5277b0e 100644 (file)
--- a/src/modules/rlm_rest/configure.in
+++ b/src/modules/rlm_rest/configure.in
@@ -32,6 +32,8 @@ if test x$with_[]modname != xno; then
        
        if test "$ac_cv_header_json_json_h" != "yes"; then
                AC_MSG_WARN([silently building without JSON support. requires: json-c.])
+       else
+               rest_ldflags+=-ljson-c
        fi
 
        targetname=modname     # keep this!  Don't change!

diff --git a/src/modules/rlm_ruby/all.mk.in b/src/modules/rlm_ruby/all.mk.in
index 4168425b7d5594e30bd57ef26aa9a090b1484b81..6b8b2dc894e5438851770bbfb53de6769d35f481 100644 (file)
--- a/src/modules/rlm_ruby/all.mk.in
+++ b/src/modules/rlm_ruby/all.mk.in
@@ -9,5 +9,8 @@ SOURCES         := $(TARGETNAME).c
 SRC_CFLAGS     := @ruby_cflags@
 TGT_LDLIBS     := @ruby_ldflags@
 
+install: install.raddbdir $(R)$(raddbdir)/example.rb
+
 $(R)$(raddbdir)/example.rb: src/modules/rlm_ruby/example.rb
-       @$(INSTALL) -m 755 src/modules/rlm_ruby/example.rb $(R)$(raddbdir)/
+       @$(ECHO) INSTALL $(notdir $<)
+       @$(INSTALL) -m 755 $< $(R)$(raddbdir)/