[gbrainy/autogen] Libtool not needed
- From: Jordi Mas <jmas src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gbrainy/autogen] Libtool not needed
- Date: Tue, 19 Mar 2019 10:42:25 +0000 (UTC)
commit c1ec22ef68a8b3c82612298d322bac9d9142cc0a
Author: Jordi Mas <jmas softcatala org>
Date: Tue Mar 19 11:37:46 2019 +0100
Libtool not needed
.gitlab-ci.yml | 2 +-
autogen.sh | 14 --------------
configure.ac | 2 --
3 files changed, 1 insertion(+), 17 deletions(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index c8125360..4e027865 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -3,7 +3,7 @@ image: mono:latest
build:
stage: build
before_script:
- - apt-get update && apt-get install libtool-bin autotools-dev automake intltool libcanberra-gtk3-0
libgtk3.0-cil-dev librsvg2-dev gnome-doc-utils yelp-tools make nunit nunit-console -y
+ - apt-get update && apt-get install autotools-dev automake intltool libcanberra-gtk3-0 libgtk3.0-cil-dev
librsvg2-dev gnome-doc-utils yelp-tools make nunit nunit-console -y
script:
- ./autogen.sh && ./configure --enable-tests
- make
diff --git a/autogen.sh b/autogen.sh
index 0054fff0..62692c8f 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -56,16 +56,6 @@ ACLOCAL=aclocal
check_autotool_version $ACLOCAL 1.10
check_autotool_version $AUTOMAKE 1.10
-(grep "^AM_PROG_LIBTOOL" configure.ac >/dev/null) && {
- (libtool --version) < /dev/null > /dev/null 2>&1 || {
- echo
- echo "**Error**: You must have \`libtool' 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
- }
-}
-
grep "^AM_GLIB_GNU_GETTEXT" configure.ac >/dev/null && {
grep "sed.*POTFILES" $srcdir/configure.ac >/dev/null || \
(glib-gettextize --version) < /dev/null > /dev/null 2>&1 || {
@@ -148,10 +138,6 @@ do
echo "Running intltoolize..."
intltoolize --copy --force --automake
fi
- if grep "^AM_PROG_LIBTOOL" configure.ac >/dev/null; then
- echo "Running libtoolize..."
- libtoolize --force --copy
- fi
echo "Running $ACLOCAL $aclocalinclude ..."
$ACLOCAL $aclocalinclude
if grep "^AM_CONFIG_HEADER" configure.ac >/dev/null; then
diff --git a/configure.ac b/configure.ac
index 7f8b2904..a08bddf8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -26,8 +26,6 @@ AM_MAINTAINER_MODE
IT_PROG_INTLTOOL([0.35.0])
-AM_PROG_LIBTOOL
-
AM_PATH_GLIB_2_0
dnl --- Check for mono and mcs
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]