Changeset 19459

Timestamp:

11/10/06 15:47:43 (2 years ago)

Author:

patrick

Message:

Drop support for omniORB 3.0. I would like to update the omniORB detection
test to use flagpoll, and as I recall, that version did not include
pkg-config support.

Files:

• juggler/trunk/modules/tweek/configure.ac (modified) (5 diffs)

juggler/trunk/modules/tweek/configure.ac

@@ -82 +82 @@
-            [  --with-cxx-orb=<NAME>   Name of C++ ORB to use          [default=omniORB4]
-                          Allowed values are:
-3, omniORB
+
-            cxx_orb_name="$withval", cxx_orb_name='omniORB4')
-
@@ -456 +456 @@
-
-AH_TEMPLATE([TWEEK_INCLUDE_CORBA_H],
-3
+4
-AH_TEMPLATE([TWEEK_ORB_VER_STRING],
-3
+4
-
-# Find omniORB.  This one is a beast.
@@ -526 +526 @@
-      else
-         LIBS="$LIBS -l$tweek_omni_lib -lomnithread"
-      fi
-
-      if test "x$OMNI_VER" = "x3" ; then
-         LIBS="$LIBS -lomniGK_stub"
-      fi
-
@@ -630 +626 @@
-            CXX_ORB_LIB="-l$tweek_omni_lib -lomnithread -lomniDynamic$OMNI_VER"
-            CXX_ORB_LDFLAGS="-L$OMNI_LIB_DIR"
-
-            if test "x$OMNI_VER" = "x3" ; then
-               CXX_ORB_LIB="$CXX_ORB_LIB -lomniGK_stub"
-            fi
-
-            CXX_ORB_LIB_MSVCCC="$omni_win32_libs"
@@ -953 +945 @@
-
-   case $cxx_orb_name in
-      omniORB3)
-         setup_omniORB_cxx 3
-         ;;
-      omniORB4)
-         setup_omniORB_cxx 4