2 files changed, 21 insertions, 3 deletions
diff --git a/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/IFR_Application_Test.mpc b/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/IFR_Application_Test.mpc
index 3396f7a98fe..2c14a302961 100644
--- a/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/IFR_Application_Test.mpc
+++ b/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/IFR_Application_Test.mpc
@@ -1,7 +1,8 @@
 // -*- MPC -*-
 // $Id$
 
-project(*server): taoexe, portableserver, ifr_client, minimum_corba {
+project(*server): taoexe, portableserver, ifr_client {
+  avoids  += minimum_corba
 
   Source_Files {
     test_i.cpp
@@ -9,7 +10,8 @@ project(*server): taoexe, portableserver, ifr_client, minimum_corba {
   }
 }
 
-project(*client): taoexe, portableserver, ifr_client, dynamicinterface, minimum_corba {
+project(*client): taoexe, portableserver, ifr_client, dynamicinterface {
+  avoids  += minimum_corba
 
   IDL_Files {
   }
diff --git a/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/run_test.pl b/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/run_test.pl
index 6ddd8f3fee1..d6831078350 100755
--- a/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/run_test.pl
+++ b/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/run_test.pl
@@ -14,6 +14,22 @@ $ifr_iorfile= "if_repo.ior";
 $svr_iorfile = "iorfile";
 $test_idl = PerlACE::LocalFile ("test.idl");
 
+# find the tao_ifr executable.
+# Its placement is dependent upon the OS and if MPC generated makefiles are used.
+my $exec_extn="";
+if ($^O eq "MSWin32") {
+  $exec_extn=".exe";
+}
+
+$tao_ifr = "../../../../../bin/tao_ifr";
+if (! -e $tao_ifr . $exec_extn ) {
+    $tao_ifr = "../../../IFR_Service/tao_ifr";
+    if (! -e $tao_ifr . $exec_extn ) {
+        print STDERR "ERROR: tao_ifr compiler not found.\n";
+        exit 1;
+    }
+}
+
 $lookup_by_name = "";
 $other = "";
 
@@ -26,7 +42,7 @@ for ($i = 0; $i <= $#ARGV; $i++) {
     }
 }
 
-$TAO_IFR = new PerlACE::Process ("../../../../../bin/tao_ifr");
+$TAO_IFR = new PerlACE::Process ($tao_ifr);
 $IFR     = new PerlACE::Process ("../../../IFR_Service/IFR_Service", " -o $ifr_iorfile");
 $SV      = new PerlACE::Process ("server", "-ORBInitRef InterfaceRepository=file://$ifr_iorfile");
 $CL      = new PerlACE::Process ("client", "-ORBInitRef InterfaceRepository=file://$ifr_iorfile"