Fresco/GGI configure.ac,1.19,1.20
Tobias Hunger <[email protected]> Thu, 28 Aug 2003 11:16:44 -0500
| Newsgroups | gmane.comp.video.fresco.cvs |
|---|---|
| Message-ID | <[email protected]> |
Update of /cvs/fresco/Fresco/GGI
In directory purcel:/tmp/cvs-serv24278/GGI
Modified Files:
configure.ac
Log Message:
Make configure fail on missing corba environment. Closes: bug277
Index: configure.ac
===================================================================
RCS file: /cvs/fresco/Fresco/GGI/configure.ac,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- configure.ac 14 May 2003 22:42:12 -0000 1.19
+++ configure.ac 28 Aug 2003 16:16:41 -0000 1.20
@@ -47,15 +47,17 @@
dnl ------------------------------------------------------------------
FRESCO_ORB
-MAKEFILE=
-if test ".$ORB" = .omniORB ; then
- MAKEFILE="Makefile.omniorb.in"
-elif test ".$ORB" = .TAO ; then
- MAKEFILE="Makefile.tao.in"
-fi
+MAKEFILE="UNKNOWN"
+case $supported_orb_found in
+omniORB)
+ MAKEFILE="Makefile.omniorb"
+ ;;
+TAO)
+ MAKEFILE="Makefile.tao"
+ ;;
+esac
FRESCO_IDL_PATH
-
AC_SUBST(Fresco_IDL_prefix)
dnl ------------------------------------------------------------------
@@ -93,7 +95,7 @@
AC_CONFIG_FILES(config/local.mk)
AC_CONFIG_FILES([config/GGI.spec])
AC_CONFIG_FILES([Makefile src/Makefile demos/Makefile])
-AC_CONFIG_FILES([GGIKit/Makefile:config/$MAKEFILE])
+AC_CONFIG_FILES([GGIKit/Makefile:config/${MAKEFILE}.in])
mkdir -p lib/Berlin/Console
mkdir -p bin