[smuxi: 129/179] Build: remove libtool use
- From: Mirco M. M. Bauer <mmmbauer src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [smuxi: 129/179] Build: remove libtool use
- Date: Sat, 4 Nov 2017 05:48:52 +0000 (UTC)
commit 8755847015c8857cf6da63c061722f21dfd2b88c
Author: Carlos MartÃn Nieto <cmn dwim me>
Date: Wed Dec 28 21:00:02 2016 +0100
Build: remove libtool use
We don't generate libraries as this tool understands it, so there's no need for
us to run or depend on it.
autogen.sh | 17 -----------------
configure.ac | 4 ----
2 files changed, 0 insertions(+), 21 deletions(-)
---
diff --git a/autogen.sh b/autogen.sh
index 5919777..c1e94c8 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -8,9 +8,7 @@ CONFIGURE=configure.ac
: ${AUTOHEADER=autoheader}
: ${AUTOMAKE=automake}
: ${INTLTOOLIZE=intltoolize}
-: ${LIBTOOLIZE=libtoolize}
: ${ACLOCAL=aclocal}
-: ${LIBTOOL=libtool}
srcdir=`dirname $0`
test -z "$srcdir" && srcdir=.
@@ -48,16 +46,6 @@ DIE=0
}
}
-(grep "^AC_PROG_LIBTOOL" $CONFIGURE >/dev/null) && {
- ($LIBTOOL --version) < /dev/null > /dev/null 2>&1 || {
- echo
- echo "**Error**: You must have \`libtool' (libtool-bin on Debian) installed to compile $PROJECT."
- echo "Get ftp://ftp.gnu.org/pub/gnu/libtool-1.2d.tar.gz"
- echo "(or a newer version if it is available)"
- DIE=1
- }
-}
-
if test "$DIE" -eq 1; then
exit 1
fi
@@ -81,11 +69,6 @@ if grep "^IT_PROG_INTLTOOL" $CONFIGURE >/dev/null; then
$INTLTOOLIZE --copy --force --automake
fi
-(grep "^AC_PROG_LIBTOOL" $CONFIGURE >/dev/null) && {
- echo "Running $LIBTOOLIZE ..."
- $LIBTOOLIZE --force --copy
-}
-
echo "Running $ACLOCAL $aclocalinclude ..."
$ACLOCAL $aclocalinclude
diff --git a/configure.ac b/configure.ac
index 9efdb9e..2043011 100644
--- a/configure.ac
+++ b/configure.ac
@@ -12,10 +12,6 @@ fi
AC_PROG_INSTALL
-AC_DISABLE_STATIC
-AC_PROG_LIBTOOL
-#LT_INIT([disable-static])
-
AC_MSG_CHECKING([whether the shell understands "+="])
shell_append=no
( foo=bar; set foo baz; eval "$[1]+=\$[2]" && test "$foo" = barbaz ) \
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]