--- trunk/core/include/multilib.sminc	2008/12/22 11:33:39	307
+++ trunk/core/include/multilib.sminc	2009/10/29 10:40:29	3671
@@ -190,9 +190,12 @@
 # multilib compile functions
 ##
 
-# rename the old one
-old_mconfigure=old$(typeset -f mconfigure)
-eval ${old_mconfigure}
+if [[ ! -z $(typeset -f mconfigure) ]]
+then
+	# rename the old one
+	old_mconfigure=old$(typeset -f mconfigure)
+	eval ${old_mconfigure}
+fi
 mconfigure()
 {
 	local abi
@@ -208,9 +211,12 @@
 	done
 }
 
-# rename the old one
-old_munpack=old$(typeset -f munpack)
-eval "${old_munpack}"
+if [[ ! -z $(typeset -f munpack) ]]
+then
+	# rename the old one
+	old_munpack=old$(typeset -f munpack)
+	eval "${old_munpack}"
+fi
 munpack()
 {
 	local abi
@@ -227,9 +233,12 @@
 	done
 }
 
-# rename the old one
-old_mmake=old$(typeset -f mmake)
-eval "${old_mmake}"
+if [[ ! -z $(typeset -f mmake) ]]
+then
+	# rename the old one
+	old_mmake=old$(typeset -f mmake)
+	eval "${old_mmake}"
+fi
 mmake()
 {
 	local abi
@@ -246,9 +255,12 @@
 	done
 }
 
-# rename the old one
-old_minstall=old$(typeset -f minstall)
-eval "${old_minstall}"
+if [[ ! -z $(typeset -f minstall) ]]
+then
+	# rename the old one
+	old_minstall=old$(typeset -f minstall)
+	eval "${old_minstall}"
+fi
 minstall()
 {
 	local abi
@@ -281,9 +293,12 @@
 	done
 }
 
-# rename the old one
-old_mpatch=old$(typeset -f mpatch)
-eval "${old_mpatch}"
+if [[ ! -z $(typeset -f mpatch) ]]
+then
+	# rename the old one
+	old_mpatch=old$(typeset -f mpatch)
+	eval "${old_mpatch}"
+fi
 mpatch()
 {
 	local abi
@@ -300,9 +315,12 @@
 	done
 }
 
-# rename the old one
-old_mlibtoolize=old$(typeset -f mlibtoolize)
-eval "${old_mlibtoolize}"
+if [[ ! -z $(typeset -f mlibtoolize) ]]
+then
+	# rename the old one
+	old_mlibtoolize=old$(typeset -f mlibtoolize)
+	eval "${old_mlibtoolize}"
+fi
 mlibtoolize()
 {
 	local abi