From 8c72b730bef6f3c5c4b5daece1d2baa84f663f7f Mon Sep 17 00:00:00 2001
From: Kay Sievers <kay.sievers@vrfy.org>
Date: Tue, 14 Apr 2009 20:13:13 +0200
Subject: do not use libtool

---
 autogen.sh   | 11 +----------
 configure.ac |  7 +------
 2 files changed, 2 insertions(+), 16 deletions(-)

diff --git a/autogen.sh b/autogen.sh
index fb96d4a..136ca78 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -8,24 +8,15 @@ CFLAGS="-g -Wall \
 -Wpointer-arith -Wsign-compare -Wchar-subscripts \
 -Wstrict-prototypes -Wshadow \
 -Wformat=2 -Wtype-limits"
-args="--prefix=/usr --exec-prefix= --sysconfdir=/etc --with-selinux"
-libdir=$(basename $(cd /lib/$(gcc -print-multi-os-directory); pwd))
+args="--prefix=/usr --exec-prefix="
 
 case "$1" in
 	*install|"")
-		args="$args --with-libdir-name=$libdir"
 		export CFLAGS="$CFLAGS -O2"
 		echo "   configure:  $args"
 		echo
 		./configure $args
 		;;
-	*devel)
-		args="$args --enable-debug --with-libdir-name=$libdir"
-		export CFLAGS="$CFLAGS -O0"
-		echo "   configure:  $args"
-		echo
-		./configure $args
-		;;
 	*clean)
 		./configure
 		make maintainer-clean
diff --git a/configure.ac b/configure.ac
index bd09005..79a231f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3,14 +3,8 @@ AC_INIT([udev-extras],
 	[linux-hotplug@vger.kernel.org])
 AC_PREREQ(2.60)
 AM_INIT_AUTOMAKE([check-news foreign 1.9 subdir-objects dist-bzip2])
-AC_DISABLE_STATIC
 AC_USE_SYSTEM_EXTENSIONS
 AC_SYS_LARGEFILE
-AC_CONFIG_HEADERS(config.h)
-AC_PROG_CC
-AM_PROG_CC_C_O
-AC_PROG_INSTALL
-AC_PROG_LIBTOOL
 AC_CONFIG_MACRO_DIR([m4])
 
 dnl prefix is /usr, exec_prefix in /, if overridden exec_prefix follows prefix
@@ -61,6 +55,7 @@ AC_ARG_WITH(pci-ids-path,
 	fi])
 AC_SUBST(PCI_DATABASE)
 
+AC_CONFIG_HEADERS(config.h)
 AC_CONFIG_FILES([
 Makefile
 rules.d/Makefile
-- 
cgit