[Nagiosplug-devel] Re: [Nagiosplug-checkins] CVS: nagiosplug Makefile.am,1.6,1.7

[Ton Voon]

Sorry, keep forgetting to reply-all - copying onto nagiosplug-devel list.

I thought the m4 stuff does extra bits, such as check for other dependant libraries?

Ton

On Wednesday, February 19, 2003, at 08:33AM, Karl DeBisschop <karl at debisschop.net> wrote:

>My solution is to remove getloadavg.m4 and make a few mods to
>configure.in.
>
>Specifically, all getloadavg.m4 does is allow you to put getloadavg.c
>someplace other than in the top srcdir. So I redefine srcdir to look in
>lib, then run AC_FUNC_GETLOADAVG, then reset srcdir:
>
>#########################
>saved_srcdir=$srcdir
>srcdir=$srcdir/lib
>test -f $srcdir/getloadavg.c \
>  || AC_MSG_ERROR([getloadavg.c is not in $srcdir])
>AC_FUNC_GETLOADAVG
>srcdir=$saved_srcdir
>########################
>
>I agree that the old method was broken -- we've had one or two reports
>on not finding getloadavg.c, in fact. This should fix that, I think.
>
>I sort of suspect that with this working, we may turn up different
>issues on those systems where problems were prviously found. But I also
>think we've made progress with this set of changes.
>
>--
>Karl
>
>On Tue, 2003-02-18 at 20:28, Ton Voon wrote:
>> On Tuesday, February 18, 2003, at 10:18  pm, Karl DeBisschop wrote:
>> 
>> > On Tue, 2003-02-18 at 16:58, Ton Voon wrote:
>> >> Update of /cvsroot/nagiosplug/nagiosplug
>> >> In directory sc8-pr-cvs1:/tmp/cvs-serv5780
>> >>
>> >> Modified Files:
>> >> 	Makefile.am
>> >> Log Message:
>> >> Add SUPPORT file to distribution
>> >>
>> >>
>> >> Index: Makefile.am
>> >> ===================================================================
>> >> RCS file: /cvsroot/nagiosplug/nagiosplug/Makefile.am,v
>> >> retrieving revision 1.6
>> >> retrieving revision 1.7
>> >> diff -C2 -r1.6 -r1.7
>> >> *** Makefile.am	10 Feb 2003 23:24:35 -0000	1.6
>> >> --- Makefile.am	18 Feb 2003 21:58:01 -0000	1.7
>> >> ***************
>> >> *** 3,7 ****
>> >>   SUBDIRS = lib plugins plugins-scripts
>> >>
>> >> ! EXTRA_DIST = REQUIREMENTS acconfig.h subst.in subst.sh Helper.pm	\
>> >>   contrib nagios-plugins.spec.in getloadavg.m4
>> >>
>> >> --- 3,7 ----
>> >>   SUBDIRS = lib plugins plugins-scripts
>> >>
>> >> ! EXTRA_DIST = REQUIREMENTS SUPPORT acconfig.h subst.in subst.sh 
>> >> Helper.pm	\
>> >>   contrib nagios-plugins.spec.in getloadavg.m4
>> >
>> > You did the getopt changes, right?
>> >
>> > Should we put getloadavg.c into lib as well?
>> >
>> > If so, do you ahve a few moments to implement it?  It should be the
>> > actual move plus mods to where AM/AC call getloadavg.m4
>> >
>> 
>> Well, I've made the changes, and they work on my MacOSX system with:
>> 
>> $ aclocal -I lib
>> $ autoheader
>> $ autoconf
>> $ automake
>> 
>> However, I think I have broken something as I get failures when running 
>> autoheader on a Linux 2.4 system:
>> 
>> $ aclocal -I lib
>> $ autoheader
>> /usr/bin/autoheader2.13: eval: line 16: unexpected EOF while looking 
>> for matching ``'
>> /usr/bin/autoheader2.13: eval: line 621: syntax error: unexpected end 
>> of file
>> 
>> My MacOSX system is at autoconf is 2.52 and automake 1.6.1. The Linux 
>> system is at autoconf 2.13 and automake 1.4.
>> 
>> There is no problem if you ignore getloadavg.m4:
>> 
>> $ aclocal
>> $ grep getload aclocal.m4
>> $ autoheader
>> $ autoconf
>> $ automake
>> 
>> getloadavg.m4 is exactly the same as the one previously, which makes me 
>> think that it never included the file correctly before. This would 
>> introduce a dependency on autoconf and automake.
>> 
>> What do you want to do? I think we should maybe revisit this for 1.4, 
>> but revert back for now.
>> 
>> Ton, needing some sleep now...
>
>
>