Fresco/config omniorb.m4,1.28,1.29 orb.m4,1.15,1.16 tao.m4,1.5,1.6

Update of /cvs/fresco/Fresco/config
In directory purcel:/tmp/cvs-serv24278/config

Modified Files:
	omniorb.m4 orb.m4 tao.m4 
Log Message:
Make configure fail on missing corba environment. Closes: bug277


Index: omniorb.m4
===================================================================
RCS file: /cvs/fresco/Fresco/config/omniorb.m4,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -d -r1.28 -r1.29
--- omniorb.m4	9 Jan 2003 22:58:27 -0000	1.28
+++ omniorb.m4	28 Aug 2003 16:16:42 -0000	1.29
@@ -60,8 +60,8 @@
   else
     omniorb_path="$PATH"
   fi
-  AC_PATH_PROG(IDLCXX, omniidl, no, $omniorb_path)
-  if test ".$IDLCXX" = ".no" ; then
+  AC_PATH_PROG(OMNI_IDLCXX, omniidl, no, $omniorb_path)
+  if test ".$OMNI_IDLCXX" = ".no" ; then
     no_omniorb="yes"
   fi
 
@@ -171,8 +171,8 @@
       FRESCO_CHECK_LIB(ORB_LIBS, omniORB4, [CORBA::ORB_var orb], omniORB4/CORBA.h)
       FRESCO_CHECK_LIB(ORB_LIBS, omniDynamic4, [CORBA::Any_var any;], omniORB4/CORBA.h)
       if test ".$fresco_cv_lib_omniORB4" = ".no" \
-        -a ".$fresco_cv_lib_omniDynamic4" = ".no" \
-        -a ".$fresco_cv_lib_omnithread" = ".no" ; then
+        -o ".$fresco_cv_lib_omniDynamic4" = ".no" \
+        -o ".$fresco_cv_lib_omnithread" = ".no" ; then
         no_omniorb="yes"
       fi
       LIBS="$ORB_LIBS $LIBS"
@@ -181,8 +181,8 @@
       FRESCO_CHECK_LIB(ORB_LIBS, omniORB3, [CORBA::ORB_var orb], omniORB3/CORBA.h)
       FRESCO_CHECK_LIB(ORB_LIBS, omniDynamic3, [CORBA::Any_var any;], omniORB3/CORBA.h)
       if test ".$fresco_cv_lib_omniORB3" = ".no" \
-      	-a ".$fresco_cv_lib_omniDynamic3" = ".no" \
-      	-a ".$fresco_cv_lib_omnithread" = ".no" ; then
+      	-o ".$fresco_cv_lib_omniDynamic3" = ".no" \
+      	-o ".$fresco_cv_lib_omnithread" = ".no" ; then
       	no_omniorb="yes"
       fi
       LIBS="$ORB_LIBS $LIBS"
@@ -191,5 +191,6 @@
 
   if test ".$no_omniorb" = "." ; then
     fresco_cv_lib_omniORB="yes"
+    IDLCXX=$OMNI_IDLCXX
   fi
 ])

