Changeset 8018

Show
Ignore:
Timestamp:
07/10/08 14:17:03 (5 years ago)
Author:
bhilburn
Message:

Merging changes to the cf for RPMs.

Location:
ossiedev/trunk/system/ossie
Files:
2 removed
3 modified
1 copied

Legend:

Unmodified
Added
Removed
  • ossiedev/trunk/system/ossie/configure.ac

    r5882 r8018  
    1010 
    1111AC_LANG_PUSH([C++]) 
    12 AC_CHECK_LIB([xerces-c], [main], [], [AC_MSG_ERROR([cannot find xerce-c library.])]) 
     12AC_CHECK_LIB([xerces-c], [main], [], [AC_MSG_ERROR([cannot find xerces-c library.])]) 
    1313AC_CHECK_HEADERS([xercesc/util/PlatformUtils.hpp], [], [AC_MSG_ERROR([cannot find xerces-c header file.])]) 
    1414 
     
    1616AC_CHECK_LIB([omnithread], [main], [], [AC_MSG_ERROR([cannot find omnithread library])]) 
    1717AC_CHECK_HEADERS([omniORB4/CORBA.h], [], [AC_MSG_ERROR([cannot find omniORB4 header files])]) 
    18 AC_CHECK_PROG([IDL], [omniidl], [omniidl], [AC_MSG_ERROR([cannot find omniidl prgram])]) 
     18AC_CHECK_PROG([IDL], [omniidl], [AC_MSG_ERROR([cannot find omniidl program])]) 
     19 
     20AM_PATH_PYTHON([2.3]) 
    1921 
    2022AC_LANG_POP 
  • ossiedev/trunk/system/ossie/idl/cpp/Makefile.am

    r5734 r8018  
     1IDL_BIN = $(shell which omniidl) 
     2 
    13%SK.cpp %.h %DynSK.cpp : ../%.idl 
    2         @IDL@ -bcxx -Wba -Wbd=DynSK.cpp -Wbh=.h -Wbs=SK.cpp $< 
     4        $(IDL_BIN) -bcxx -Wba -Wbd=DynSK.cpp -Wbh=.h -Wbs=SK.cpp $< 
    35        cp $*.h ../../include/ossie 
    46 
  • ossiedev/trunk/system/ossie/idl/python/ossie.pth

    r5916 r8018  
    2323# OSSIE tools 
    2424/sdr/tools 
     25/usr/local/lib/python2.5/site-packages