FreeBSD FreeRADIUS port updated to 1.1.5, with various enhancements

[David Wood]

In message <460FEE07.8010601 at deployingradius.com>, Alan DeKok
<aland at deployingradius.com> writes
>Nicolas Baradakis wrote:
>...
>> +ifeq ($(docdir),no)
>> +install:
>> +    @echo 'Documentation files will NOT be installed.'
>> +else
>
>  I'd prefer not to have multiple install targets... even if they're
>wrapped with 'ifeq'.  Sort of like how #ifdef's in the code should be
>avoided.

OK - implementing Alan's suggestions on top of Nicolas' patch gives:

Index: configure.in
===================================================================
RCS file: /source/radiusd/configure.in,v
retrieving revision 1.198.2.15.2.13
diff -u -r1.198.2.15.2.13 configure.in
--- configure.in        26 Mar 2007 12:58:16 -0000      1.198.2.15.2.13
+++ configure.in        1 Apr 2007 15:16:32 -0000
@@ -115,7 +115,7 @@
 [  --with-docdir=DIR       Directory for documentation [DATADIR/doc/freeradius] ],
 [ case "$withval" in
     no)
-       AC_MSG_ERROR(Need docdir)
+       docdir=no
        ;;
     yes)
        ;;
@@ -129,6 +129,9 @@
 )
 AC_SUBST(docdir)
 AC_MSG_RESULT($docdir)
+if test "x$docdir" = xno; then
+       AC_MSG_WARN(Documentation files will NOT be installed.)
+fi

 dnl extra argument: --with-logdir
 logdir='${localstatedir}/log/radius'
Index: doc/Makefile
===================================================================
RCS file: /source/radiusd/doc/Makefile,v
retrieving revision 1.4.4.2.2.3
diff -u -4 -r1.4.4.2.2.3 Makefile
--- doc/Makefile        15 Jul 2006 17:16:51 -0000      1.4.4.2.2.3
+++ doc/Makefile        1 Apr 2007 15:16:44 -0000
@@ -17,13 +17,15 @@
        @rm -f *~

 install:
-       $(INSTALL) -d -m 755 $(R)$(docdir)
-       for file in *[!~]; do \
-               if [ -f $$file -a $$file != Makefile ]; then \
-                       $(INSTALL) -m 644 $$file $(R)$(docdir); \
-               fi; \
-       done
-       @$(MAKE) $(MFLAGS) WHAT_TO_MAKE=$@ common
+       @if [ "$(docdir)" != "no" ]; then \
+               $(INSTALL) -d -m 755 $(R)$(docdir); \
+               for file in *[!~]; do \
+                       if [ -f $$file -a $$file != Makefile ]; then \
+                               $(INSTALL) -m 644 $$file $(R)$(docdir); \
+                       fi; \
+               done; \
+               $(MAKE) $(MFLAGS) WHAT_TO_MAKE=$@ common ; \
+       fi

 common: $(SUBDIRS)


(I apologise in advance that my mailer has probably eaten all the tabs -
if you want a file uploaded somewhere, I can do that).

The above patch is tested and working against 1.1.5. Passing
--without-docdir to configure generates a warning and prevents the
installation of any documentation.

If, after any desired tidying up, this can be committed to the CVS for
branch_1_1 and HEAD I would be grateful.



Many thanks,




David
-- 
David Wood
david at wood2.org.uk