From 7664df5bbe43c348bedc395b550b46c8c3d36a84 Mon Sep 17 00:00:00 2001
From: "Tom G. Christensen" <tgc@jupiterrise.com>
Date: Wed, 12 Aug 2009 08:53:14 +0000
Subject: [PATCH] Make it possible to add global configure overrides

---
 buildpkg.functions      | 3 ++-
 buildpkg.packaging.irix | 8 +++++---
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/buildpkg.functions b/buildpkg.functions
index cecb301..e5d0339 100644
--- a/buildpkg.functions
+++ b/buildpkg.functions
@@ -734,12 +734,13 @@ generic_prep()
 # params: $1 = dir to descend to *inside* "source" - optional
 generic_build()
 {
+    local my_ac_overrides="$platform_ac_overrides $ac_overrides"
     setdir ${srcdir}/${topsrcdir}/$1
 
     if [ $no_configure -eq 0 ]; then
 	if [ $generic_configure -eq 1 ]; then
 	    local acvar
-	    for acvar in $ac_overrides
+	    for acvar in $my_ac_overrides
 	    do
 		export $acvar
 	    done
diff --git a/buildpkg.packaging.irix b/buildpkg.packaging.irix
index b889abb..903c825 100644
--- a/buildpkg.packaging.irix
+++ b/buildpkg.packaging.irix
@@ -1040,6 +1040,7 @@ auto_rel()
 {
     local i
     local rn
+    local my_ac_overrides="$platform_ac_overrides $ac_overrides"
 
     for i in relnotes relnotes.${_os} relnotes.txt relnotes.${_os}.txt;
     do
@@ -1052,7 +1053,7 @@ auto_rel()
     local relmetadir=${stagedir}${metainstalldir}relnotes/$topdir-$version-$pkgver
     # compute configure info for relnotes
     local cf="$(_upls $configure_args)"
-    [ -n "$ac_overrides" ] && local aco="$(for ar in $ac_overrides; do echo $ar; done | ${__awk} '{ printf "%s \\\\ \\n",$0 }')"
+    [ -n "$my_ac_overrides" -a $no_configure -eq 0 ] && local aco="$(for ar in $my_ac_overrides; do echo $ar; done | ${__awk} '{ printf "%s \\\\ \\n",$0 }')"
     local temp_fullcf="$(echo "$__configure $cf" | ${__awk} '{ printf "%s\\n",$0 }')"
     temp_fullcf="$(echo "${aco}${temp_fullcf}")"
     # Remove trailing whitespace and \n
@@ -1293,9 +1294,10 @@ auto_deps()
 #
 run_configure()
 {
-    #eval "$ac_overrides ./configure $(_upls $configure_args)"
+    local my_ac_overrides="$platform_ac_overrides $ac_overrides"
+    #eval "$my_ac_overrides ./configure $(_upls $configure_args)"
     local acvar
-    for acvar in $ac_overrides
+    for acvar in $my_ac_overrides
     do
 	export $acvar
     done