From bc9067aa77c31bb8b5322f3b62d88b5a224eb5cb Mon Sep 17 00:00:00 2001 From: Brenden Matthews Date: Sun, 21 Aug 2005 23:40:48 +0000 Subject: [PATCH] autogen hardcoding is better git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky@136 7f574dfc-610e-0410-a909-a81674777703 --- app-admin/conky/conky-1.9999.ebuild | 4 ++-- autogen.sh | 36 ++++------------------------- 2 files changed, 6 insertions(+), 34 deletions(-) diff --git a/app-admin/conky/conky-1.9999.ebuild b/app-admin/conky/conky-1.9999.ebuild index 800df661..7b8c58c7 100644 --- a/app-admin/conky/conky-1.9999.ebuild +++ b/app-admin/conky/conky-1.9999.ebuild @@ -21,8 +21,8 @@ RDEPEND="virtual/libc DEPEND="truetype? ( >=media-libs/freetype-2 ) X? ( virtual/x11 ) - >=sys-devel/automake-1.4 - sys-devel/autoconf + >=sys-devel/automake-1.9 + >=sys-devel/autoconf-2.59 sys-apps/grep sys-apps/sed sys-devel/gcc diff --git a/autogen.sh b/autogen.sh index 57134126..e5c84bb5 100755 --- a/autogen.sh +++ b/autogen.sh @@ -1,35 +1,7 @@ #!/bin/sh # $Id$ -alocver=1.9 -aheadver=2.59 -amakever=1.9 -aconfver=2.59 - -if [ -x aclocal-$alocver ] -then - aclocal-$alocver -else - aclocal -fi - -if [ -x autoheader-$aheadver ] -then - autoheader-$aheadver -else - autoheader -fi - -if [ -x automake-$amakever ] -then - automake-$amakever -a -else - automake -a -fi - -if [ -x autoconf-$aconfver ] -then - autoconf-$aconfver -else - autoconf -fi +aclocal-1.9 +autoheader-2.59 +automake-1.9 -a +autoconf-2.59