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

[nagiosplug.git] / tools / setup

diff --git a/tools/setup b/tools/setup
index 94bd077fa410149fd6d24415c90d9322f3185573..7fdb980da6ba05d10c8680c275f89bd9d8fec4d7 100755 (executable)
--- 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