Changeset 19569

Show
Ignore:
Timestamp:
11/20/06 15:35:04 (2 years ago)
Author:
patrick
Message:

Fixed the generated tweek.fpc for the case when omniORB is not present.
This still needs to be fixed for the TAO case.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • juggler/trunk/modules/tweek/configure.ac

    r19466 r19569  
    616616            BUILD_CXX='Y' 
    617617 
     618            CXX_ORB_DEPS="omniORB$OMNI_VER omnithread3 omniDynamic$OMNI_VER" 
     619 
    618620            if test "x$cxx_orb_root" != "x/usr" ; then 
    619621               CXX_ORB_INCLUDES="-I$cxx_orb_root/include" 
    …… 
    13461348AC_SUBST(ANT) 
    13471349AC_SUBST(BUILD_CXX) 
     1350AC_SUBST(CXX_ORB_DEPS) 
    13481351AC_SUBST(CXX_IDL_CMD) 
    13491352AC_SUBST(CXX_IDL_OPTS) 

  • juggler/trunk/modules/tweek/tweek.fpc.in

    r19450 r19569  
    5757Version: ${tweek_version} 
    5858Provides: tweek 
    59 Requires: omniORB4, omnithread3, omniDynamic4, vpr = @VPR_VERSION@ 
     59Requires: @CXX_ORB_DEPS@ vpr = @VPR_VERSION@ 
    6060Arch: ${ISA} 
    6161Libs: ${tweek_ldflags} ${tweek_libs} ${extra_libs}