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

1 files changed, 1 insertions, 5 deletions

diff --git a/tools/setup b/tools/setup
index 94bd077..7fdb980 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