From 3b3128196e8706c3616c88df7206b4a27f7b8959 Mon Sep 17 00:00:00 2001
From: Ade Lovett <ade@FreeBSD.org>
Date: Sat, 28 Jul 2007 06:33:59 +0000
Subject: Update to the autotools new world order.

Tested by:	numerous package build runs
Approved by:	portmgr
Thanks to:	des, kris, linimon, pav
---
 devel/djgpp-gcc/scripts/pre-configure | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

(limited to 'devel/djgpp-gcc/scripts')

diff --git a/devel/djgpp-gcc/scripts/pre-configure b/devel/djgpp-gcc/scripts/pre-configure
index fd75b3c1c1a7..9aa1256537a9 100644
--- a/devel/djgpp-gcc/scripts/pre-configure
+++ b/devel/djgpp-gcc/scripts/pre-configure
@@ -1,9 +1,11 @@
 #! /bin/sh
 
-AUTOCONF_OLD=autoconf213
-AUTOHEADER_OLD=autoheader213
-AUTOCONF=autoconf259
-AUTOHEADER=autoheader259
+AUTOCONF_OLD=autoconf-2.13
+AUTOHEADER_OLD=autoheader-2.13
+AUTOCONF=autoconf-2.59
+AUTOHEADER=autoheader-2.59
+ACLOCAL=aclocal-1.9
+AUTOMAKE=automake-1.9
 
 #
 #  List of directories in which we should run autoconf or/and automake
@@ -52,8 +54,8 @@ done
 #
 #  Run aclocal where needed
 #
-( cd $gcc_dir/libgfortran && aclocal19 -I ../config || exit 1)
-( cd $gcc_dir/libstdc++-v3 && aclocal19 -I . -I .. -I ../config || exit 1)
+( cd $gcc_dir/libgfortran && ${ACLOCAL} -I ../config || exit 1)
+( cd $gcc_dir/libstdc++-v3 && ${ACLOCAL} -I . -I .. -I ../config || exit 1)
 
 #for dir in $aclocal_list ; do
 #   if cd $dir ; then
@@ -85,7 +87,7 @@ for dir in $automake_list; do
          fi
       fi
       echo "Running automake..."
-      if ! automake19; then
+      if ! ${AUTOMAKE}; then
          echo "automake failed in directory `pwd`"
          cd $top
          exit 1
-- 
cgit v1.2.3