Sync with gnulib - lots of extraneous code removed in preference to GNU code

git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1580 f882894a-f735-0410-b71e-b25c423dba1c

2 files changed, 1 insertions, 36 deletions

diff --git a/tools/setup b/tools/setup
index 94bd077f..7fdb980d 100755
--- a/tools/setup
+++ b/tools/setup
@@ -18,17 +18,13 @@ else
 	echo Found GNU Make at $MAKE ... good.
 fi
 
-( cd m4 && $MAKE -f Makefile.am.in Makefile.am )
-
 # This bit is to fix SF's compile server as libtool not installed by default
 extra=""
 if test -d $HOME/share/aclocal ; then
 	extra="-I $HOME/share/aclocal"
 fi
 
-# I think gettext no longer necessary, as all necessary files imported from coreutils
-#autopoint --force
-aclocal -I m4 $extra
+aclocal -I gl/m4 -I m4 $extra
 #libtoolize --force --copy
 autoheader
 automake --add-missing --force-missing --copy
diff --git a/tools/update_coreutils b/tools/update_coreutils
deleted file mode 100755
index 5e195a0c..00000000
--- a/tools/update_coreutils
+++ /dev/null
@@ -1,31 +0,0 @@
-#!/bin/bash
-# Quick script to copy coreutil files into Nagios area
-# Pass $1 as top level of coreutils source dir
-# Expects to be run in the lib directory
-
-function die { echo $1; exit 1; }
-
-function copy_if_newer { [[ $1 -nt $2 ]] && cp $1 $2; }
-
-coreutils_dir=$1
-
-[[ -z $coreutils_dir ]] && die "Please specify coreutils directory"
-
-cwd=`pwd`
-
-[[ ${cwd##*/} != "lib" ]] && die "Must be run in lib directory"
-
-# Get list of files from EXTRA_DIST in Makefile.am
-# Need \\\ because the perl needs \\ but one is escaped
-files="`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`"
-
-for i in $files ; do
-	if [[ -e $coreutils_dir/lib/$i ]] ; then
-		copy_if_newer $coreutils_dir/lib/$i ./$i
-	elif [[ -e $coreutils_dir/m4/$i ]] ; then
-		copy_if_newer $coreutils_dir/m4/$i ./$i
-	else
-		echo "Not found: $i"
-	fi
-done
-