Index: orb.m4
===================================================================
RCS file: /cvs/fresco/Fresco/config/orb.m4,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- orb.m4	28 Nov 2002 03:53:06 -0000	1.15
+++ orb.m4	28 Aug 2003 16:16:42 -0000	1.16
@@ -32,7 +32,7 @@
 
 AC_DEFUN([FRESCO_ORB],[
 
-	AC_MSG_NOTICE(ORB)
+	AC_MSG_NOTICE(checking for CORBA environment.)
 	AC_ARG_WITH(orb,
 		[  --with-orb=NAME         Specify which ORB to use],[dnl
 		ORB="$withval"],[dnl
@@ -40,40 +40,50 @@
 			ORB="auto"
 		fi])
 
-	case "$ORB" in
-		omniORB|auto)
-	  	  FRESCO_OMNIORB
-		  if test ".$fresco_cv_lib_omniORB" != ".yes"; then
-		    AC_MSG_ERROR([No supported CORBA environment found!])
-	 	  else
-		    ORB=omniORB
-		  fi		
-		;;
-		TAO)
-		  FRESCO_TAO
-		  if test ".$fresco_cv_lib_TAO" != ".yes"; then
-		    AC_MSG_ERROR([No supported CORBA environment found!])
-		  else
-		    ORB=TAO
-		  fi		
-		;;
- 		*)
- 		  msg="$ORB is not supported (yet)."
- 		  AC_MSG_ERROR([$ORB is not supported (yet)])
- 		;;
-	esac
-	
-	case $ORB in
+        supported_orb_found="none"
+        checked_orbs=""
+
+        dnl Test for omniORB
+        if test \( ".$ORB" = ".omniORB" -o ".$ORB" = ".auto" \) -a \
+                \( ".$supported_orb_found" = ".none" \) ; then
+            AC_MSG_NOTICE(... omniORB)
+            checked_orbs="${checked_orbs}${checked_orbs:+, }omniORB"
+            FRESCO_OMNIORB
+            if test ".$fresco_cv_lib_omniORB" = ".yes"; then
+                supported_orb_found="omniORB"
+            fi
+        fi
+
+        dnl Test for TAO
+        if test \( ".$ORB" = ".TAO" -o ".$ORB" = ".auto" \) -a \
+                \( ".$supported_orb_found" = ".none" \) ; then
+            AC_MSG_NOTICE(... TAO)
+            checked_orbs="${checked_orbs}${checked_orbs:+, }TAO"
+            FRESCO_TAO
+            if test ".$fresco_cv_lib_TAO" = ".yes"; then
+                supported_orb_found="TAO"
+            fi
+        fi
+
+        dnl Invald ORB passed in via configure setting.
+        if test \( ".$ORB" != ".auto" \) -a \
+                \( ".$checked_orbs" = "." \) ; then
+            AC_MSG_ERROR([$ORB is not a supported CORBA environment (yet).])
+        fi
+
+	AC_MSG_CHECKING(for CORBA environment done)
+	case $supported_orb_found in
 		omniORB)
-		  AC_MSG_RESULT([use omniORB])
+		  AC_MSG_RESULT([using omniORB])
 		  AC_DEFINE(ORB_omniORB, 1, [Define if omniORB is used.])
 		;;
 		TAO)
-		  AC_MSG_RESULT([use TAO])
+		  AC_MSG_RESULT([using TAO])
 	  	  AC_DEFINE(ORB_TAO, 1, [Define if TAO is used.])
 		;;
 		none)
-		  AC_MSG_RESULT([none found])
+		  AC_MSG_RESULT([none found (I checked for '$checked_orbs')])
+                  AC_MSG_ERROR([No supported CORBA environment found, stopping.])
 		;;
 	esac
 	AC_SUBST(ORB)

Index: tao.m4
===================================================================
RCS file: /cvs/fresco/Fresco/config/tao.m4,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- tao.m4	25 Nov 2002 21:20:12 -0000	1.5
+++ tao.m4	28 Aug 2003 16:16:42 -0000	1.6
@@ -47,8 +47,8 @@
 	else
 		tao_idl_path="$PATH"
 	fi
-	AC_PATH_PROG(IDLCXX, tao_idl, no, $tao_idl_path)
-	if test ".$IDLCXX" = ".no" ; then
+	AC_PATH_PROG(TAO_IDLCXX, tao_idl, no, $tao_idl_path)
+	if test ".$TAO_IDLCXX" = ".no" ; then
 		no_tao="yes"
 	fi
 	save_CPPFLAGS="$CPPFLAGS"
@@ -69,6 +69,6 @@
 
 	if test ".$no_tao" = "." ; then
 		fresco_cv_lib_tao="yes"
+                IDLCXX=$TAO_IDLCXX
 	fi
-
 ])