build-sys: remove libtool

Signed-off-by: Karel Zak <kzak@redhat.com>

diff --git a/autogen.sh b/autogen.sh
index 70bb96b26132946995a2a03874fee683cd928e4f..3451b953f0a228cae994b0a229ceea15f59907c0 100755 (executable)
--- a/autogen.sh
+++ b/autogen.sh
@@ -44,13 +44,6 @@ DIE=0
        echo "or see http://www.gnu.org/software/autoheader"
        DIE=1
 }
-(libtool --version) < /dev/null > /dev/null 2>&1 || {
-       echo
-       echo "You must have libtool installed to generate util-linux build-system."
-       echo "Download the appropriate package for your distribution,"
-       echo "or see http://www.gnu.org/software/libtool"
-       DIE=1
-}
 if test "$DIE" -eq 1; then
        exit 1
 fi
@@ -62,7 +55,6 @@ test -f mount/mount.c || {
 
 set -e
 autopoint --force
-libtoolize --copy --force
 aclocal -I m4
 autoconf
 autoheader

diff --git a/configure.ac b/configure.ac
index 79dcc6d15f8c8bd606b718aae721690854d11a87..0af567a07cd522647725342490273c2206bd92ff 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -26,7 +26,6 @@ esac
 
 AC_PROG_CC_STDC
 AC_GNU_SOURCE
-AC_PROG_LIBTOOL
 
 AC_PATH_PROG(PERL, perl)
 AC_PATH_PROG(BLKID, blkid, [], [$PATH:/sbin])

diff --git a/tests/helpers/Makefile.am b/tests/helpers/Makefile.am
index 6c514e7c7646ae239ca73e030dbfef7eb00e56a0..b6f0557f4e0fd56dc53b7f10c3876393c80796e5 100644 (file)
--- a/tests/helpers/Makefile.am
+++ b/tests/helpers/Makefile.am
@@ -3,9 +3,3 @@ include $(top_srcdir)/config/include-Makefile.am
 noinst_PROGRAMS = mnt_test_sysinfo
 mnt_test_sysinfo_SOURCES = mnt_test_sysinfo.c
 
-
-noinst_LTLIBRARIES = libpreload-time.la
-
-libpreload_time_la_SOURCES = libpreload-time.c
-libpreload_time_la_LDFLAGS = -shared -rpath `pwd`  -avoid-version
-

diff --git a/tests/helpers/libpreload-time.c b/tests/helpers/libpreload-time.c
deleted file mode 100644 (file)
index e697950..0000000
--- a/tests/helpers/libpreload-time.c
+++ /dev/null
@@ -1,26 +0,0 @@
-
-#include <stdio.h>
-#include <ctype.h>
-#include <stdlib.h>
-#include <time.h>
-#include <sys/time.h>
-
-time_t
-time(time_t *t)
-{
-       time_t tt = 0;
-       char *e = getenv("TEST_TIME");
-
-       if (e && isdigit((unsigned char) *e))
-               tt = atol(e);
-       else {
-               struct timeval tv;
-
-               if (gettimeofday(&tv, NULL) == 0)
-                       tt = tv.tv_sec;
-       }
-       if (t)
-               *t = tt;
-
-       return tt;
-}