summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
Diffstat (limited to 'tools')
-rwxr-xr-xtools/setup6
-rwxr-xr-xtools/update_coreutils31
2 files changed, 1 insertions, 36 deletions
diff --git a/tools/setup b/tools/setup
index 94bd077..7fdb980 100755
--- a/tools/setup
+++ b/tools/setup
@@ -18,17 +18,13 @@ else
18 echo Found GNU Make at $MAKE ... good. 18 echo Found GNU Make at $MAKE ... good.
19fi 19fi
20 20
21( cd m4 && $MAKE -f Makefile.am.in Makefile.am )
22
23# This bit is to fix SF's compile server as libtool not installed by default 21# This bit is to fix SF's compile server as libtool not installed by default
24extra="" 22extra=""
25if test -d $HOME/share/aclocal ; then 23if test -d $HOME/share/aclocal ; then
26 extra="-I $HOME/share/aclocal" 24 extra="-I $HOME/share/aclocal"
27fi 25fi
28 26
29# I think gettext no longer necessary, as all necessary files imported from coreutils 27aclocal -I gl/m4 -I m4 $extra
30#autopoint --force
31aclocal -I m4 $extra
32#libtoolize --force --copy 28#libtoolize --force --copy
33autoheader 29autoheader
34automake --add-missing --force-missing --copy 30automake --add-missing --force-missing --copy
diff --git a/tools/update_coreutils b/tools/update_coreutils
deleted file mode 100755
index 5e195a0..0000000
--- a/tools/update_coreutils
+++ /dev/null
@@ -1,31 +0,0 @@
1#!/bin/bash
2# Quick script to copy coreutil files into Nagios area
3# Pass $1 as top level of coreutils source dir
4# Expects to be run in the lib directory
5
6function die { echo $1; exit 1; }
7
8function copy_if_newer { [[ $1 -nt $2 ]] && cp $1 $2; }
9
10coreutils_dir=$1
11
12[[ -z $coreutils_dir ]] && die "Please specify coreutils directory"
13
14cwd=`pwd`
15
16[[ ${cwd##*/} != "lib" ]] && die "Must be run in lib directory"
17
18# Get list of files from EXTRA_DIST in Makefile.am
19# Need \\\ because the perl needs \\ but one is escaped
20files="`perl -ne '$a=1 if s/^EXTRA_DIST\s*=\s*|libnagiosplug_a_SOURCES\s*=\s*//; $a=0 if /^\s*$/; if ($a==1) {s/\\\//; print $_}' Makefile.am`"
21
22for i in $files ; do
23 if [[ -e $coreutils_dir/lib/$i ]] ; then
24 copy_if_newer $coreutils_dir/lib/$i ./$i
25 elif [[ -e $coreutils_dir/m4/$i ]] ; then
26 copy_if_newer $coreutils_dir/m4/$i ./$i
27 else
28 echo "Not found: $i"
29 fi
30done
31