Index: /waveforms/ossie_demo/tags/ossie_demo-0.6.1/ossie_demo/DeviceManager.prf.xml
===================================================================
--- /waveforms/ossie_demo/tags/ossie_demo-0.6.1/ossie_demo/DeviceManager.prf.xml (revision 946)
+++ /waveforms/ossie_demo/tags/ossie_demo-0.6.1/ossie_demo/DeviceManager.prf.xml (revision 946)
@@ -0,0 +1,5 @@
+
+
+
+ These are the properties to configure the device manager
+
Index: /waveforms/ossie_demo/tags/ossie_demo-0.6.1/ossie_demo/aclocal.d/AC_PROG_CXX_LINK_SO_LIB.m4
===================================================================
--- /waveforms/ossie_demo/tags/ossie_demo-0.6.1/ossie_demo/aclocal.d/AC_PROG_CXX_LINK_SO_LIB.m4 (revision 932)
+++ /waveforms/ossie_demo/tags/ossie_demo-0.6.1/ossie_demo/aclocal.d/AC_PROG_CXX_LINK_SO_LIB.m4 (revision 932)
@@ -0,0 +1,199 @@
+dnl
+dnl AC_PROG_CXX_LINK_SO_LIB
+dnl
+dnl Description
+dnl
+dnl Works out how to build a C++ shared object library.
+dnl
+dnl If successful, the following output variables are set:
+dnl CXX_LINK_SO_LIB - Command to build a C++ shared object library.
+dnl Expects that the environment variable `$soname' is set to the name of
+dnl the library. The value of CXX_LINK_SO_LIB can only be used from
+dnl within a makefile (because is double-quotes the `$').
+dnl LD_LIBRARY_PATH_NAME - set to the name of the environment variable that
+dnl sets the run-time search path for shared libraries.
+dnl SOEXT - set to the system's filename extension for shared libraries.
+dnl E.g. `.so', `.a', `.sl'.
+dnl
+dnl Additionally, any options required to link a dynamic executable are
+dnl added to `LDFLAGS'.
+dnl
+dnl Copyright (C) 2003, Alex Tingle
+dnl
+dnl License:
+dnl GNU General Public License
+dnl [http://www.gnu.org/software/ac-archive/htmldoc/COPYING.html]
+dnl with this special exception
+dnl [http://www.gnu.org/software/ac-archive/htmldoc/COPYING-Exception.html].
+dnl
+
+AC_DEFUN([AC_PROG_CXX_LINK_SO_LIB],[
+ AC_REQUIRE([AC_CANONICAL_HOST])
+ AC_REQUIRE([AC_CXX_IDENTITY])
+ AC_REQUIRE([AC_CXX_PIC_FLAG])
+ AC_CACHE_CHECK([for C++ shared library linker],
+ ac_cv_prog_cxx_link_so_lib,
+ [
+ ac_cv_prog_cxx_link_so_lib="no"
+ case "$host" in
+ *-*-aix*) ac_prog_cxx_soext=".a";;
+ *-*-darwin*) ac_prog_cxx_soext=".dylib";;
+ *-*-hpux*) ac_prog_cxx_soext=".sl";;
+ *-*-*) ac_prog_cxx_soext=".so";;
+ esac
+ soname="libconftest$ac_prog_cxx_soext"
+
+ AC_LANG_SAVE
+ AC_CXX_CLEAN_TEMPLATE_REPOSITORY
+ AC_LANG([C++])
+
+ case "$ac_cv_cxx_identity" in
+ GNU-g++-*-*-*)
+ # GNU/g++ options vary with the platform:
+ case "$host" in
+ *-*-darwin*) ac_sobuild="${CXX-g++} -dynamiclib -install_name $soname -o " ;;
+ *-*-solaris*) ac_sobuild="${CXX-g++} -shared -Wl,-h,$soname -o " ;;
+ *-*-*) ac_sobuild="${CXX-g++} -shared -Wl,-soname,$soname -o " ;;
+ esac
+ ;;
+ HP-aCC-*-*-*) ac_sobuild="${CXX-g++} -b -Wl,+h$soname -o " ;;
+ Kai-KCC-*-*-*) ac_sobuild="${CXX-g++} --soname $soname -o " ;;
+ *-CC-*-*-*) ac_sobuild="${CXX-g++} -G -h $soname -o " ;;
+ SGI-CC-*-*-*) ac_sobuild="${CXX-g++} -shared -soname $soname -o " ;;
+ DEC-cxx-*-*-*) ac_sobuild="${CXX-g++} -shared -soname $soname -o " ;;
+ IBM-xlC-*-*-*) ac_sobuild="${CXX-g++} -G -o " ;;
+ esac
+
+ case "$ac_cv_cxx_identity" in
+ GNU-g++-*-*-*)
+ # GNU/g++ options vary with the platform:
+ case "$host" in
+ *-*-darwin*) ac_soflags="-dynamic" ;; # -dynamic is the default
+ *-*-*) ac_soflags="-Wl,-Bdynamic" ;;
+ esac
+ ;;
+ HP-aCC-*-*-*) ac_soflags="-Wl,-a,shared_archive" ;;
+ Kai-KCC-*-*-*) ;; # ??
+ *-CC-*-*-*) ac_soflags="-Bdynamic" ;;
+ DEC-cxx-*-*-*) ac_soflags="-call_shared" ;;
+ IBM-xlC-*-*-*) ac_soflags="-bdynamic -brtl" ;;
+ esac
+
+ # Make object files a.o, b.o & c.o
+ AC_CXX_COMPILE_OBJ([a.$ac_objext],[int a(){return 123;}],[:],[:])
+ AC_CXX_COMPILE_OBJ([b.$ac_objext],[int b(){return 456;}],[:],[:])
+ AC_CXX_COMPILE_OBJ([c.$ac_objext],[int b(){return 789;}],[:],[:])
+
+ # Try various ways of building shared object libraries
+ ac_sothere=""
+ AC_CXX_TRY_LINK_SO([$ac_sobuild],$soname,[ac_sothere=yes])
+
+ if test "$ac_sothere" = yes; then
+ ac_save_libs="$LIBS"
+ LIBS="$ac_save_libs -L. -lconftest"
+ # Try various ways of running dynamic executables.
+ ac_soworks=""
+ if test -z "$ac_soworks"; then # Linux, solaris, SGI, HP-UX(64bit), Tru64, AIX
+ ac_sopath="LD_LIBRARY_PATH"
+ AC_CXX_TRY_RUN_DYNAMIC([$ac_soflags],[$ac_sopath],[ac_soworks=yes])
+ fi
+ if test -z "$ac_soworks"; then # solaris(64bit)
+ ac_sopath="LD_LIBRARY_PATH_64"
+ AC_CXX_TRY_RUN_DYNAMIC([$ac_soflags],[$ac_sopath],[ac_soworks=yes])
+ fi
+
+ if test -z "$ac_soworks"; then # HP-UX(32bit)
+ ac_sopath="SHLIB_PATH"
+ AC_CXX_TRY_RUN_DYNAMIC([$ac_soflags],[$ac_sopath],[ac_soworks=yes])
+ fi
+ if test -z "$ac_soworks"; then # Darwin/MacOSX
+ ac_sopath="DYLD_LIBRARY_PATH"
+ AC_CXX_TRY_RUN_DYNAMIC([$ac_soflags],[$ac_sopath],[ac_soworks=yes])
+ fi
+ if test -z "$ac_soworks"; then # SGI(32bit)
+ ac_sopath="LD_LIBRARYN32_PATH"
+ AC_CXX_TRY_RUN_DYNAMIC([$ac_soflags],[$ac_sopath],[ac_soworks=yes])
+ fi
+ if test -z "$ac_soworks"; then # SGI(64bit)
+ ac_sopath="LD_LIBRARYN64_PATH"
+ AC_CXX_TRY_RUN_DYNAMIC([$ac_soflags],[$ac_sopath],[ac_soworks=yes])
+ fi
+ LIBS="$ac_save_libs"
+ fi
+
+ if test "x$ac_soworks" = xyes; then
+ ac_cv_prog_cxx_link_so_lib="`echo $ac_sobuild|sed s/$soname/\\$\\$soname/`"
+ LDFLAGS="$LDFLAGS $ac_soflags"
+ fi
+
+ rm -f a.$ac_objext b.$ac_objext c.$ac_objext libconftest*
+ AC_LANG_RESTORE
+ ])
+ if test "$ac_cv_prog_cxx_link_so_lib" != no
+ then
+ CXX_LINK_SO_LIB="$ac_cv_prog_cxx_link_so_lib"
+ AC_SUBST(CXX_LINK_SO_LIB)
+ LD_LIBRARY_PATH_NAME=$ac_sopath
+ AC_SUBST(LD_LIBRARY_PATH_NAME)
+ AC_SUBST(SOEXT,$ac_prog_cxx_soext)
+ fi
+])
+
+
+dnl
+dnl AC_CXX_TRY_LINK_SO( SOLINK-COMMAND, SONAME-BASE,
+dnl [ACTION-IF-OK [, ACTION-IF-NOT-OK]])
+dnl
+
+AC_DEFUN([AC_CXX_TRY_LINK_SO],[
+ # We assume that a.o b.o & c.o already exist.
+ rm -f $2 $3
+ if AC_TRY_COMMAND([$1 $2.1 a.$ac_objext b.$ac_objext >/dev/null 2>/dev/null]) \
+ && test -s $2.1
+ then
+ AC_TRY_COMMAND([$1 $2.2 a.$ac_objext c.$ac_objext >/dev/null 2>/dev/null])
+ ifelse([$3], , :, [$3])
+ else
+ ifelse([$4], , :, [$4])
+ fi
+])
+
+
+dnl
+dnl AC_CXX_TRY_RUN_DYNAMIC( EXE-LINK-FLAGS, LD_LIB_PATH-VARIABLE
+dnl [ACTION-IF-OK [, ACTION-IF-NOT-OK]])
+dnl
+
+AC_DEFUN([AC_CXX_TRY_RUN_DYNAMIC],[
+ ac_save_ldflags="$LDFLAGS"
+ LDFLAGS="$ac_save_ldflags $1"
+ ac_dollar_var="[\$]$2"
+ ac_save_ldpath=`eval echo $ac_dollar_var`
+ eval $2=".:$ac_save_ldpath"
+ eval export $2
+ ac_cxx_so_works=no
+ rm -f $soname
+ ln -s $soname.1 $soname
+ AC_TRY_RUN([int b();int main(int,char**){return(b()==456?0:1);}],[
+ rm -f $soname
+ ln -s $soname.2 $soname
+ if (./conftest$ac_exeext; exit); then
+ :
+ else
+ # Success - ./conftest returned 1 this time, so changing the
+ # library changed the behaviour of the exe!
+ ac_cxx_so_works=yes
+ fi
+ ],[:])
+
+ LDFLAGS="$ac_save_ldflags"
+ eval $2="$ac_save_ldpath"
+ eval export $2
+
+ if test "$ac_cxx_so_works" = yes; then
+ ifelse([$3], , :, [$3])
+ else
+ ifelse([$4], , :, [$4])
+ fi
+])
+
Index: /waveforms/ossie_demo/tags/ossie_demo-0.6.1/ossie_demo/aclocal.d/AC_CORBA_OMNIEVENTS.m4
===================================================================
--- /waveforms/ossie_demo/tags/ossie_demo-0.6.1/ossie_demo/aclocal.d/AC_CORBA_OMNIEVENTS.m4 (revision 932)
+++ /waveforms/ossie_demo/tags/ossie_demo-0.6.1/ossie_demo/aclocal.d/AC_CORBA_OMNIEVENTS.m4 (revision 932)
@@ -0,0 +1,55 @@
+dnl
+dnl AC_CORBA_OMNIEVENTS
+dnl
+dnl Description
+dnl
+dnl Tests for a linkable installation of omniEvents
+dnl [http://www.omnievents.org/]. If found, it defines
+dnl pre-processor macro `HAVE_OMNIEVENTS'.
+dnl
+dnl Copyright (C) 2004, Alex Tingle
+dnl
+dnl License:
+dnl GNU General Public License
+dnl [http://www.gnu.org/software/ac-archive/htmldoc/COPYING.html]
+dnl with this special exception
+dnl [http://www.gnu.org/software/ac-archive/htmldoc/COPYING-Exception.html].
+dnl
+
+AC_DEFUN([AC_CORBA_OMNIEVENTS],[
+ AC_REQUIRE([AC_CORBA_ORB])
+ AC_CACHE_CHECK([for omniEvents],
+ ac_cv_corba_omnievents,
+ [ AC_LANG_SAVE
+ AC_LANG_CPLUSPLUS
+ AC_CXX_CLEAN_TEMPLATE_REPOSITORY
+
+ # Save CPPFLAGS, LDFLAGS & LIBS
+ ac_corba_save_cppflags="$CPPFLAGS"
+ ac_corba_save_ldflags="$LDFLAGS"
+ ac_corba_save_libs="$LIBS"
+ LIBS="$ac_corba_save_libs -lomniEvents"
+ # Nasty hack to get around problems with omniEvents 2.4.1 install.
+ CPPFLAGS="$ac_corba_save_cppflags -I$ac_omniorbbase/include/COS"
+
+ ac_cv_corba_omnievents=no
+ AC_TRY_LINK(
+ [#include ],
+ [EventChannelAdmin::EventChannelFactory_var factory],
+ [ac_cv_corba_omnievents=yes]
+ )
+
+ if test "$ac_cv_corba_omnievents" = no
+ then
+ # Restore CPPFLAGS LDFLAGS & LIBS
+ CPPFLAGS="$ac_corba_save_cppflags"
+ LDFLAGS="$ac_corba_save_ldflags"
+ LIBS="$ac_corba_save_libs"
+ fi
+ AC_LANG_RESTORE
+ ])
+ if test "$ac_cv_corba_omnievents" != no
+ then
+ AC_DEFINE(HAVE_OMNIEVENTS,1,"define if omniEvents is available.")
+ fi
+])
Index: /waveforms/ossie_demo/tags/ossie_demo-0.6.1/ossie_demo/aclocal.d/AC_CORBA_SEARCHDIRS.m4
===================================================================
--- /waveforms/ossie_demo/tags/ossie_demo-0.6.1/ossie_demo/aclocal.d/AC_CORBA_SEARCHDIRS.m4 (revision 932)
+++ /waveforms/ossie_demo/tags/ossie_demo-0.6.1/ossie_demo/aclocal.d/AC_CORBA_SEARCHDIRS.m4 (revision 932)
@@ -0,0 +1,48 @@
+dnl
+dnl AC_CORBA_SEARCHDIRS( DIRTYPE )
+dnl
+dnl Description
+dnl
+dnl Utility macro. Constructs a space-separated list of directories to search
+dnl for CORBA components. Sets the variable `ac_corba_searchdirs'.
+dnl Example: `AC_CORBA_SEARCHDIRS([bin])' sets
+dnl ac_corba_searchdirs="$prefix/bin /usr/local/bin /opt/bin /usr/bin"
+dnl or
+dnl ac_corba_searchdirs="$OMNIORBBASE/bin"
+dnl If OMNIORBBASE is set (e.g. by --with-omniorb) then no other directories
+dnl are searched.
+dnl
+dnl Copyright (C) 2003, Alex Tingle
+dnl
+dnl License:
+dnl GNU General Public License
+dnl [http://www.gnu.org/software/ac-archive/htmldoc/COPYING.html]
+dnl with this special exception
+dnl [http://www.gnu.org/software/ac-archive/htmldoc/COPYING-Exception.html].
+dnl
+
+AC_DEFUN([AC_CORBA_SEARCHDIRS],[
+ ac_corba_searchdirs=""
+ if test "x$OMNIORBBASE" != x; then
+ if test -d "$OMNIORBBASE/$1"; then
+ ac_corba_searchdirs="$ac_corba_searchdirs $OMNIORBBASE/$1"
+ fi
+ else
+ if test "x$prefix" != x && test "$prefix" != "NONE" && test -d "$prefix/$1"
+ then
+ ac_corba_searchdirs="$ac_corba_searchdirs $prefix/$1"
+ fi
+ if test -d "/usr/local/$1"
+ then
+ ac_corba_searchdirs="$ac_corba_searchdirs /usr/local/$1"
+ fi
+ if test -d "/opt/$1"
+ then
+ ac_corba_searchdirs="$ac_corba_searchdirs /opt/$1"
+ fi
+ if test -d "/usr/$1"
+ then
+ ac_corba_searchdirs="$ac_corba_searchdirs /usr/$1"
+ fi
+ fi
+])
Index: /waveforms/ossie_demo/tags/ossie_demo-0.6.1/ossie_demo/aclocal.d/AC_HAVE_XERCES_C.m4
===================================================================
--- /waveforms/ossie_demo/tags/ossie_demo-0.6.1/ossie_demo/aclocal.d/AC_HAVE_XERCES_C.m4 (revision 932)
+++ /waveforms/ossie_demo/tags/ossie_demo-0.6.1/ossie_demo/aclocal.d/AC_HAVE_XERCES_C.m4 (revision 932)
@@ -0,0 +1,36 @@
+AC_DEFUN([AC_HAVE_XERCES_C], [
+
+AC_ARG_WITH(xerces-prefix, [ --with-xerces-prefix=PFX Prefix where
+Xerces-C is installed (optional)],
+ [xerces_prefix="$withval"], [xerces_prefix=""])
+
+AC_LANG_PUSH([C++])
+AC_MSG_CHECKING([for Xerces-C])
+
+if test -n "$xerces_prefix" ; then
+ CXXFLAGS="$CXXFLAGS -I$xerces_prefix/include"
+ LDFLAGS="$LDFLAGS -L$xerces_prefix/lib"
+fi
+
+LIBS="-lxerces-c $LIBS"
+
+AC_LINK_IFELSE([
+ AC_LANG_PROGRAM(
+ [
+ #include
+ #include
+ XERCES_CPP_NAMESPACE_USE
+ ],
+ [
+ XercesDOMParser* parser = new XercesDOMParser();
+ ])],
+ [AC_MSG_RESULT([yes])],
+ [AC_MSG_FAILURE([missing])
+
+])
+
+AC_LANG_POP
+])
+
+
+
Index: /waveforms/ossie_demo/tags/ossie_demo-0.6.1/ossie_demo/aclocal.d/AC_CXX_CLEAN_TEMPLATE_REPOSITORY.m4
===================================================================
--- /waveforms/ossie_demo/tags/ossie_demo-0.6.1/ossie_demo/aclocal.d/AC_CXX_CLEAN_TEMPLATE_REPOSITORY.m4 (revision 932)
+++ /waveforms/ossie_demo/tags/ossie_demo-0.6.1/ossie_demo/aclocal.d/AC_CXX_CLEAN_TEMPLATE_REPOSITORY.m4 (revision 932)
@@ -0,0 +1,24 @@
+dnl
+dnl AC_CXX_CLEAN_TEMPLATE_REPOSITORY
+dnl
+dnl Description
+dnl
+dnl Sometime failed C++ compiles can leave trash in the template repository.
+dnl Just clean them all away.
+dnl
+dnl Copyright (C) 2003, Alex Tingle
+dnl
+dnl License:
+dnl GNU General Public License
+dnl [http://www.gnu.org/software/ac-archive/htmldoc/COPYING.html]
+dnl with this special exception
+dnl [http://www.gnu.org/software/ac-archive/htmldoc/COPYING-Exception.html].
+dnl
+
+AC_DEFUN([AC_CXX_CLEAN_TEMPLATE_REPOSITORY],[
+ # Sometime failed C++ compiles can leave trash in the template repository.
+ # Just clean them all away.
+ rm -rf ./SunWS_cache # Solaris/CC
+ rm -rf ./.cxx_repository # Tru64/cxx
+ # ...add more here.
+])
Index: /waveforms/ossie_demo/tags/ossie_demo-0.6.1/ossie_demo/aclocal.d/AC_CORBA_ORB_OMNIORB3.m4
===================================================================
--- /waveforms/ossie_demo/tags/ossie_demo-0.6.1/ossie_demo/aclocal.d/AC_CORBA_ORB_OMNIORB3.m4 (revision 932)
+++ /waveforms/ossie_demo/tags/ossie_demo-0.6.1/ossie_demo/aclocal.d/AC_CORBA_ORB_OMNIORB3.m4 (revision 932)
@@ -0,0 +1,98 @@
+dnl
+dnl AC_CORBA_ORB_OMNIORB3
+dnl
+dnl Description
+dnl
+dnl Tests for a linkable installation of omniORB3
+dnl [http://omniorb.sourceforge.net]. If found, it defines
+dnl pre-processor macro `HAVE_OMNIORB4' and sets variables CPPFLAGS,
+dnl LIBS & LDFLAGS. Sets pthread & socket options if necessary.
+dnl
+dnl Copyright (C) 2003, Alex Tingle
+dnl
+dnl License:
+dnl GNU General Public License
+dnl [http://www.gnu.org/software/ac-archive/htmldoc/COPYING.html]
+dnl with this special exception
+dnl [http://www.gnu.org/software/ac-archive/htmldoc/COPYING-Exception.html].
+dnl
+
+AC_DEFUN([AC_CORBA_ORB_OMNIORB3],[
+ AC_REQUIRE([AC_CORBA_SOCKET_NSL])
+ AC_REQUIRE([ACX_PTHREAD])
+ AC_REQUIRE([AC_CORBA_OMNI_PLATFORM])
+ AC_CACHE_CHECK([for omniORB3],
+ ac_cv_corba_omniorb3,
+ [ AC_LANG_SAVE
+ AC_LANG_CPLUSPLUS
+ AC_CXX_CLEAN_TEMPLATE_REPOSITORY
+
+ # Save CPPFLAGS, LDFLAGS & LIBS
+ ac_corba_save_cppflags="$CPPFLAGS"
+ ac_corba_save_ldflags="$LDFLAGS"
+ ac_corba_save_libs="$LIBS"
+ LDFLAGS="$ac_corba_save_ldflags $PTHREAD_CFLAGS $PTHREAD_LIBS"
+ CPPFLAGS="$ac_corba_save_cppflags $PTHREAD_CFLAGS"
+
+ # Try to find the omniORB3 header file.Start with $OMNIORBBASE,
+ # and then $prefix, else just try the default include path.
+ ac_cv_corba_omniorb3=no
+ AC_CORBA_SEARCHDIRS(include)
+ for ac_corba_i in `find $ac_corba_searchdirs -type d -name omniORB3 2>/dev/null`
+ do
+ if test -f $ac_corba_i/CORBA.h
+ then
+ ac_corba_omnidir=`AS_DIRNAME(["$ac_corba_i"])`
+ CPPFLAGS="$CPPFLAGS -I$ac_corba_omnidir"
+ AC_TRY_CPP([#include ],
+ [ac_cv_corba_omniorb3="$ac_corba_omnidir"],
+ [CPPFLAGS="$ac_corba_save_cppflags $PTHREAD_CFLAGS"])
+ fi
+ test "$ac_cv_corba_omniorb3" != no && break
+ done
+ if test "$ac_cv_corba_omniorb3" = no && test -z "$OMNIORBBASE"; then
+ AC_TRY_CPP([#include ],[ac_cv_corba_omniorb3=yes])
+ fi
+
+ # Try to find the omniORB3 libraries.
+ if test "$ac_cv_corba_omniorb3" != no; then
+ LIBS="$LIBS -lomniORB3 -lomniGK_stub -lomniDynamic3 -lomniGK_alone"
+ LIBS="$LIBS -lomnithread"
+ ac_corba_links=no
+ AC_CORBA_SEARCHDIRS(lib)
+ for ac_corba_i in `find $ac_corba_searchdirs -type f -name 'libomniORB3*' 2>/dev/null`
+ do
+ # Could check for all required libraries here.
+ ac_corba_omnidir=`AS_DIRNAME(["$ac_corba_i"])`
+ LDFLAGS="$LDFLAGS -L$ac_corba_omnidir"
+ # Try to link.
+ AC_TRY_LINK([#include ],[CORBA::ORB_var orb],
+ [ac_corba_links=yes],
+ [LDFLAGS="$ac_corba_save_ldflags $PTHREAD_CFLAGS $PTHREAD_LIBS"])
+ test "$ac_corba_links" = yes && break
+ done
+ if test "$ac_corba_links" = no; then
+ AC_TRY_LINK([#include ],[CORBA::ORB_var orb],
+ [ac_corba_links=yes])
+ fi
+ test "$ac_corba_links" = no && ac_cv_corba_omniorb3=no
+ fi
+
+ if test "$ac_cv_corba_omniorb3" = no
+ then
+ # Restore CPPFLAGS LDFLAGS & LIBS
+ CPPFLAGS="$ac_corba_save_cppflags"
+ LDFLAGS="$ac_corba_save_ldflags"
+ LIBS="$ac_corba_save_libs"
+ fi
+ AC_LANG_RESTORE
+ ])
+ if test "$ac_cv_corba_omniorb3" != no
+ then
+ CORBA_ORB="omniORB3"
+ AC_SUBST(CORBA_ORB)
+ AC_DEFINE(HAVE_OMNIORB3,1,"define if omniORB3 is available.")
+ # Since we've found `omniORB', we'll need `omniidl'.
+ AC_PROG_OMNIIDL
+ fi
+])
Index: /waveforms/ossie_demo/tags/ossie_demo-0.6.1/ossie_demo/aclocal.d/AC_CORBA_ORB_OMNIORB4.m4
===================================================================
--- /waveforms/ossie_demo/tags/ossie_demo-0.6.1/ossie_demo/aclocal.d/AC_CORBA_ORB_OMNIORB4.m4 (revision 932)
+++ /waveforms/ossie_demo/tags/ossie_demo-0.6.1/ossie_demo/aclocal.d/AC_CORBA_ORB_OMNIORB4.m4 (revision 932)
@@ -0,0 +1,121 @@
+dnl
+dnl AC_CORBA_ORB_OMNIORB4
+dnl
+dnl Description
+dnl
+dnl Tests for a linkable installation of omniORB4
+dnl [http://omniorb.sourceforge.net]. If found, it defines
+dnl pre-processor macro `HAVE_OMNIORB4' and sets variables CPPFLAGS,
+dnl LIBS & LDFLAGS. Sets pthread & socket options if necessary.
+dnl
+dnl Copyright (C) 2003, Alex Tingle
+dnl
+dnl License:
+dnl GNU General Public License
+dnl [http://www.gnu.org/software/ac-archive/htmldoc/COPYING.html]
+dnl with this special exception
+dnl [http://www.gnu.org/software/ac-archive/htmldoc/COPYING-Exception.html].
+dnl
+
+AC_DEFUN([AC_CORBA_ORB_OMNIORB4],[
+ AC_REQUIRE([AC_CORBA_SOCKET_NSL])
+ AC_REQUIRE([ACX_PTHREAD])
+ AC_REQUIRE([AC_CORBA_OMNI_PLATFORM])
+ AC_CACHE_CHECK([for omniORB4],
+ ac_cv_corba_omniorb4,
+ [ AC_LANG_SAVE
+ AC_LANG_CPLUSPLUS
+ AC_CXX_CLEAN_TEMPLATE_REPOSITORY
+
+ # Save CPPFLAGS, LDFLAGS & LIBS
+ ac_corba_save_cppflags="$CPPFLAGS"
+ ac_corba_save_ldflags="$LDFLAGS"
+ ac_corba_save_libs="$LIBS"
+ LDFLAGS="$ac_corba_save_ldflags $PTHREAD_CFLAGS $PTHREAD_LIBS"
+ CPPFLAGS="$ac_corba_save_cppflags $PTHREAD_CFLAGS"
+
+ # Try to find the omniORB4 header file.Start with $OMNIORBBASE,
+ # and then $prefix, else just try the default include path.
+ ac_cv_corba_omniorb4=no
+ AC_CORBA_SEARCHDIRS(include)
+ for ac_corba_i in `find $ac_corba_searchdirs -type d -name omniORB4 2>/dev/null`
+ do
+ if test -f $ac_corba_i/CORBA.h
+ then
+ ac_corba_omnidir=`AS_DIRNAME(["$ac_corba_i"])`
+ CPPFLAGS="$CPPFLAGS -I$ac_corba_omnidir"
+ AC_TRY_CPP(AC_CORBA_ORB_OMNIORB4_INCLUDE,
+ [ac_cv_corba_omniorb4="$ac_corba_omnidir"],
+ [CPPFLAGS="$ac_corba_save_cppflags $PTHREAD_CFLAGS"])
+ fi
+ test "$ac_cv_corba_omniorb4" != no && break
+ done
+ if test "$ac_cv_corba_omniorb4" = no && test -z "$OMNIORBBASE"; then
+ AC_TRY_CPP(AC_CORBA_ORB_OMNIORB4_INCLUDE,[ac_cv_corba_omniorb4=yes])
+ fi
+
+ # Try to find the omniORB4 libraries.
+ if test "$ac_cv_corba_omniorb4" != no; then
+ LIBS="$LIBS -lomniORB4 -lomniDynamic4"
+ LIBS="$LIBS -lomnithread"
+ ac_corba_links=no
+ AC_CORBA_SEARCHDIRS(lib)
+ for ac_corba_i in `find $ac_corba_searchdirs -type f -name 'libomniORB4*' 2>/dev/null`
+ do
+ # Could check for all required libraries here.
+ ac_corba_omnidir=`AS_DIRNAME(["$ac_corba_i"])`
+ LDFLAGS="$LDFLAGS -L$ac_corba_omnidir"
+ # Try to link.
+ AC_TRY_LINK(AC_CORBA_ORB_OMNIORB4_INCLUDE,[CORBA::ORB_var orb],
+ [ac_corba_links=yes],
+ [LDFLAGS="$ac_corba_save_ldflags $PTHREAD_CFLAGS $PTHREAD_LIBS"])
+ test "$ac_corba_links" = yes && break
+ done
+ if test "$ac_corba_links" = no; then
+ AC_TRY_LINK(AC_CORBA_ORB_OMNIORB4_INCLUDE,[CORBA::ORB_var orb],
+ [ac_corba_links=yes])
+ fi
+ test "$ac_corba_links" = no && ac_cv_corba_omniorb4=no
+ fi
+
+ if test "$ac_cv_corba_omniorb4" = no
+ then
+ # Restore CPPFLAGS LDFLAGS & LIBS
+ CPPFLAGS="$ac_corba_save_cppflags"
+ LDFLAGS="$ac_corba_save_ldflags"
+ LIBS="$ac_corba_save_libs"
+ fi
+ AC_LANG_RESTORE
+ ])
+ if test "$ac_cv_corba_omniorb4" != no
+ then
+ CORBA_ORB="omniORB4"
+ AC_SUBST([CORBA_ORB])
+ AC_DEFINE([HAVE_OMNIORB4],1,"define if omniORB4 is available.")
+
+ # The use can enable unloadable stubs for libraries that need to be
+ # unloadable. See the omniORB documentation. (omniORB4+ only.)
+ AC_ARG_ENABLE([unloadable-stubs],
+ [ AC_HELP_STRING(
+ [--enable-unloadable-stubs],
+ [library may be safely unloaded. [default=no]]
+ )
+ ],[ IDL_CPPFLAGS="-DOMNI_UNLOADABLE_STUBS=1"
+ AC_SUBST([IDL_CPPFLAGS])
+ ])
+
+ # Since we've found `omniORB', we'll need `omniidl'.
+ AC_PROG_OMNIIDL
+ fi
+])
+
+
+AC_DEFUN([AC_CORBA_ORB_OMNIORB4_INCLUDE],[
+/* The PACKAGE_* macros cause incompatabilities with omniORB4. */
+#undef PACKAGE_BUGREPORT
+#undef PACKAGE_NAME
+#undef PACKAGE_STRING
+#undef PACKAGE_TARNAME
+#undef PACKAGE_VERSION
+#include
+])
Index: /waveforms/ossie_demo/tags/ossie_demo-0.6.1/ossie_demo/aclocal.d/AC_CXX_NAMESPACES.m4
===================================================================
--- /waveforms/ossie_demo/tags/ossie_demo-0.6.1/ossie_demo/aclocal.d/AC_CXX_NAMESPACES.m4 (revision 932)
+++ /waveforms/ossie_demo/tags/ossie_demo-0.6.1/ossie_demo/aclocal.d/AC_CXX_NAMESPACES.m4 (revision 932)
@@ -0,0 +1,34 @@
+dnl
+dnl AC_CXX_NAMESPACES
+dnl
+dnl Description
+dnl
+dnl If the compiler can prevent names clashes using namespaces,
+dnl define HAVE_NAMESPACES.
+dnl
+dnl Version: 1.2 (last modified: 2000-07-19)
+dnl Author: Luc Maisonobe
+dnl
+dnl from http://www.gnu.org/software/ac-archive/htmldoc/index.html
+dnl
+dnl License:
+dnl GNU General Public License
+dnl [http://www.gnu.org/software/ac-archive/htmldoc/COPYING.html]
+dnl with this special exception
+dnl [http://www.gnu.org/software/ac-archive/htmldoc/COPYING-Exception.html].
+dnl
+
+AC_DEFUN([AC_CXX_NAMESPACES],
+[AC_CACHE_CHECK(whether the compiler implements namespaces,
+ac_cv_cxx_namespaces,
+[AC_LANG_SAVE
+ AC_LANG_CPLUSPLUS
+ AC_TRY_COMPILE([namespace Outer { namespace Inner { int i = 0; }}],
+ [using namespace Outer::Inner; return i;],
+ ac_cv_cxx_namespaces=yes, ac_cv_cxx_namespaces=no)
+ AC_LANG_RESTORE
+])
+if test "$ac_cv_cxx_namespaces" = yes; then
+ AC_DEFINE(HAVE_NAMESPACES,,[define if the compiler implements namespaces])
+fi
+])
Index: /waveforms/ossie_demo/tags/ossie_demo-0.6.1/ossie_demo/aclocal.d/AC_CXX_COMPILE_OBJ.m4
===================================================================
--- /waveforms/ossie_demo/tags/ossie_demo-0.6.1/ossie_demo/aclocal.d/AC_CXX_COMPILE_OBJ.m4 (revision 932)
+++ /waveforms/ossie_demo/tags/ossie_demo-0.6.1/ossie_demo/aclocal.d/AC_CXX_COMPILE_OBJ.m4 (revision 932)
@@ -0,0 +1,40 @@
+dnl
+dnl AC_CXX_COMPILE_OBJ( NAME, CODE, [ACTION-IF-OK [, ACTION-IF-NOT-OK] ] )
+dnl
+dnl Description
+dnl
+dnl Compiles CODE into an object file NAME.
+dnl Any existing copy of NAME is deleted before we start.
+dnl ACTION-IF-OK is only run if NAME is created AND it hase size >0.
+dnl If NAME is successfully created, then it is up to the caller to delete it.
+dnl
+dnl Copyright (C) 2003, Alex Tingle
+dnl
+dnl License:
+dnl GNU General Public License
+dnl [http://www.gnu.org/software/ac-archive/htmldoc/COPYING.html]
+dnl with this special exception
+dnl [http://www.gnu.org/software/ac-archive/htmldoc/COPYING-Exception.html].
+dnl
+
+AC_DEFUN([AC_CXX_COMPILE_OBJ],[
+ cat > conftest.$ac_ext <&AC_FD_CC
+ cat conftest.$ac_ext >&AC_FD_CC
+ CXXFLAGS="$ac_save_cxxflags"
+ rm -f conftest* "$1"
+ ifelse([$4], , , [$4])
+ fi
+])
Index: /waveforms/ossie_demo/tags/ossie_demo-0.6.1/ossie_demo/aclocal.d/AC_FUNC_SIGSET.m4
===================================================================
--- /waveforms/ossie_demo/tags/ossie_demo-0.6.1/ossie_demo/aclocal.d/AC_FUNC_SIGSET.m4 (revision 932)
+++ /waveforms/ossie_demo/tags/ossie_demo-0.6.1/ossie_demo/aclocal.d/AC_FUNC_SIGSET.m4 (revision 932)
@@ -0,0 +1,26 @@
+dnl
+dnl AC_FUNC_SIGSET
+dnl
+dnl Description
+dnl
+dnl Tests for sigset(), the non-BSD alternative to signal().
+dnl
+dnl Copyright (C) 2004, Alex Tingle
+dnl
+dnl License:
+dnl GNU General Public License
+dnl [http://www.gnu.org/software/ac-archive/htmldoc/COPYING.html]
+dnl with this special exception
+dnl [http://www.gnu.org/software/ac-archive/htmldoc/COPYING-Exception.html].
+dnl
+
+
+AC_DEFUN([AC_FUNC_SIGSET],[
+ AC_CACHE_CHECK([for sigset()],[ac_cv_sigset],[
+ AC_TRY_COMPILE([#include ],[sigset(SIGTERM,SIG_IGN);],
+ [ac_cv_sigset=yes], [ac_cv_sigset=no])
+ ])
+ if test x"ac_cv_sigset" = xyes; then
+ AC_DEFINE([HAVE_SIGSET],1,[Define to 1 if you have the `sigset' function.])
+ fi
+])
Index: /waveforms/ossie_demo/tags/ossie_demo-0.6.1/ossie_demo/aclocal.d/ETR_SOCKET_NSL.m4
===================================================================
--- /waveforms/ossie_demo/tags/ossie_demo-0.6.1/ossie_demo/aclocal.d/ETR_SOCKET_NSL.m4 (revision 932)
+++ /waveforms/ossie_demo/tags/ossie_demo-0.6.1/ossie_demo/aclocal.d/ETR_SOCKET_NSL.m4 (revision 932)
@@ -0,0 +1,87 @@
+dnl
+dnl Description
+dnl
+dnl This macro figures out what libraries are required on this platform to
+dnl link sockets programs. It's usually -lsocket and/or -lnsl or neither. We
+dnl test for all three combinations.
+dnl
+dnl Version: 1.1 (last modified: 2001-06-07)
+dnl Author: Warren Young
+dnl
+dnl from http://www.gnu.org/software/ac-archive/htmldoc/index.html
+dnl
+dnl License:
+dnl GNU General Public License
+dnl [http://www.gnu.org/software/ac-archive/htmldoc/COPYING.html]
+dnl with this special exception
+dnl [http://www.gnu.org/software/ac-archive/htmldoc/COPYING-Exception.html].
+dnl
+
+AC_DEFUN([ETR_SOCKET_NSL],
+[
+AC_CACHE_CHECK(for libraries containing socket functions,
+ac_cv_socket_libs, [
+ oLIBS=$LIBS
+
+ AC_TRY_LINK([
+ #include
+ #include
+ #include
+ #include
+ ],
+ [
+ struct in_addr add;
+ int sd = socket(AF_INET, SOCK_STREAM, 0);
+ inet_ntoa(add);
+ ],
+ ac_cv_socket_libs=-lc, ac_cv_socket_libs=no)
+
+ if test x"$ac_cv_socket_libs" = "xno"
+ then
+ LIBS="$oLIBS -lsocket"
+ AC_TRY_LINK([
+ #include
+ #include
+ #include
+ #include
+ ],
+ [
+ struct in_addr add;
+ int sd = socket(AF_INET, SOCK_STREAM, 0);
+ inet_ntoa(add);
+ ],
+ ac_cv_socket_libs=-lsocket, ac_cv_socket_libs=no)
+ fi
+
+ if test x"$ac_cv_socket_libs" = "xno"
+ then
+ LIBS="$oLIBS -lsocket -lnsl"
+ AC_TRY_LINK([
+ #include
+ #include
+ #include
+ #include
+ ],
+ [
+ struct in_addr add;
+ int sd = socket(AF_INET, SOCK_STREAM, 0);
+ inet_ntoa(add);
+ ],
+ ac_cv_socket_libs="-lsocket -lnsl", ac_cv_socket_libs=no)
+ fi
+
+ LIBS=$oLIBS
+])
+
+ if test x"$ac_cv_socket_libs" = "xno"
+ then
+ AC_MSG_ERROR([Cannot find socket libraries])
+ elif test x"$ac_cv_socket_libs" = "x-lc"
+ then
+ ETR_SOCKET_LIBS=""
+ else
+ ETR_SOCKET_LIBS="$ac_cv_socket_libs"
+ fi
+
+ AC_SUBST(ETR_SOCKET_LIBS)
+]) dnl ETR_SOCKET_NSL
Index: /waveforms/ossie_demo/tags/ossie_demo-0.6.1/ossie_demo/aclocal.d/AC_PROG_CXX_AR.m4
===================================================================
--- /waveforms/ossie_demo/tags/ossie_demo-0.6.1/ossie_demo/aclocal.d/AC_PROG_CXX_AR.m4 (revision 932)
+++ /waveforms/ossie_demo/tags/ossie_demo-0.6.1/ossie_demo/aclocal.d/AC_PROG_CXX_AR.m4 (revision 932)
@@ -0,0 +1,71 @@
+dnl
+dnl AC_PROG_CXX_AR
+dnl
+dnl Description
+dnl
+dnl C++ may require a special archiver to ensure that template code gets
+dnl included with the rest of the objects. Sets the output variable CXX_AR.
+dnl
+dnl Copyright (C) 2003, Alex Tingle
+dnl
+dnl License:
+dnl GNU General Public License
+dnl [http://www.gnu.org/software/ac-archive/htmldoc/COPYING.html]
+dnl with this special exception
+dnl [http://www.gnu.org/software/ac-archive/htmldoc/COPYING-Exception.html].
+dnl
+
+AC_DEFUN([AC_PROG_CXX_AR],[
+ AC_REQUIRE([AC_CXX_IDENTITY])
+ AC_CACHE_CHECK([for C++ static archiver],
+ ac_cv_prog_cxx_ar,
+ [
+ ac_cv_prog_cxx_ar="no"
+ ac_prog_cxx_ar_save_libs="$LIBS"
+ AC_LANG_SAVE
+ AC_CXX_CLEAN_TEMPLATE_REPOSITORY
+ AC_LANG([C++])
+ # Make object files a.o & b.o
+ AC_CXX_COMPILE_OBJ([a.$ac_objext],[int a(){return 123;}],[
+ AC_CXX_COMPILE_OBJ([b.$ac_objext],[int b(){return 456;}],[
+ # Files a.o & b.o now exist, try to build them into a static library.
+ # Try the more esoteric ones first, and then finally test for 'ar'.
+ LIBS="$ac_prog_cxx_ar_save_libs -L. -lconftest"
+
+ # Use the compiler's ID to make an initial guess.
+ case "$ac_cv_cxx_identity" in
+ GNU-g++-*-*-*) ac_prog_cxx_ar="ar cqs" ;;
+ HP-aCC-*-*-*) ac_prog_cxx_ar="ar cqs" ;;
+ Kai-KCC-*-*-*) ac_prog_cxx_ar="ar cqs" ;;
+ Sun-CC-*-*-*) ac_prog_cxx_ar="${CXX-g++} -xar -o" ;;
+ SGI-CC-*-*-*) ac_prog_cxx_ar="${CXX-g++} -ar -o" ;;
+ DEC-cxx-*-*-*) ac_prog_cxx_ar="ar cqs" ;;
+ IBM-xlC-*-*-*) ac_prog_cxx_ar="ar cqs" ;;
+ esac
+ if AC_TRY_COMMAND([$ac_prog_cxx_ar libconftest.a a.$ac_objext b.$ac_objext >/dev/null 2>/dev/null]); then
+ AC_TRY_LINK([int b();],[return(b()==456?0:1)],
+ [ac_cv_prog_cxx_ar="$ac_prog_cxx_ar"])
+ fi
+ rm -f libconftest.a
+
+ # Hmmm...: ar cq (may be inefficient without a subsequent 'ranlib')
+ if test "$ac_cv_prog_cxx_ar" = no; then
+ if AC_TRY_COMMAND([ar cq libconftest.a a.$ac_objext b.$ac_objext >/dev/null 2>/dev/null]); then
+ AC_TRY_LINK([int b();],[return(b()==456?0:1)],
+ [ac_cv_prog_cxx_ar="ar cq"],[:])
+ fi
+ rm -f libconftest.a
+ fi
+
+ ]) ])
+ rm -f a.$ac_objext b.$ac_objext
+ AC_LANG_RESTORE
+ LIBS="$ac_prog_cxx_ar_save_libs"
+ ])
+ if test "$ac_cv_prog_cxx_ar" != no
+ then
+ CXX_AR="$ac_cv_prog_cxx_ar"
+ AC_SUBST(CXX_AR)
+ fi
+])
+
Index: /waveforms/ossie_demo/tags/ossie_demo-0.6.1/ossie_demo/aclocal.d/AC_CXX_IDENTITY.m4
===================================================================
--- /waveforms/ossie_demo/tags/ossie_demo-0.6.1/ossie_demo/aclocal.d/AC_CXX_IDENTITY.m4 (revision 932)
+++ /waveforms/ossie_demo/tags/ossie_demo-0.6.1/ossie_demo/aclocal.d/AC_CXX_IDENTITY.m4 (revision 932)
@@ -0,0 +1,95 @@
+dnl
+dnl AC_PROG_OMNIIDL
+dnl
+dnl Description
+dnl
+dnl AC_CXX_IDENTITY( [ ACTION-IF-OK [ ,ACTION-IF-FAILED ] ] )
+dnl Sets ac_cv_cxx_identity to a string that identifies the C++ compiler.
+dnl Format: vendor-compiler-major-minor-micro
+dnl
+dnl Copyright (C) 2003, Alex Tingle
+dnl
+dnl License:
+dnl GNU General Public License
+dnl [http://www.gnu.org/software/ac-archive/htmldoc/COPYING.html]
+dnl with this special exception
+dnl [http://www.gnu.org/software/ac-archive/htmldoc/COPYING-Exception.html].
+dnl
+
+AC_DEFUN([AC_CXX_IDENTITY],[
+ AC_REQUIRE([AC_PROG_CXX])
+ AC_CACHE_CHECK([C++ compiler identity],[ac_cv_cxx_identity],[
+ ac_cv_cxx_identity="unknown"
+ cat > conftest.$ac_ext <
+
+int _result=1;
+void set(const char* vendor,const char* compiler,int major,int minor,int micro)
+{
+ switch(_result)
+ {
+ case 0: _result=2; break;
+ case 1: _result=0; break;
+ default: _result=2;
+ }
+ printf("%s-%s-%i-%i-%i\n",vendor,compiler,major,minor,micro);
+}
+
+#define HEXN(X,N) ((X>>(4*N))&0xF)
+
+int main(int,char**)
+{
+#ifdef __GNUG__
+ set("GNU","g++",__GNUC__,__GNUC_MINOR__,0);
+#endif
+
+#ifdef __SUNPRO_CC
+ set("Sun","CC",HEXN(__SUNPRO_CC,2),HEXN(__SUNPRO_CC,1),HEXN(__SUNPRO_CC,0));
+#endif
+
+#ifdef __xlC__
+ set("IBM","xlC",10*HEXN(__xlC__,3)+HEXN(__xlC__,2),10*HEXN(__xlC__,1)+HEXN(__xlC__,0),0);
+#else
+# if defined(_AIX) && !defined(__GNUC__)
+ set("IBM","xlC",0,0,0);
+# endif
+#endif
+
+#ifdef __DECCXX_VER
+ set("DEC","cxx",__DECCXX_VER/10000000,__DECCXX_VER/100000%100,__DECCXX_VER%100);
+#endif
+
+#ifdef __HP_aCC
+ set("HP","aCC",__HP_aCC/10000,__HP_aCC/100%100,__HP_aCC%100);
+#endif
+
+#ifdef __KCC_VERSION
+ set("Kai","KCC",HEXN(__KCC_VERSION,3),HEXN(__KCC_VERSION,2),__KCC_VERSION&0xFF);
+#endif
+
+#ifdef _MSC_VER
+ set("Microsoft","VC++",_MSC_VER>>8,_MSC_VER&0xFF,0);
+#endif
+
+ return _result;
+}
+EOF
+ if AC_TRY_EVAL(ac_link) \
+ && test -s conftest${ac_exeext} \
+ && AC_TRY_COMMAND([./conftest${ac_exeext} >/dev/null])
+ then
+ ac_cv_cxx_identity=`./conftest${ac_exeext}`
+ fi
+ if test $ac_cv_cxx_identity = "unknown"; then
+ echo "configure: failed program was:" >&AC_FD_CC
+ cat conftest.$ac_ext >&AC_FD_CC
+ ifelse([$2], , , [$2])
+ else
+ ifelse([$1], , :, [$1])
+ fi
+ rm -f conftest*
+ ])
+])
+
Index: /waveforms/ossie_demo/tags/ossie_demo-0.6.1/ossie_demo/aclocal.d/AC_CORBA_OMNI_PLATFORM.m4
===================================================================
--- /waveforms/ossie_demo/tags/ossie_demo-0.6.1/ossie_demo/aclocal.d/AC_CORBA_OMNI_PLATFORM.m4 (revision 932)
+++ /waveforms/ossie_demo/tags/ossie_demo-0.6.1/ossie_demo/aclocal.d/AC_CORBA_OMNI_PLATFORM.m4 (revision 932)
@@ -0,0 +1,96 @@
+dnl
+dnl AC_CORBA_OMNI_PLATFORM
+dnl
+dnl Description
+dnl
+dnl Autodetects the platform and sets necessary omniORB variables.
+dnl defines: __OSVERSION__
+dnl variables: PLATFORM_NAME, PLATFORM_DEFINITION,
+dnl OSVERSION, PROCESSOR_NAME, PROCESSOR_DEFINITION
+dnl
+dnl Based upon the autoconf macros from OmniORB4
+dnl [http://omniorb.sourceforge.net].
+dnl
+dnl Copyright (C) 2003, Alex Tingle
+dnl
+dnl License:
+dnl GNU General Public License
+dnl [http://www.gnu.org/software/ac-archive/htmldoc/COPYING.html]
+dnl with this special exception
+dnl [http://www.gnu.org/software/ac-archive/htmldoc/COPYING-Exception.html].
+dnl
+
+AC_DEFUN([AC_CORBA_OMNI_PLATFORM],[
+ AC_REQUIRE([AC_CANONICAL_HOST])
+ plat_name="Platform_Unknown"
+ plat_def="__unknown_platform__"
+ os_v="0"
+
+ AH_TEMPLATE(__linux__,[for OmniORB on Linux, Cygwin])
+ AH_TEMPLATE(__sunos__,[for OmniORB on SunOS (Solaris)])
+ AH_TEMPLATE(__osf1__,[for OmniORB on OSF1 (Tru64)])
+ AH_TEMPLATE(__hpux__,[for OmniORB on HPUX])
+ AH_TEMPLATE(__nextstep__,[for OmniORB on NextStep])
+ AH_TEMPLATE(__irix__,[for OmniORB on IRIX])
+ AH_TEMPLATE(__aix__,[for OmniORB on AIX])
+ AH_TEMPLATE(__darwin__,[for OmniORB on Darwin])
+ AH_TEMPLATE(__freebsd__,[for OmniORB on FreeBSD])
+ AH_TEMPLATE(__osr5__,[for OmniORB on OSR5])
+
+ case "$host" in
+ *-*-linux-*) plat_name="Linux"; plat_def="__linux__"; os_v="2";;
+ *-*-cygwin*) plat_name="Cygwin"; plat_def="__linux__"; os_v="2";;
+ *-*-solaris*) plat_name="SunOS"; plat_def="__sunos__"; os_v="5";;
+ *-*-osf3*) plat_name="OSF1"; plat_def="__osf1__"; os_v="3";;
+ *-*-osf4*) plat_name="OSF1"; plat_def="__osf1__"; os_v="4";;
+ *-*-osf5*) plat_name="OSF1"; plat_def="__osf1__"; os_v="5";;
+ *-*-hpux10*) plat_name="HPUX"; plat_def="__hpux__"; os_v="10";;
+ *-*-hpux11*) plat_name="HPUX"; plat_def="__hpux__"; os_v="11";;
+ *-*-nextstep*) plat_name="NextStep"; plat_def="__nextstep__"; os_v="3";;
+ *-*-openstep*) plat_name="NextStep"; plat_def="__nextstep__"; os_v="3";;
+ *-*-irix*) plat_name="IRIX"; plat_def="__irix__"; os_v="6";;
+ *-*-aix*) plat_name="AIX"; plat_def="__aix__"; os_v="4";;
+ *-*-darwin*) plat_name="Darwin"; plat_def="__darwin__"; os_v="1";;
+ *-*-freebsd3*) plat_name="FreeBSD"; plat_def="__freebsd__"; os_v="3";;
+ *-*-freebsd4*) plat_name="FreeBSD"; plat_def="__freebsd__"; os_v="4";;
+ *-*-freebsd5*) plat_name="FreeBSD"; plat_def="__freebsd__"; os_v="5";;
+ *-*-sco*) plat_name="OSR5"; plat_def="__osr5__"; os_v="5";;
+ esac
+
+ AC_SUBST(PLATFORM_NAME, $plat_name)
+ AC_SUBST(PLATFORM_DEFINITION, $plat_def)
+ AC_SUBST(OSVERSION, $os_v)
+ AC_DEFINE_UNQUOTED($plat_def)
+ AC_DEFINE_UNQUOTED(__OSVERSION__, $os_v,[for omniORB])
+
+ proc_name="UnknownProcessor"
+ proc_def="__processor_unknown__"
+
+ AH_TEMPLATE(__x86__,[for OmniORB on x86Processor])
+ AH_TEMPLATE(__sparc__,[for OmniORB on SparcProcessor])
+ AH_TEMPLATE(__alpha__,[for OmniORB on AlphaProcessor])
+ AH_TEMPLATE(__m68k__,[for OmniORB on m68kProcessor])
+ AH_TEMPLATE(__mips__,[for OmniORB on IndigoProcessor])
+ AH_TEMPLATE(__arm__,[for OmniORB on ArmProcessor])
+ AH_TEMPLATE(__s390__,[for OmniORB on s390Processor])
+ AH_TEMPLATE(__ia64__,[for OmniORB on ia64Processor])
+ AH_TEMPLATE(__hppa__,[for OmniORB on HppaProcessor])
+ AH_TEMPLATE(__powerpc__,[for OmniORB on PowerPCProcessor])
+
+ case "$host" in
+ i?86-*) proc_name="x86Processor"; proc_def="__x86__";;
+ sparc-*) proc_name="SparcProcessor"; proc_def="__sparc__";;
+ alpha*) proc_name="AlphaProcessor"; proc_def="__alpha__";;
+ m68k-*) proc_name="m68kProcessor"; proc_def="__m68k__";;
+ mips*) proc_name="IndigoProcessor"; proc_def="__mips__";;
+ arm-*) proc_name="ArmProcessor"; proc_def="__arm__";;
+ s390-*) proc_name="s390Processor"; proc_def="__s390__";;
+ ia64-*) proc_name="ia64Processor"; proc_def="__ia64__";;
+ hppa*) proc_name="HppaProcessor"; proc_def="__hppa__";;
+ powerpc*) proc_name="PowerPCProcessor"; proc_def="__powerpc__";;
+ esac
+
+ AC_SUBST(PROCESSOR_NAME, $proc_name)
+ AC_SUBST(PROCESSOR_DEFINITION, $proc_def)
+ AC_DEFINE_UNQUOTED($proc_def)
+])
Index: /waveforms/ossie_demo/tags/ossie_demo-0.6.1/ossie_demo/aclocal.d/AC_CXX_STD.m4
===================================================================
--- /waveforms/ossie_demo/tags/ossie_demo-0.6.1/ossie_demo/aclocal.d/AC_CXX_STD.m4 (revision 932)
+++ /waveforms/ossie_demo/tags/ossie_demo-0.6.1/ossie_demo/aclocal.d/AC_CXX_STD.m4 (revision 932)
@@ -0,0 +1,228 @@
+dnl
+dnl AC_CXX_STD
+dnl
+dnl Description
+dnl
+dnl Tests for various things that we might expect to find in
+dnl C++ namespace std.
+dnl
+dnl Looks for or else .
+dnl Looks for or else .
+dnl Looks for .
+dnl Defines macro HAVE_FSTREAM_ATTACH if we have:
+dnl void ofstream::attach (int FILE)
+dnl Defines macro HAVE_FSTREAM_OPEN if we have:
+dnl void ofstream::open (const char* FNAME, int MODE)
+dnl Defines macro FSTREAM_OPEN_PROT if we have:
+dnl void ofstream::open (const char* FNAME, int MODE, int PROT)
+dnl Defines macro HAVE_STD_IOSTREAM if this works:
+dnl #include
+dnl std::cout<<"Hello World"<
+dnl std::list foo;
+dnl
+dnl Copyright (C) 2003, Alex Tingle
+dnl
+dnl License:
+dnl GNU General Public License
+dnl [http://www.gnu.org/software/ac-archive/htmldoc/COPYING.html]
+dnl with this special exception
+dnl [http://www.gnu.org/software/ac-archive/htmldoc/COPYING-Exception.html].
+dnl
+
+AC_DEFUN([AC_CXX_STD],[
+ AC_CXX_HAVE_IOSTREAM
+ AC_CXX_HAVE_IOMANIP
+ AC_CHECK_HEADERS([cmath])
+ AC_CXX_HAVE_STD_IOSTREAM
+ AC_CXX_HAVE_STD_STL
+ AC_CXX_HAVE_FSTREAM_ATTACH
+ AC_CXX_HAVE_FSTREAM_OPEN
+])
+
+
+dnl
+dnl AC_CXX_HAVE_IOSTREAM
+dnl Looks for or else .
+dnl
+
+AC_DEFUN([AC_CXX_HAVE_IOSTREAM],[
+ AC_CHECK_HEADER([iostream],[
+ AC_DEFINE([HAVE_IOSTREAM],[1],[Define to 1 if you have the header file.])
+ ],[
+ AC_CHECK_HEADERS([iostream.h])
+ ])
+])
+
+
+dnl
+dnl AC_CXX_HAVE_FSTREAM_ATTACH
+dnl Defines macro HAVE_FSTREAM_ATTACH if we have:
+dnl void ofstream::attach (int FILE)
+dnl
+
+AC_DEFUN([AC_CXX_HAVE_FSTREAM_ATTACH],[
+ AC_REQUIRE([AC_CXX_HAVE_STD_IOSTREAM])
+ AC_CACHE_CHECK([for fstream::attach()],[ac_cv_cxx_have_fstream_attach],[
+ ac_cv_cxx_have_fstream_attach=no
+ AC_LANG_SAVE
+ AC_LANG_CPLUSPLUS
+ AC_TRY_COMPILE([
+#ifdef HAVE_IOSTREAM
+#include
+#else
+#include
+#endif
+#ifdef HAVE_STD_IOSTREAM
+using namespace std;
+#endif
+],[int fd=0;ofstream s;s.attach(fd);],
+ [ac_cv_cxx_have_fstream_attach=yes])
+ AC_LANG_RESTORE
+ ])
+ if test "$ac_cv_cxx_have_fstream_attach" = yes; then
+ AC_DEFINE([HAVE_FSTREAM_ATTACH],[1],[define if we have fstream::attach().])
+ fi
+])
+
+
+dnl
+dnl AC_CXX_HAVE_FSTREAM_OPEN
+dnl Defines macro HAVE_FSTREAM_OPEN if we have:
+dnl void ofstream::open (const char* FNAME, int MODE)
+dnl Defines macro FSTREAM_OPEN_PROT if we have:
+dnl void ofstream::open (const char* FNAME, int MODE, int PROT)
+dnl
+
+AC_DEFUN([AC_CXX_HAVE_FSTREAM_OPEN],[
+ AC_REQUIRE([AC_CXX_HAVE_STD_IOSTREAM])
+ AC_CACHE_CHECK([for fstream::open()],[ac_cv_cxx_have_fstream_open],[
+ ac_cv_cxx_have_fstream_open=no
+ ac_cv_cxx_fstream_open_prot=no
+ AC_LANG_SAVE
+ AC_LANG_CPLUSPLUS
+ # Try with 2 parameters
+ AC_TRY_COMPILE([
+#ifdef HAVE_IOSTREAM
+#include
+#else
+#include
+#endif
+#ifdef HAVE_STD_IOSTREAM
+using namespace std;
+#endif
+],[ofstream s;s.open("conftest.txt",ios::out|ios::trunc);],
+ [ac_cv_cxx_have_fstream_open=yes])
+ # Try with mode parameter
+ AC_TRY_COMPILE([
+#ifdef HAVE_IOSTREAM
+#include
+#else
+#include
+#endif
+#ifdef HAVE_STD_IOSTREAM
+using namespace std;
+#endif
+],[ofstream s;s.open("conftest.txt",ios::out|ios::trunc,0666);],
+ [ac_cv_cxx_fstream_open_prot=yes])
+ AC_LANG_RESTORE
+ ])
+ if test "$ac_cv_cxx_have_fstream_open" = yes; then
+ AC_DEFINE([HAVE_FSTREAM_OPEN],[1],
+ [define if we have fstream::open().])
+ fi
+ if test "$ac_cv_cxx_fstream_open_prot" = yes; then
+ AC_DEFINE([FSTREAM_OPEN_PROT],[1],
+ [define if fstream::open() accepts third parameter.])
+ fi
+])
+
+
+dnl
+dnl AC_CXX_HAVE_IOMANIP
+dnl Looks for or else .
+dnl
+
+AC_DEFUN([AC_CXX_HAVE_IOMANIP],[
+ AC_CHECK_HEADER([iomanip],[
+ AC_DEFINE([HAVE_IOMANIP],[1],[Define to 1 if you have the header file.])
+ ],[
+ AC_CHECK_HEADERS([iomanip.h])
+ ])
+])
+
+
+dnl
+dnl AC_CXX_HAVE_STD_IOSTREAM
+dnl Defines macro HAVE_STD_IOSTREAM if this works:
+dnl #include
+dnl std::cout<<"Hello World"<
+#else
+#include
+#endif
+],[std::cout<<"Hello World"<
+#else
+#include
+#endif
+],[std::cout<<"Hello World"<
+dnl std::list foo;
+dnl
+
+AC_DEFUN([AC_CXX_HAVE_STD_STL],[
+ AC_REQUIRE([AC_CXX_NAMESPACES])
+ AC_REQUIRE([AC_CXX_HAVE_STL])
+ AC_CACHE_CHECK([for C++ Standard Template Library in namespace std.],
+ ac_cv_cxx_have_std_stl,[
+ ac_cv_cxx_have_std_stl=no
+ if test "x$ac_cv_cxx_namespaces" = xyes; then
+ AC_LANG_SAVE
+ AC_LANG_CPLUSPLUS
+ AC_TRY_COMPILE([#include
+ ],[std::list foo;return 0;],
+ [ac_cv_cxx_have_std_stl=yes])
+ AC_LANG_RESTORE
+ fi
+ ])
+ if test "$ac_cv_cxx_have_std_stl" = yes; then
+ AC_DEFINE([HAVE_STD_STL],[1],[define if C++ Standard Template Library is in namespace std])
+ fi
+])
+
Index: /waveforms/ossie_demo/tags/ossie_demo-0.6.1/ossie_demo/aclocal.d/AC_CXX_BOOL.m4
===================================================================
--- /waveforms/ossie_demo/tags/ossie_demo-0.6.1/ossie_demo/aclocal.d/AC_CXX_BOOL.m4 (revision 932)
+++ /waveforms/ossie_demo/tags/ossie_demo-0.6.1/ossie_demo/aclocal.d/AC_CXX_BOOL.m4 (revision 932)
@@ -0,0 +1,38 @@
+dnl
+dnl AC_CXX_BOOL
+dnl
+dnl Description
+dnl
+dnl If the compiler recognizes bool as a separate built-in type, define HAVE_BOOL.
+dnl Note that a typedef is not a separate type since you cannot overload a function
+dnl such that it accepts either the basic type or the typedef.
+dnl
+dnl Version: 1.2 (last modified: 2000-07-19)
+dnl Author: Luc Maisonobe
+dnl
+dnl from http://www.gnu.org/software/ac-archive/htmldoc/index.html
+dnl
+dnl License:
+dnl GNU General Public License
+dnl [http://www.gnu.org/software/ac-archive/htmldoc/COPYING.html]
+dnl with this special exception
+dnl [http://www.gnu.org/software/ac-archive/htmldoc/COPYING-Exception.html].
+dnl
+
+AC_DEFUN([AC_CXX_BOOL],
+[AC_CACHE_CHECK(whether the compiler recognizes bool as a built-in type,
+ac_cv_cxx_bool,
+[AC_LANG_SAVE
+ AC_LANG_CPLUSPLUS
+ AC_TRY_COMPILE([
+int f(int x){return 1;}
+int f(char x){return 1;}
+int f(bool x){return 1;}
+],[bool b = true; return f(b);],
+ ac_cv_cxx_bool=yes, ac_cv_cxx_bool=no)
+ AC_LANG_RESTORE
+])
+if test "$ac_cv_cxx_bool" = yes; then
+ AC_DEFINE(HAVE_BOOL,,[define if bool is a built-in type])
+fi
+])
Index: /waveforms/ossie_demo/tags/ossie_demo-0.6.1/ossie_demo/aclocal.d/ACX_PTHREAD.m4
===================================================================
--- /waveforms/ossie_demo/tags/ossie_demo-0.6.1/ossie_demo/aclocal.d/ACX_PTHREAD.m4 (revision 932)
+++ /waveforms/ossie_demo/tags/ossie_demo-0.6.1/ossie_demo/aclocal.d/ACX_PTHREAD.m4 (revision 932)
@@ -0,0 +1,242 @@
+dnl
+dnl ACX_PTHREAD([ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]])
+dnl
+dnl Description
+dnl
+dnl This macro figures out how to build C programs using POSIX threads. It
+dnl sets the PTHREAD_LIBS output variable to the threads library and linker
+dnl flags, and the PTHREAD_CFLAGS output variable to any special C compiler
+dnl flags that are needed. (The user can also force certain compiler
+dnl flags/libs to be tested by setting these environment variables.)
+dnl
+dnl Also sets PTHREAD_CC to any special C compiler that is needed for
+dnl multi-threaded programs (defaults to the value of CC otherwise). (This is
+dnl necessary on AIX to use the special cc_r compiler alias.)
+dnl
+dnl NOTE: You are assumed to not only compile your program with these flags,
+dnl but also link it with them as well. e.g. you should link with $PTHREAD_CC
+dnl $CFLAGS $PTHREAD_CFLAGS $LDFLAGS ... $PTHREAD_LIBS $LIBS
+dnl
+dnl If you are only building threads programs, you may wish to use these
+dnl variables in your default LIBS, CFLAGS, and CC:
+dnl
+dnl LIBS="$PTHREAD_LIBS $LIBS"
+dnl CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
+dnl CC="$PTHREAD_CC"
+dnl
+dnl In addition, if the PTHREAD_CREATE_JOINABLE thread-attribute constant
+dnl has a nonstandard name, defines PTHREAD_CREATE_JOINABLE to that name
+dnl (e.g. PTHREAD_CREATE_UNDETACHED on AIX).
+dnl
+dnl ACTION-IF-FOUND is a list of shell commands to run if a threads library
+dnl is found, and ACTION-IF-NOT-FOUND is a list of commands to run it if it
+dnl is not found. If ACTION-IF-FOUND is not specified, the default action
+dnl will define HAVE_PTHREAD.
+dnl
+dnl Please let the authors know if this macro fails on any platform, or if
+dnl you have any other suggestions or comments. This macro was based on work
+dnl by SGJ on autoconf scripts for FFTW (www.fftw.org) (with help from M.
+dnl Frigo), as well as ac_pthread and hb_pthread macros posted by AFC to the
+dnl autoconf macro repository. We are also grateful for the helpful feedback
+dnl of numerous users.
+dnl
+dnl Version: 1.8 (last modified: 2003-05-21)
+dnl Author: Steven G. Johnson and
+dnl Alejandro Forero Cuervo
+dnl
+dnl from http://www.gnu.org/software/ac-archive/htmldoc/index.html
+dnl
+dnl License:
+dnl GNU General Public License
+dnl [http://www.gnu.org/software/ac-archive/htmldoc/COPYING.html]
+dnl with this special exception
+dnl [http://www.gnu.org/software/ac-archive/htmldoc/COPYING-Exception.html].
+dnl
+
+AC_DEFUN([ACX_PTHREAD], [
+AC_REQUIRE([AC_CANONICAL_HOST])
+AC_LANG_SAVE
+AC_LANG_C
+acx_pthread_ok=no
+
+# We used to check for pthread.h first, but this fails if pthread.h
+# requires special compiler flags (e.g. on True64 or Sequent).
+# It gets checked for in the link test anyway.
+
+# First of all, check if the user has set any of the PTHREAD_LIBS,
+# etcetera environment variables, and if threads linking works using
+# them:
+if test x"$PTHREAD_LIBS$PTHREAD_CFLAGS" != x; then
+ save_CFLAGS="$CFLAGS"
+ CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
+ save_LIBS="$LIBS"
+ LIBS="$PTHREAD_LIBS $LIBS"
+ AC_MSG_CHECKING([for pthread_join in LIBS=$PTHREAD_LIBS with CFLAGS=$PTHREAD_CFLAGS])
+ AC_TRY_LINK_FUNC(pthread_join, acx_pthread_ok=yes)
+ AC_MSG_RESULT($acx_pthread_ok)
+ if test x"$acx_pthread_ok" = xno; then
+ PTHREAD_LIBS=""
+ PTHREAD_CFLAGS=""
+ fi
+ LIBS="$save_LIBS"
+ CFLAGS="$save_CFLAGS"
+fi
+
+# We must check for the threads library under a number of different
+# names; the ordering is very important because some systems
+# (e.g. DEC) have both -lpthread and -lpthreads, where one of the
+# libraries is broken (non-POSIX).
+
+# Create a list of thread flags to try. Items starting with a "-" are
+# C compiler flags, and other items are library names, except for "none"
+# which indicates that we try without any flags at all.
+
+acx_pthread_flags="pthreads none -Kthread -kthread lthread -pthread -pthreads -mthreads pthread --thread-safe -mt"
+
+# The ordering *is* (sometimes) important. Some notes on the
+# individual items follow:
+
+# pthreads: AIX (must check this before -lpthread)
+# none: in case threads are in libc; should be tried before -Kthread and
+# other compiler flags to prevent continual compiler warnings
+# -Kthread: Sequent (threads in libc, but -Kthread needed for pthread.h)
+# -kthread: FreeBSD kernel threads (preferred to -pthread since SMP-able)
+# lthread: LinuxThreads port on FreeBSD (also preferred to -pthread)
+# -pthread: Linux/gcc (kernel threads), BSD/gcc (userland threads)
+# -pthreads: Solaris/gcc
+# -mthreads: Mingw32/gcc, Lynx/gcc
+# -mt: Sun Workshop C (may only link SunOS threads [-lthread], but it
+# doesn't hurt to check since this sometimes defines pthreads too;
+# also defines -D_REENTRANT)
+# pthread: Linux, etcetera
+# --thread-safe: KAI C++
+
+case "${host_cpu}-${host_os}" in
+ *solaris*)
+
+ # On Solaris (at least, for some versions), libc contains stubbed
+ # (non-functional) versions of the pthreads routines, so link-based
+ # tests will erroneously succeed. (We need to link with -pthread or
+ # -lpthread.) (The stubs are missing pthread_cleanup_push, or rather
+ # a function called by this macro, so we could check for that, but
+ # who knows whether they'll stub that too in a future libc.) So,
+ # we'll just look for -pthreads and -lpthread first:
+
+ acx_pthread_flags="-pthread -pthreads pthread -mt $acx_pthread_flags"
+ ;;
+esac
+
+if test x"$acx_pthread_ok" = xno; then
+for flag in $acx_pthread_flags; do
+
+ case $flag in
+ none)
+ AC_MSG_CHECKING([whether pthreads work without any flags])
+ ;;
+
+ -*)
+ AC_MSG_CHECKING([whether pthreads work with $flag])
+ PTHREAD_CFLAGS="$flag"
+ ;;
+
+ *)
+ AC_MSG_CHECKING([for the pthreads library -l$flag])
+ PTHREAD_LIBS="-l$flag"
+ ;;
+ esac
+
+ save_LIBS="$LIBS"
+ save_CFLAGS="$CFLAGS"
+ LIBS="$PTHREAD_LIBS $LIBS"
+ CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
+
+ # Check for various functions. We must include pthread.h,
+ # since some functions may be macros. (On the Sequent, we
+ # need a special flag -Kthread to make this header compile.)
+ # We check for pthread_join because it is in -lpthread on IRIX
+ # while pthread_create is in libc. We check for pthread_attr_init
+ # due to DEC craziness with -lpthreads. We check for
+ # pthread_cleanup_push because it is one of the few pthread
+ # functions on Solaris that doesn't have a non-functional libc stub.
+ # We try pthread_create on general principles.
+ AC_TRY_LINK([#include ],
+ [pthread_t th; pthread_join(th, 0);
+ pthread_attr_init(0); pthread_cleanup_push(0, 0);
+ pthread_create(0,0,0,0); pthread_cleanup_pop(0); ],
+ [acx_pthread_ok=yes])
+
+ LIBS="$save_LIBS"
+ CFLAGS="$save_CFLAGS"
+
+ AC_MSG_RESULT($acx_pthread_ok)
+ if test "x$acx_pthread_ok" = xyes; then
+ break;
+ fi
+
+ PTHREAD_LIBS=""
+ PTHREAD_CFLAGS=""
+done
+fi
+
+# Various other checks:
+if test "x$acx_pthread_ok" = xyes; then
+ save_LIBS="$LIBS"
+ LIBS="$PTHREAD_LIBS $LIBS"
+ save_CFLAGS="$CFLAGS"
+ CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
+
+ # Detect AIX lossage: threads are created detached by default
+ # and the JOINABLE attribute has a nonstandard name (UNDETACHED).
+ AC_MSG_CHECKING([for joinable pthread attribute])
+ AC_TRY_LINK([#include ],
+ [int attr=PTHREAD_CREATE_JOINABLE;],
+ ok=PTHREAD_CREATE_JOINABLE, ok=unknown)
+ if test x"$ok" = xunknown; then
+ AC_TRY_LINK([#include ],
+ [int attr=PTHREAD_CREATE_UNDETACHED;],
+ ok=PTHREAD_CREATE_UNDETACHED, ok=unknown)
+ fi
+ if test x"$ok" != xPTHREAD_CREATE_JOINABLE; then
+ AC_DEFINE(PTHREAD_CREATE_JOINABLE, $ok,
+ [Define to the necessary symbol if this constant
+ uses a non-standard name on your system.])
+ fi
+ AC_MSG_RESULT(${ok})
+ if test x"$ok" = xunknown; then
+ AC_MSG_WARN([we do not know how to create joinable pthreads])
+ fi
+
+ AC_MSG_CHECKING([if more special flags are required for pthreads])
+ flag=no
+ case "${host_cpu}-${host_os}" in
+ *-aix* | *-freebsd*) flag="-D_THREAD_SAFE";;
+ *solaris* | *-osf* | *-hpux*) flag="-D_REENTRANT";;
+ esac
+ AC_MSG_RESULT(${flag})
+ if test "x$flag" != xno; then
+ PTHREAD_CFLAGS="$flag $PTHREAD_CFLAGS"
+ fi
+
+ LIBS="$save_LIBS"
+ CFLAGS="$save_CFLAGS"
+
+ # More AIX lossage: must compile with cc_r
+ AC_CHECK_PROG(PTHREAD_CC, cc_r, cc_r, ${CC})
+else
+ PTHREAD_CC="$CC"
+fi
+
+AC_SUBST(PTHREAD_LIBS)
+AC_SUBST(PTHREAD_CFLAGS)
+AC_SUBST(PTHREAD_CC)
+
+# Finally, execute ACTION-IF-FOUND/ACTION-IF-NOT-FOUND:
+if test x"$acx_pthread_ok" = xyes; then
+ ifelse([$1],,AC_DEFINE(HAVE_PTHREAD,1,[Define if you have POSIX threads libraries and header files.]),[$1])
+ :
+else
+ acx_pthread_ok=no
+ $2
+fi
+AC_LANG_RESTORE
+])dnl ACX_PTHREAD
Index: /waveforms/ossie_demo/tags/ossie_demo-0.6.1/ossie_demo/aclocal.d/AC_PROG_OMNIIDL.m4
===================================================================
--- /waveforms/ossie_demo/tags/ossie_demo-0.6.1/ossie_demo/aclocal.d/AC_PROG_OMNIIDL.m4 (revision 932)
+++ /waveforms/ossie_demo/tags/ossie_demo-0.6.1/ossie_demo/aclocal.d/AC_PROG_OMNIIDL.m4 (revision 932)
@@ -0,0 +1,115 @@
+dnl
+dnl AC_PROG_OMNIIDL
+dnl
+dnl Description
+dnl
+dnl Locates the omniidl program (part of omniORB
+dnl [http://omniorb.sourceforge.net]). Sets the output variable `IDL'.
+dnl
+dnl Copyright (C) 2003, Alex Tingle
+dnl
+dnl License:
+dnl GNU General Public License
+dnl [http://www.gnu.org/software/ac-archive/htmldoc/COPYING.html]
+dnl with this special exception
+dnl [http://www.gnu.org/software/ac-archive/htmldoc/COPYING-Exception.html].
+dnl
+
+AC_DEFUN([AC_PROG_OMNIIDL],[
+ AC_CACHE_CHECK([for omniidl],IDL,[
+ IDL=no
+
+ # First, try and find omniidl inside the $OMNIORBBASE/bin directory
+ if test "x$OMNIORBBASE" != x; then
+ IDL="not found in $OMNIORBBASE"
+ for ac_idlfile in `find $OMNIORBBASE/bin -name omniidl`
+ do
+ if test -x "$ac_idlfile"; then
+ IDL="$ac_idlfile"
+ break;
+ fi
+ done
+ fi
+
+ if test "x$IDL" = xno; then
+ if test "x$prefix" != x && test "$prefix" != "NONE" && test -d "$prefix/bin"
+ then
+ ac_omniidl_path="$prefix/bin:$PATH"
+ else
+ ac_omniidl_path="$PATH"
+ fi
+ AC_PATH_PROG_QUIET(IDL,omniidl,no,[$ac_omniidl_path])
+ fi
+
+ ])
+ if test "x$IDL" != xno; then
+ # Check with which version of omniORB `omniidl' is compatible.
+ echo "interface ConfTest { void m(); };" > conftest.idl
+ if AC_TRY_COMMAND([$IDL -bcxx -Wbh=.hh conftest.idl]); then
+ ac_corba_omniidl_orb=unknown
+ grep 'omniORB3/CORBA.h' conftest.hh >/dev/null 2>/dev/null && ac_corba_omniidl_orb=omniORB3
+ grep 'omniORB4/CORBA.h' conftest.hh >/dev/null 2>/dev/null && ac_corba_omniidl_orb=omniORB4
+ else
+ IDL=no
+ fi
+ rm -f conftest*
+ fi
+ # Stop if omniidl is not compatible with omniORB.
+ if test "x$IDL" != xno && test "x$IDL" != "xnot found in $OMNIORBBASE" && \
+ test "x$ac_corba_omniidl_orb" != "x$CORBA_ORB"
+ then
+ AC_MSG_ERROR([omniidl output is for $ac_corba_omniidl_orb. You can't use it with $CORBA_ORB.
+ This can happen when you have more than one version of omniORB installed.
+ You probably need to set PYTHONPATH to ensure that omniidl is using the
+ correct python module (_omniidlmodule.so).])
+ fi
+])
+
+
+dnl
+dnl This is a verbatim copy of AC_PATH_PROG from acgeneral.m4, only with the
+dnl AC_MSG_CHECKING & AC_MSG_RESULT removed.
+dnl
+
+dnl AC_PATH_PROG_QUIET(VARIABLE, PROG-TO-CHECK-FOR [, VALUE-IF-NOT-FOUND [, PATH]])
+AC_DEFUN([AC_PATH_PROG_QUIET],
+[# Extract the first word of "$2", so it can be a program name with args.
+set dummy $2; ac_word=[$]2
+dnl AC_MSG_CHECKING([for $ac_word])
+AC_CACHE_VAL(ac_cv_path_$1,
+[case "[$]$1" in
+ /*)
+ ac_cv_path_$1="[$]$1" # Let the user override the test with a path.
+ ;;
+ ?:/*)
+ ac_cv_path_$1="[$]$1" # Let the user override the test with a dos path.
+ ;;
+ *)
+ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":"
+dnl $ac_dummy forces splitting on constant user-supplied paths.
+dnl POSIX.2 word splitting is done only on the output of word expansions,
+dnl not every word. This closes a longstanding sh security hole.
+ ac_dummy="ifelse([$4], , $PATH, [$4])"
+ for ac_dir in $ac_dummy; do
+ test -z "$ac_dir" && ac_dir=.
+ if test -f $ac_dir/$ac_word; then
+ ac_cv_path_$1="$ac_dir/$ac_word"
+ break
+ fi
+ done
+ IFS="$ac_save_ifs"
+dnl If no 3rd arg is given, leave the cache variable unset,
+dnl so AC_PATH_PROGS will keep looking.
+ifelse([$3], , , [ test -z "[$]ac_cv_path_$1" && ac_cv_path_$1="$3"
+])dnl
+ ;;
+esac])dnl
+$1="$ac_cv_path_$1"
+dnl if test -n "[$]$1"; then
+dnl AC_MSG_RESULT([$]$1)
+dnl else
+dnl AC_MSG_RESULT(no)
+dnl fi
+AC_SUBST($1)dnl
+])
+
Index: /waveforms/ossie_demo/tags/ossie_demo-0.6.1/ossie_demo/aclocal.d/AC_CORBA_IDLCOS.m4
===================================================================
--- /waveforms/ossie_demo/tags/ossie_demo-0.6.1/ossie_demo/aclocal.d/AC_CORBA_IDLCOS.m4 (revision 932)
+++ /waveforms/ossie_demo/tags/ossie_demo-0.6.1/ossie_demo/aclocal.d/AC_CORBA_IDLCOS.m4 (revision 932)
@@ -0,0 +1,64 @@
+dnl
+dnl AC_CORBA_IDLCOS
+dnl
+dnl Description
+dnl
+dnl Searches for the directory containing COS/CosNaming.idl
+dnl and records it in the output variable IDL_COS_DIR.
+dnl
+dnl Copyright (C) 2003, Alex Tingle
+dnl
+dnl License:
+dnl GNU General Public License
+dnl [http://www.gnu.org/software/ac-archive/htmldoc/COPYING.html]
+dnl with this special exception
+dnl [http://www.gnu.org/software/ac-archive/htmldoc/COPYING-Exception.html].
+dnl
+
+AC_DEFUN([AC_CORBA_IDLCOS],[
+ AC_REQUIRE([AC_PROG_OMNIIDL])
+ AC_CACHE_CHECK([for IDL COS include directory],
+ ac_cv_corba_idlcos,
+ [ ac_cv_corba_idlcos=no
+ if test "x$OMNIORBBASE" != x; then
+ if test -d "$OMNIORBBASE/share/idl"; then
+ ac_corba_idldirs="$ac_corba_idldirs $OMNIORBBASE/share/idl"
+ fi
+ if test -d "$OMNIORBBASE/idl"; then
+ ac_corba_idldirs="$ac_corba_idldirs $OMNIORBBASE/idl"
+ fi
+ else
+ if test "x$prefix" != x && test "$prefix" != "NONE"; then
+ if test -d "$prefix/share/idl"; then
+ ac_corba_idldirs="$ac_corba_idldirs $prefix/share/idl"
+ fi
+ if test -d "$prefix/idl"; then
+ ac_corba_idldirs="$ac_corba_idldirs $prefix/idl"
+ fi
+ fi
+ if test -d "/usr/local/share/idl"; then
+ ac_corba_idldirs="$ac_corba_idldirs /usr/local/share/idl"
+ fi
+ if test -d "/usr/share/idl"; then
+ ac_corba_idldirs="$ac_corba_idldirs /usr/share/idl"
+ fi
+ if test -d "/opt/share/idl"; then
+ ac_corba_idldirs="$ac_corba_idldirs /opt/share/idl"
+ fi
+ fi
+ if test -n "$ac_corba_idldirs"; then
+ for ac_corba_i in `find $ac_corba_idldirs -type d -name COS 2>/dev/null`
+ do
+ if test -f "$ac_corba_i/CosNaming.idl"
+ then
+ ac_cv_corba_idlcos=`AS_DIRNAME(["$ac_corba_i"])`
+ break
+ fi
+ done
+ fi
+ ])
+ if test "x$ac_cv_corba_idlcos" != xno; then
+ IDL_COS_DIR=$ac_cv_corba_idlcos
+ AC_SUBST(IDL_COS_DIR)
+ fi
+])
Index: /waveforms/ossie_demo/tags/ossie_demo-0.6.1/ossie_demo/aclocal.d/AC_CXX_PIC_FLAG.m4
===================================================================
--- /waveforms/ossie_demo/tags/ossie_demo-0.6.1/ossie_demo/aclocal.d/AC_CXX_PIC_FLAG.m4 (revision 932)
+++ /waveforms/ossie_demo/tags/ossie_demo-0.6.1/ossie_demo/aclocal.d/AC_CXX_PIC_FLAG.m4 (revision 932)
@@ -0,0 +1,44 @@
+dnl
+dnl AC_CXX_PIC_FLAG
+dnl
+dnl Description
+dnl
+dnl Autodetects C++ `Position independant code' (PIC) flag.
+dnl Adds whatever CXXFLAGS are needed to ensure than C++ object code can
+dnl be linked into a dynamic shared library.
+dnl
+dnl Copyright (C) 2003, Alex Tingle
+dnl
+dnl License:
+dnl GNU General Public License
+dnl [http://www.gnu.org/software/ac-archive/htmldoc/COPYING.html]
+dnl with this special exception
+dnl [http://www.gnu.org/software/ac-archive/htmldoc/COPYING-Exception.html].
+dnl
+
+AC_DEFUN([AC_CXX_PIC_FLAG],[
+ AC_REQUIRE([AC_CANONICAL_HOST])
+ AC_REQUIRE([AC_CXX_IDENTITY])
+ AC_CACHE_CHECK([for C++ position independent code flag],
+ ac_cv_cxx_pic_flag,
+ [
+ ac_cxx_pic_save_cxxflags="$CXXFLAGS"
+ ac_cv_cxx_pic_flag="none needed"
+
+ case "$ac_cv_cxx_identity" in
+ GNU-g++-*-*-*) ac_cv_cxx_pic_flag="-fPIC" ;;
+ HP-aCC-*-*-*) ac_cv_cxx_pic_flag="+Z" ;;
+ Kai-KCC-*-*-*) ac_cv_cxx_pic_flag="+Z" ;;
+ *-CC-*-*-*) ac_cv_cxx_pic_flag="-KPIC" ;;
+ DEC-cxx-*-*-*) ac_cv_cxx_pic_flag="none needed" ;;
+ IBM-xlC-*-*-*) ac_cv_cxx_pic_flag="none needed" ;;
+ esac
+
+ # Finish up by adding the PIC flag to CXXFLAGS
+ if test "$ac_cv_cxx_pic_flag" = "none needed"; then
+ CXXFLAGS="$ac_cxx_pic_save_cxxflags"
+ else
+ CXXFLAGS="$ac_cxx_pic_save_cxxflags $ac_cv_cxx_pic_flag"
+ fi
+ ])
+])
Index: /waveforms/ossie_demo/tags/ossie_demo-0.6.1/ossie_demo/aclocal.d/AC_CXX_HAVE_STL.m4
===================================================================
--- /waveforms/ossie_demo/tags/ossie_demo-0.6.1/ossie_demo/aclocal.d/AC_CXX_HAVE_STL.m4 (revision 932)
+++ /waveforms/ossie_demo/tags/ossie_demo-0.6.1/ossie_demo/aclocal.d/AC_CXX_HAVE_STL.m4 (revision 932)
@@ -0,0 +1,38 @@
+dnl
+dnl AC_CXX_HAVE_STL
+dnl
+dnl Description
+dnl
+dnl If the compiler supports the Standard Template Library, define HAVE_STL.
+dnl
+dnl Version: 1.2 (last modified: 2000-07-19)
+dnl Author: Luc Maisonobe
+dnl
+dnl from http://www.gnu.org/software/ac-archive/htmldoc/index.html
+dnl
+dnl License:
+dnl GNU General Public License
+dnl [http://www.gnu.org/software/ac-archive/htmldoc/COPYING.html]
+dnl with this special exception
+dnl [http://www.gnu.org/software/ac-archive/htmldoc/COPYING-Exception.html].
+dnl
+
+AC_DEFUN([AC_CXX_HAVE_STL],
+[AC_CACHE_CHECK(whether the compiler supports Standard Template Library,
+ac_cv_cxx_have_stl,
+[AC_REQUIRE([AC_CXX_NAMESPACES])
+ AC_LANG_SAVE
+ AC_LANG_CPLUSPLUS
+ AC_TRY_COMPILE([#include
+#include
+#ifdef HAVE_NAMESPACES
+using namespace std;
+#endif],[list x; x.push_back(5);
+list::iterator iter = x.begin(); if (iter != x.end()) ++iter; return 0;],
+ ac_cv_cxx_have_stl=yes, ac_cv_cxx_have_stl=no)
+ AC_LANG_RESTORE
+])
+if test "$ac_cv_cxx_have_stl" = yes; then
+ AC_DEFINE(HAVE_STL,,[define if the compiler supports Standard Template Library])
+fi
+])
Index: /waveforms/ossie_demo/tags/ossie_demo-0.6.1/ossie_demo/aclocal.d/AC_CORBA_ORB.m4
===================================================================
--- /waveforms/ossie_demo/tags/ossie_demo-0.6.1/ossie_demo/aclocal.d/AC_CORBA_ORB.m4 (revision 932)
+++ /waveforms/ossie_demo/tags/ossie_demo-0.6.1/ossie_demo/aclocal.d/AC_CORBA_ORB.m4 (revision 932)
@@ -0,0 +1,47 @@
+dnl
+dnl AC_CORBA_ORB
+dnl
+dnl Description
+dnl
+dnl Tests for a linkable CORBA ORB. Currentlly only finds omniORB3 or
+dnl omniORB4. Sets the output variable `CORBA_ORB', sets variables CPPFLAGS,
+dnl LIBS & LDFLAGS. Sets pthread & socket options if necessary.
+dnl
+dnl Copyright (C) 2003, Alex Tingle
+dnl
+dnl License:
+dnl GNU General Public License
+dnl [http://www.gnu.org/software/ac-archive/htmldoc/COPYING.html]
+dnl with this special exception
+dnl [http://www.gnu.org/software/ac-archive/htmldoc/COPYING-Exception.html].
+dnl
+
+AC_DEFUN([AC_CORBA_ORB],[
+
+ AC_ARG_WITH([omniorb],
+ [[ --with-omniorb=PATH set the path to the local omniORB installation
+ [$OMNIORBBASE].]],
+ [OMNIORBBASE=$withval]
+ )
+
+ if test "x$CORBA_ORB" = x; then
+ AC_CORBA_ORB_OMNIORB4
+ fi
+ if test "x$CORBA_ORB" = x; then
+ AC_CORBA_ORB_OMNIORB3
+ fi
+])
+
+
+dnl
+dnl AC_CORBA_SOCKET_NSL
+dnl Small wrapper around ETR_SOCKET_NSL. Automatically adds the result to LIBS.
+dnl
+
+AC_DEFUN([AC_CORBA_SOCKET_NSL],[
+ AC_REQUIRE([AC_PROG_CC])
+ AC_REQUIRE([ETR_SOCKET_NSL])
+ if test "x$ETR_SOCKET_LIBS" != x; then
+ LIBS="$LIBS $ETR_SOCKET_LIBS"
+ fi
+])
Index: /waveforms/ossie_demo/tags/ossie_demo-0.6.1/ossie_demo/aclocal.d/aclocal.m4
===================================================================
--- /waveforms/ossie_demo/tags/ossie_demo-0.6.1/ossie_demo/aclocal.d/aclocal.m4 (revision 932)
+++ /waveforms/ossie_demo/tags/ossie_demo-0.6.1/ossie_demo/aclocal.d/aclocal.m4 (revision 932)
@@ -0,0 +1,668 @@
+# generated automatically by aclocal 1.9.2 -*- Autoconf -*-
+
+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004
+# Free Software Foundation, Inc.
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+# -*- Autoconf -*-
+# Copyright (C) 2002, 2003 Free Software Foundation, Inc.
+# Generated from amversion.in; do not edit by hand.
+
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+
+# AM_AUTOMAKE_VERSION(VERSION)
+# ----------------------------
+# Automake X.Y traces this macro to ensure aclocal.m4 has been
+# generated from the m4 files accompanying Automake X.Y.
+AC_DEFUN([AM_AUTOMAKE_VERSION], [am__api_version="1.9"])
+
+# AM_SET_CURRENT_AUTOMAKE_VERSION
+# -------------------------------
+# Call AM_AUTOMAKE_VERSION so it can be traced.
+# This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
+AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
+ [AM_AUTOMAKE_VERSION([1.9.2])])
+
+# AM_AUX_DIR_EXPAND
+
+# Copyright (C) 2001, 2003 Free Software Foundation, Inc.
+
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+# 02111-1307, USA.
+
+# For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets
+# $ac_aux_dir to `$srcdir/foo'. In other projects, it is set to
+# `$srcdir', `$srcdir/..', or `$srcdir/../..'.
+#
+# Of course, Automake must honor this variable whenever it calls a
+# tool from the auxiliary directory. The problem is that $srcdir (and
+# therefore $ac_aux_dir as well) can be either absolute or relative,
+# depending on how configure is run. This is pretty annoying, since
+# it makes $ac_aux_dir quite unusable in subdirectories: in the top
+# source directory, any form will work fine, but in subdirectories a
+# relative path needs to be adjusted first.
+#
+# $ac_aux_dir/missing
+# fails when called from a subdirectory if $ac_aux_dir is relative
+# $top_srcdir/$ac_aux_dir/missing
+# fails if $ac_aux_dir is absolute,
+# fails when called from a subdirectory in a VPATH build with
+# a relative $ac_aux_dir
+#
+# The reason of the latter failure is that $top_srcdir and $ac_aux_dir
+# are both prefixed by $srcdir. In an in-source build this is usually
+# harmless because $srcdir is `.', but things will broke when you
+# start a VPATH build or use an absolute $srcdir.
+#
+# So we could use something similar to $top_srcdir/$ac_aux_dir/missing,
+# iff we strip the leading $srcdir from $ac_aux_dir. That would be:
+# am_aux_dir='\$(top_srcdir)/'`expr "$ac_aux_dir" : "$srcdir//*\(.*\)"`
+# and then we would define $MISSING as
+# MISSING="\${SHELL} $am_aux_dir/missing"
+# This will work as long as MISSING is not called from configure, because
+# unfortunately $(top_srcdir) has no meaning in configure.
+# However there are other variables, like CC, which are often used in
+# configure, and could therefore not use this "fixed" $ac_aux_dir.
+#
+# Another solution, used here, is to always expand $ac_aux_dir to an
+# absolute PATH. The drawback is that using absolute paths prevent a
+# configured tree to be moved without reconfiguration.
+
+AC_DEFUN([AM_AUX_DIR_EXPAND],
+[dnl Rely on autoconf to set up CDPATH properly.
+AC_PREREQ([2.50])dnl
+# expand $ac_aux_dir to an absolute path
+am_aux_dir=`cd $ac_aux_dir && pwd`
+])
+
+# Do all the work for Automake. -*- Autoconf -*-
+
+# This macro actually does too much some checks are only needed if
+# your package does certain things. But this isn't really a big deal.
+
+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004
+# Free Software Foundation, Inc.
+
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+# 02111-1307, USA.
+
+# serial 11
+
+# AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE])
+# AM_INIT_AUTOMAKE([OPTIONS])
+# -----------------------------------------------
+# The call with PACKAGE and VERSION arguments is the old style
+# call (pre autoconf-2.50), which is being phased out. PACKAGE
+# and VERSION should now be passed to AC_INIT and removed from
+# the call to AM_INIT_AUTOMAKE.
+# We support both call styles for the transition. After
+# the next Automake release, Autoconf can make the AC_INIT
+# arguments mandatory, and then we can depend on a new Autoconf
+# release and drop the old call support.
+AC_DEFUN([AM_INIT_AUTOMAKE],
+[AC_PREREQ([2.58])dnl
+dnl Autoconf wants to disallow AM_ names. We explicitly allow
+dnl the ones we care about.
+m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl
+AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl
+AC_REQUIRE([AC_PROG_INSTALL])dnl
+# test to see if srcdir already configured
+if test "`cd $srcdir && pwd`" != "`pwd`" &&
+ test -f $srcdir/config.status; then
+ AC_MSG_ERROR([source directory already configured; run "make distclean" there first])
+fi
+
+# test whether we have cygpath
+if test -z "$CYGPATH_W"; then
+ if (cygpath --version) >/dev/null 2>/dev/null; then
+ CYGPATH_W='cygpath -w'
+ else
+ CYGPATH_W=echo
+ fi
+fi
+AC_SUBST([CYGPATH_W])
+
+# Define the identity of the package.
+dnl Distinguish between old-style and new-style calls.
+m4_ifval([$2],
+[m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl
+ AC_SUBST([PACKAGE], [$1])dnl
+ AC_SUBST([VERSION], [$2])],
+[_AM_SET_OPTIONS([$1])dnl
+ AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl
+ AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl
+
+_AM_IF_OPTION([no-define],,
+[AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package])
+ AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])dnl
+
+# Some tools Automake needs.
+AC_REQUIRE([AM_SANITY_CHECK])dnl
+AC_REQUIRE([AC_ARG_PROGRAM])dnl
+AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version})
+AM_MISSING_PROG(AUTOCONF, autoconf)
+AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version})
+AM_MISSING_PROG(AUTOHEADER, autoheader)
+AM_MISSING_PROG(MAKEINFO, makeinfo)
+AM_PROG_INSTALL_SH
+AM_PROG_INSTALL_STRIP
+AC_REQUIRE([AM_PROG_MKDIR_P])dnl
+# We need awk for the "check" target. The system "awk" is bad on
+# some platforms.
+AC_REQUIRE([AC_PROG_AWK])dnl
+AC_REQUIRE([AC_PROG_MAKE_SET])dnl
+AC_REQUIRE([AM_SET_LEADING_DOT])dnl
+_AM_IF_OPTION([tar-ustar], [_AM_PROG_TAR([ustar])],
+ [_AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])],
+ [_AM_PROG_TAR([v7])])])
+_AM_IF_OPTION([no-dependencies],,
+[AC_PROVIDE_IFELSE([AC_PROG_CC],
+ [_AM_DEPENDENCIES(CC)],
+ [define([AC_PROG_CC],
+ defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl
+AC_PROVIDE_IFELSE([AC_PROG_CXX],
+ [_AM_DEPENDENCIES(CXX)],
+ [define([AC_PROG_CXX],
+ defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl
+])
+])
+
+
+# When config.status generates a header, we must update the stamp-h file.
+# This file resides in the same directory as the config header
+# that is generated. The stamp files are numbered to have different names.
+
+# Autoconf calls _AC_AM_CONFIG_HEADER_HOOK (when defined) in the
+# loop where config.status creates the headers, so we can generate
+# our stamp files there.
+AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK],
+[# Compute $1's index in $config_headers.
+_am_stamp_count=1
+for _am_header in $config_headers :; do
+ case $_am_header in
+ $1 | $1:* )
+ break ;;
+ * )
+ _am_stamp_count=`expr $_am_stamp_count + 1` ;;
+ esac
+done
+echo "timestamp for $1" >`AS_DIRNAME([$1])`/stamp-h[]$_am_stamp_count])
+
+# AM_PROG_INSTALL_SH
+# ------------------
+# Define $install_sh.
+
+# Copyright (C) 2001, 2003 Free Software Foundation, Inc.
+
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+# 02111-1307, USA.
+
+AC_DEFUN([AM_PROG_INSTALL_SH],
+[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
+install_sh=${install_sh-"$am_aux_dir/install-sh"}
+AC_SUBST(install_sh)])
+
+# -*- Autoconf -*-
+# Copyright (C) 2003 Free Software Foundation, Inc.
+
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+# 02111-1307, USA.
+
+# serial 1
+
+# Check whether the underlying file-system supports filenames
+# with a leading dot. For instance MS-DOS doesn't.
+AC_DEFUN([AM_SET_LEADING_DOT],
+[rm -rf .tst 2>/dev/null
+mkdir .tst 2>/dev/null
+if test -d .tst; then
+ am__leading_dot=.
+else
+ am__leading_dot=_
+fi
+rmdir .tst 2>/dev/null
+AC_SUBST([am__leading_dot])])
+
+# -*- Autoconf -*-
+
+
+# Copyright (C) 1997, 1999, 2000, 2001, 2003 Free Software Foundation, Inc.
+
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+# 02111-1307, USA.
+
+# serial 3
+
+# AM_MISSING_PROG(NAME, PROGRAM)
+# ------------------------------
+AC_DEFUN([AM_MISSING_PROG],
+[AC_REQUIRE([AM_MISSING_HAS_RUN])
+$1=${$1-"${am_missing_run}$2"}
+AC_SUBST($1)])
+
+
+# AM_MISSING_HAS_RUN
+# ------------------
+# Define MISSING if not defined so far and test if it supports --run.
+# If it does, set am_missing_run to use it, otherwise, to nothing.
+AC_DEFUN([AM_MISSING_HAS_RUN],
+[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
+test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing"
+# Use eval to expand $SHELL
+if eval "$MISSING --run true"; then
+ am_missing_run="$MISSING --run "
+else
+ am_missing_run=
+ AC_MSG_WARN([`missing' script is too old or missing])
+fi
+])
+
+# AM_PROG_MKDIR_P
+# ---------------
+# Check whether `mkdir -p' is supported, fallback to mkinstalldirs otherwise.
+
+# Copyright (C) 2003, 2004 Free Software Foundation, Inc.
+
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+# 02111-1307, USA.
+
+# Automake 1.8 used `mkdir -m 0755 -p --' to ensure that directories
+# created by `make install' are always world readable, even if the
+# installer happens to have an overly restrictive umask (e.g. 077).
+# This was a mistake. There are at least two reasons why we must not
+# use `-m 0755':
+# - it causes special bits like SGID to be ignored,
+# - it may be too restrictive (some setups expect 775 directories).
+#
+# Do not use -m 0755 and let people choose whatever they expect by
+# setting umask.
+#
+# We cannot accept any implementation of `mkdir' that recognizes `-p'.
+# Some implementations (such as Solaris 8's) are not thread-safe: if a
+# parallel make tries to run `mkdir -p a/b' and `mkdir -p a/c'
+# concurrently, both version can detect that a/ is missing, but only
+# one can create it and the other will error out. Consequently we
+# restrict ourselves to GNU make (using the --version option ensures
+# this.)
+AC_DEFUN([AM_PROG_MKDIR_P],
+[if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then
+ # We used to keeping the `.' as first argument, in order to
+ # allow $(mkdir_p) to be used without argument. As in
+ # $(mkdir_p) $(somedir)
+ # where $(somedir) is conditionally defined. However this is wrong
+ # for two reasons:
+ # 1. if the package is installed by a user who cannot write `.'
+ # make install will fail,
+ # 2. the above comment should most certainly read
+ # $(mkdir_p) $(DESTDIR)$(somedir)
+ # so it does not work when $(somedir) is undefined and
+ # $(DESTDIR) is not.
+ # To support the latter case, we have to write
+ # test -z "$(somedir)" || $(mkdir_p) $(DESTDIR)$(somedir),
+ # so the `.' trick is pointless.
+ mkdir_p='mkdir -p --'
+else
+ # On NextStep and OpenStep, the `mkdir' command does not
+ # recognize any option. It will interpret all options as
+ # directories to create, and then abort because `.' already
+ # exists.
+ for d in ./-p ./--version;
+ do
+ test -d $d && rmdir $d
+ done
+ # $(mkinstalldirs) is defined by Automake if mkinstalldirs exists.
+ if test -f "$ac_aux_dir/mkinstalldirs"; then
+ mkdir_p='$(mkinstalldirs)'
+ else
+ mkdir_p='$(install_sh) -d'
+ fi
+fi
+AC_SUBST([mkdir_p])])
+
+# Helper functions for option handling. -*- Autoconf -*-
+
+# Copyright (C) 2001, 2002, 2003 Free Software Foundation, Inc.
+
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+# 02111-1307, USA.
+
+# serial 2
+
+# _AM_MANGLE_OPTION(NAME)
+# -----------------------
+AC_DEFUN([_AM_MANGLE_OPTION],
+[[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])])
+
+# _AM_SET_OPTION(NAME)
+# ------------------------------
+# Set option NAME. Presently that only means defining a flag for this option.
+AC_DEFUN([_AM_SET_OPTION],
+[m4_define(_AM_MANGLE_OPTION([$1]), 1)])
+
+# _AM_SET_OPTIONS(OPTIONS)
+# ----------------------------------
+# OPTIONS is a space-separated list of Automake options.
+AC_DEFUN([_AM_SET_OPTIONS],
+[AC_FOREACH([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])])
+
+# _AM_IF_OPTION(OPTION, IF-SET, [IF-NOT-SET])
+# -------------------------------------------
+# Execute IF-SET if OPTION is set, IF-NOT-SET otherwise.
+AC_DEFUN([_AM_IF_OPTION],
+[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
+
+#
+# Check to make sure that the build environment is sane.
+#
+
+# Copyright (C) 1996, 1997, 2000, 2001, 2003 Free Software Foundation, Inc.
+
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+# 02111-1307, USA.
+
+# serial 3
+
+# AM_SANITY_CHECK
+# ---------------
+AC_DEFUN([AM_SANITY_CHECK],
+[AC_MSG_CHECKING([whether build environment is sane])
+# Just in case
+sleep 1
+echo timestamp > conftest.file
+# Do `set' in a subshell so we don't clobber the current shell's
+# arguments. Must try -L first in case configure is actually a
+# symlink; some systems play weird games with the mod time of symlinks
+# (eg FreeBSD returns the mod time of the symlink's containing
+# directory).
+if (
+ set X `ls -Lt $srcdir/configure conftest.file 2> /dev/null`
+ if test "$[*]" = "X"; then
+ # -L didn't work.
+ set X `ls -t $srcdir/configure conftest.file`
+ fi
+ rm -f conftest.file
+ if test "$[*]" != "X $srcdir/configure conftest.file" \
+ && test "$[*]" != "X conftest.file $srcdir/configure"; then
+
+ # If neither matched, then we have a broken ls. This can happen
+ # if, for instance, CONFIG_SHELL is bash and it inherits a
+ # broken ls alias from the environment. This has actually
+ # happened. Such a system could not be considered "sane".
+ AC_MSG_ERROR([ls -t appears to fail. Make sure there is not a broken
+alias in your environment])
+ fi
+
+ test "$[2]" = conftest.file
+ )
+then
+ # Ok.
+ :
+else
+ AC_MSG_ERROR([newly created file is older than distributed files!
+Check your system clock])
+fi
+AC_MSG_RESULT(yes)])
+
+# AM_PROG_INSTALL_STRIP
+
+# Copyright (C) 2001, 2003 Free Software Foundation, Inc.
+
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+# 02111-1307, USA.
+
+# One issue with vendor `install' (even GNU) is that you can't
+# specify the program used to strip binaries. This is especially
+# annoying in cross-compiling environments, where the build's strip
+# is unlikely to handle the host's binaries.
+# Fortunately install-sh will honor a STRIPPROG variable, so we
+# always use install-sh in `make install-strip', and initialize
+# STRIPPROG with the value of the STRIP variable (set by the user).
+AC_DEFUN([AM_PROG_INSTALL_STRIP],
+[AC_REQUIRE([AM_PROG_INSTALL_SH])dnl
+# Installed binaries are usually stripped using `strip' when the user
+# run `make install-strip'. However `strip' might not be the right
+# tool to use in cross-compilation environments, therefore Automake
+# will honor the `STRIP' environment variable to overrule this program.
+dnl Don't test for $cross_compiling = yes, because it might be `maybe'.
+if test "$cross_compiling" != no; then
+ AC_CHECK_TOOL([STRIP], [strip], :)
+fi
+INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s"
+AC_SUBST([INSTALL_STRIP_PROGRAM])])
+
+# Check how to create a tarball. -*- Autoconf -*-
+
+# Copyright (C) 2004 Free Software Foundation, Inc.
+
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+# 02111-1307, USA.
+
+# serial 1
+
+
+# _AM_PROG_TAR(FORMAT)
+# --------------------
+# Check how to create a tarball in format FORMAT.
+# FORMAT should be one of `v7', `ustar', or `pax'.
+#
+# Substitute a variable $(am__tar) that is a command
+# writing to stdout a FORMAT-tarball containing the directory
+# $tardir.
+# tardir=directory && $(am__tar) > result.tar
+#
+# Substitute a variable $(am__untar) that extract such
+# a tarball read from stdin.
+# $(am__untar) < result.tar
+AC_DEFUN([_AM_PROG_TAR],
+[# Always define AMTAR for backward compatibility.
+AM_MISSING_PROG([AMTAR], [tar])
+m4_if([$1], [v7],
+ [am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'],
+ [m4_case([$1], [ustar],, [pax],,
+ [m4_fatal([Unknown tar format])])
+AC_MSG_CHECKING([how to create a $1 tar archive])
+# Loop over all known methods to create a tar archive until one works.
+_am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none'
+_am_tools=${am_cv_prog_tar_$1-$_am_tools}
+# Do not fold the above two line into one, because Tru64 sh and
+# Solaris sh will not grok spaces in the rhs of `-'.
+for _am_tool in $_am_tools
+do
+ case $_am_tool in
+ gnutar)
+ for _am_tar in tar gnutar gtar;
+ do
+ AM_RUN_LOG([$_am_tar --version]) && break
+ done
+ am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"'
+ am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"'
+ am__untar="$_am_tar -xf -"
+ ;;
+ plaintar)
+ # Must skip GNU tar: if it does not support --format= it doesn't create
+ # ustar tarball either.
+ (tar --version) >/dev/null 2>&1 && continue
+ am__tar='tar chf - "$$tardir"'
+ am__tar_='tar chf - "$tardir"'
+ am__untar='tar xf -'
+ ;;
+ pax)
+ am__tar='pax -L -x $1 -w "$$tardir"'
+ am__tar_='pax -L -x $1 -w "$tardir"'
+ am__untar='pax -r'
+ ;;
+ cpio)
+ am__tar='find "$$tardir" -print | cpio -o -H $1 -L'
+ am__tar_='find "$tardir" -print | cpio -o -H $1 -L'
+ am__untar='cpio -i -H $1 -d'
+ ;;
+ none)
+ am__tar=false
+ am__tar_=false
+ am__untar=false
+ ;;
+ esac
+
+ # If the value was cached, stop now. We just wanted to have am__tar
+ # and am__untar set.
+ test -n "${am_cv_prog_tar_$1}" && break
+
+ # tar/untar a dummy directory, and stop if the command works
+ rm -rf conftest.dir
+ mkdir conftest.dir
+ echo GrepMe > conftest.dir/file
+ AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar])
+ rm -rf conftest.dir
+ if test -s conftest.tar; then
+ AM_RUN_LOG([$am__untar /dev/null 2>&1 && break
+ fi
+done
+rm -rf conftest.dir
+
+AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool])
+AC_MSG_RESULT([$am_cv_prog_tar_$1])])
+AC_SUBST([am__tar])
+AC_SUBST([am__untar])
+]) # _AM_PROG_TAR
+
+m4_include([aclocal.d/AC_CORBA_ORB.m4])
Index: /waveforms/ossie_demo/tags/ossie_demo-0.6.1/ossie_demo/aclocal.d/AC_CXX_TEMPLATE_REPOSITORY.m4
===================================================================
--- /waveforms/ossie_demo/tags/ossie_demo-0.6.1/ossie_demo/aclocal.d/AC_CXX_TEMPLATE_REPOSITORY.m4 (revision 932)
+++ /waveforms/ossie_demo/tags/ossie_demo-0.6.1/ossie_demo/aclocal.d/AC_CXX_TEMPLATE_REPOSITORY.m4 (revision 932)
@@ -0,0 +1,54 @@
+dnl
+dnl AC_CXX_TEMPLATE_REPOSITORY
+dnl
+dnl Description
+dnl
+dnl Test whether the C++ compiler accepts the -ptr template
+dnl repository option. If so, sets the output variable `CXXFLAGS_PTR'.
+dnl
+dnl Copyright (C) 2003, Alex Tingle
+dnl
+dnl License:
+dnl GNU General Public License
+dnl [http://www.gnu.org/software/ac-archive/htmldoc/COPYING.html]
+dnl with this special exception
+dnl [http://www.gnu.org/software/ac-archive/htmldoc/COPYING-Exception.html].
+dnl
+
+AC_DEFUN([AC_CXX_TEMPLATE_REPOSITORY],[
+ AC_REQUIRE([AC_PROG_CXX])dnl
+ AC_CACHE_CHECK([whether C++ compiler accepts the -ptr option],
+ ac_cv_cxx_ptr,[
+ ac_cv_cxx_ptr=no
+ if test "x$ac_cv_prog_gxx" != xyes; then
+ AC_LANG_SAVE
+ AC_LANG_CPLUSPLUS
+ AC_CXX_CLEAN_TEMPLATE_REPOSITORY
+ ac_cxx_ptr_save_cxxflags="$CXXFLAGS"
+ ac_cxx_ptr_decl="template T m(T v){return v*2;}"
+ ac_cxx_ptr_prog="int x=2; int y=m(x);"
+
+ ac_cv_cxx_ptr="-ptr" # Try it with no space after -ptr
+ CXXFLAGS="$ac_cxx_ptr_save_cxxflags $ac_cv_cxx_ptr./confrepository.d"
+ AC_TRY_COMPILE([$ac_cxx_ptr_decl],[$ac_cxx_ptr_prog],[:],[ac_cv_cxx_ptr=no])
+ test -d confrepository.d || ac_cv_cxx_ptr=no
+
+ if test "x$ac_cv_cxx_ptr" = xno; then
+ ac_cv_cxx_ptr="-ptr " # Now try a space before the parameter.
+ CXXFLAGS="$ac_cxx_ptr_save_cxxflags $ac_cv_cxx_ptr./confrepository.d"
+ AC_TRY_COMPILE([$ac_cxx_ptr_decl],[$ac_cxx_ptr_prog],[:],[ac_cv_cxx_ptr=no])
+ test -d confrepository.d || ac_cv_cxx_ptr=no
+ fi
+
+ # Clear away any confrepository.d that we might have made.
+ rm -rf ./confrepository.d
+ CXXFLAGS="$ac_cxx_ptr_save_cxxflags"
+ AC_LANG_RESTORE
+ fi
+ ])
+ if test "x$ac_cv_cxx_ptr" != xno
+ then
+ CXXFLAGS_PTR=$ac_cv_cxx_ptr
+ AC_SUBST(CXXFLAGS_PTR)
+ fi
+])
Index: /waveforms/ossie_demo/tags/ossie_demo-0.6.1/ossie_demo/DeviceManager.dcd.xml
===================================================================
--- /waveforms/ossie_demo/tags/ossie_demo-0.6.1/ossie_demo/DeviceManager.dcd.xml (revision 2655)
+++ /waveforms/ossie_demo/tags/ossie_demo-0.6.1/ossie_demo/DeviceManager.dcd.xml (revision 2655)
@@ -0,0 +1,26 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ GPP1
+
+
+
+
+
+
+
Index: /waveforms/ossie_demo/tags/ossie_demo-0.6.1/ossie_demo/LICENSE
===================================================================
--- /waveforms/ossie_demo/tags/ossie_demo-0.6.1/ossie_demo/LICENSE (revision 997)
+++ /waveforms/ossie_demo/tags/ossie_demo-0.6.1/ossie_demo/LICENSE (revision 997)
@@ -0,0 +1,340 @@
+ GNU GENERAL PUBLIC LICENSE
+ Version 2, June 1991
+
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.
+ 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+ Preamble
+
+ The licenses for most software are designed to take away your
+freedom to share and change it. By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users. This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it. (Some other Free Software Foundation software is covered by
+the GNU Library General Public License instead.) You can apply it to
+your programs, too.
+
+ When we speak of free software, we are referring to freedom, not
+price. Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
+
+ To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+
+ For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have. You must make sure that they, too, receive or can get the
+source code. And you must show them these terms so they know their
+rights.
+
+ We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+
+ Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software. If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+
+ Finally, any free program is threatened constantly by software
+patents. We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary. To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.
+
+ The precise terms and conditions for copying, distribution and
+modification follow.
+
+ GNU GENERAL PUBLIC LICENSE
+ TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+ 0. This License applies to any program or other work which contains
+a notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License. The "Program", below,
+refers to any such program or work, and a "work based on the Program"
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into another
+language. (Hereinafter, translation is included without limitation in
+the term "modification".) Each licensee is addressed as "you".
+
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope. The act of
+running the Program is not restricted, and the output from the Program
+is covered only if its contents constitute a work based on the
+Program (independent of having been made by running the Program).
+Whether that is true depends on what the Program does.
+
+ 1. You may copy and distribute verbatim copies of the Program's
+source code as you receive it, in any medium, provided that you
+conspicuously and appropriately publish on each copy an appropriate
+copyright notice and disclaimer of warranty; keep intact all the
+notices that refer to this License and to the absence of any warranty;
+and give any other recipients of the Program a copy of this License
+along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and
+you may at your option offer warranty protection in exchange for a fee.
+
+ 2. You may modify your copy or copies of the Program or any portion
+of it, thus forming a work based on the Program, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+ a) You must cause the modified files to carry prominent notices
+ stating that you changed the files and the date of any change.
+
+ b) You must cause any work that you distribute or publish, that in
+ whole or in part contains or is derived from the Program or any
+ part thereof, to be licensed as a whole at no charge to all third
+ parties under the terms of this License.
+
+ c) If the modified program normally reads commands interactively
+ when run, you must cause it, when started running for such
+ interactive use in the most ordinary way, to print or display an
+ announcement including an appropriate copyright notice and a
+ notice that there is no warranty (or else, saying that you provide
+ a warranty) and that users may redistribute the program under
+ these conditions, and telling the user how to view a copy of this
+ License. (Exception: if the Program itself is interactive but
+ does not normally print such an announcement, your work based on
+ the Program is not required to print an announcement.)
+
+These requirements apply to the modified work as a whole. If
+identifiable sections of that work are not derived from the Program,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works. But when you
+distribute the same sections as part of a whole which is a work based
+on the Program, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Program.
+
+In addition, mere aggregation of another work not based on the Program
+with the Program (or with a work based on the Program) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+ 3. You may copy and distribute the Program (or a work based on it,
+under Section 2) in object code or executable form under the terms of
+Sections 1 and 2 above provided that you also do one of the following:
+
+ a) Accompany it with the complete corresponding machine-readable
+ source code, which must be distributed under the terms of Sections
+ 1 and 2 above on a medium customarily used for software interchange; or,
+
+ b) Accompany it with a written offer, valid for at least three
+ years, to give any third party, for a charge no more than your
+ cost of physically performing source distribution, a complete
+ machine-readable copy of the corresponding source code, to be
+ distributed under the terms of Sections 1 and 2 above on a medium
+ customarily used for software interchange; or,
+
+ c) Accompany it with the information you received as to the offer
+ to distribute corresponding source code. (This alternative is
+ allowed only for noncommercial distribution and only if you
+ received the program in object code or executable form with such
+ an offer, in accord with Subsection b above.)
+
+The source code for a work means the preferred form of the work for
+making modifications to it. For an executable work, complete source
+code means all the source code for all modules it contains, plus any
+associated interface definition files, plus the scripts used to
+control compilation and installation of the executable. However, as a
+special exception, the source code distributed need not include
+anything that is normally distributed (in either source or binary
+form) with the major components (compiler, kernel, and so on) of the
+operating system on which the executable runs, unless that component
+itself accompanies the executable.
+
+If distribution of executable or object code is made by offering
+access to copy from a designated place, then offering equivalent
+access to copy the source code from the same place counts as
+distribution of the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+ 4. You may not copy, modify, sublicense, or distribute the Program
+except as expressly provided under this License. Any attempt
+otherwise to copy, modify, sublicense or distribute the Program is
+void, and will automatically terminate your rights under this License.
+However, parties who have received copies, or rights, from you under
+this License will not have their licenses terminated so long as such
+parties remain in full compliance.
+
+ 5. You are not required to accept this License, since you have not
+signed it. However, nothing else grants you permission to modify or
+distribute the Program or its derivative works. These actions are
+prohibited by law if you do not accept this License. Therefore, by
+modifying or distributing the Program (or any work based on the
+Program), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Program or works based on it.
+
+ 6. Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the
+original licensor to copy, distribute or modify the Program subject to
+these terms and conditions. You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
+this License.
+
+ 7. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License. If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Program at all. For example, if a patent
+license would not permit royalty-free redistribution of the Program by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Program.
+
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply and the section as a whole is intended to apply in other
+circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system, which is
+implemented by public license practices. Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+ 8. If the distribution and/or use of the Program is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Program under this License
+may add an explicit geographical distribution limitation excluding
+those countries, so that distribution is permitted only in or among
+countries not thus excluded. In such case, this License incorporates
+the limitation as if written in the body of this License.
+
+ 9. The Free Software Foundation may publish revised and/or new versions
+of the General Public License from time to time. Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+Each version is given a distinguishing version number. If the Program
+specifies a version number of this License which applies to it and "any
+later version", you have the option of following the terms and conditions
+either of that version or of any later version published by the Free
+Software Foundation. If the Program does not specify a version number of
+this License, you may choose any version ever published by the Free Software
+Foundation.
+
+ 10. If you wish to incorporate parts of the Program into other free
+programs whose distribution conditions are different, write to the author
+to ask for permission. For software which is copyrighted by the Free
+Software Foundation, write to the Free Software Foundation; we sometimes
+make exceptions for this. Our decision will be guided by the two goals
+of preserving the free status of all derivatives of our free software and
+of promoting the sharing and reuse of software generally.
+
+ NO WARRANTY
+
+ 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN
+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
+PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS
+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE
+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
+REPAIR OR CORRECTION.
+
+ 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES.
+
+ END OF TERMS AND CONDITIONS
+
+ How to Apply These Terms to Your New Programs
+
+ If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+ To do so, attach the following notices to the program. It is safest
+to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+
+ Copyright (C)
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+
+
+Also add information on how to contact you by electronic and paper mail.
+
+If the program is interactive, make it output a short notice like this
+when it starts in an interactive mode:
+
+ Gnomovision version 69, Copyright (C) year name of author
+ Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+ This is free software, and you are welcome to redistribute it
+ under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License. Of course, the commands you use may
+be called something other than `show w' and `show c'; they could even be
+mouse-clicks or menu items--whatever suits your program.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the program, if
+necessary. Here is a sample; alter the names:
+
+ Yoyodyne, Inc., hereby disclaims all copyright interest in the program
+ `Gnomovision' (which makes passes at compilers) written by James Hacker.
+
+ , 1 April 1989
+ Ty Coon, President of Vice
+
+This General Public License does not permit incorporating your program into
+proprietary programs. If your program is a subroutine library, you may
+consider it more useful to permit linking proprietary applications with the
+library. If this is what you want to do, use the GNU Library General
+Public License instead of this License.
Index: /waveforms/ossie_demo/tags/ossie_demo-0.6.1/ossie_demo/DomainManager.spd.xml
===================================================================
--- /waveforms/ossie_demo/tags/ossie_demo-0.6.1/ossie_demo/DomainManager.spd.xml (revision 946)
+++ /waveforms/ossie_demo/tags/ossie_demo-0.6.1/ossie_demo/DomainManager.spd.xml (revision 946)
@@ -0,0 +1,18 @@
+
+
+
+
+
+
+
+ implementation of a Domain Manager
+
+
+ domainmanager.exe
+
+
+
+
+
+
+
Index: /waveforms/ossie_demo/tags/ossie_demo-0.6.1/ossie_demo/DomainManager.prf.xml
===================================================================
--- /waveforms/ossie_demo/tags/ossie_demo-0.6.1/ossie_demo/DomainManager.prf.xml (revision 946)
+++ /waveforms/ossie_demo/tags/ossie_demo-0.6.1/ossie_demo/DomainManager.prf.xml (revision 946)
@@ -0,0 +1,5 @@
+
+
+
+ These are the properties to configure the domain manager
+
Index: /waveforms/ossie_demo/tags/ossie_demo-0.6.1/ossie_demo/ossie_demo.sad.xml
===================================================================
--- /waveforms/ossie_demo/tags/ossie_demo-0.6.1/ossie_demo/ossie_demo.sad.xml (revision 2655)
+++ /waveforms/ossie_demo/tags/ossie_demo-0.6.1/ossie_demo/ossie_demo.sad.xml (revision 2655)
@@ -0,0 +1,130 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ TxDemo1
+
+
+
+
+
+
+
+
+
+
+
+
+ 1
+ 1
+ 0
+ 0
+ 0
+ 1
+ 0
+ 0
+ 1
+ 1
+ 1
+ 1
+ 0
+ 1
+ 1
+ 0
+ 0
+ 0
+ 1
+ 1
+ 0
+ 0
+ 1
+ 1
+ 0
+ 1
+ 1
+ 0
+ 1
+ 1
+ 1
+ 0
+
+
+
+
+
+
+
+
+
+
+
+ ChannelDemo1
+
+
+
+
+
+
+
+
+
+
+
+
+ RxDemo1
+
+
+
+
+
+
+
+
+
+
+
+
+ outPort
+
+
+
+
+
+ inPort
+
+
+
+
+
+
+
+ outPort
+
+
+
+
+
+ inPort
+
+
+
+
+
+
+
Index: /waveforms/ossie_demo/tags/ossie_demo-0.6.1/ossie_demo/TxDemo/TxDemo.cpp
===================================================================
--- /waveforms/ossie_demo/tags/ossie_demo-0.6.1/ossie_demo/TxDemo/TxDemo.cpp (revision 2655)
+++ /waveforms/ossie_demo/tags/ossie_demo-0.6.1/ossie_demo/TxDemo/TxDemo.cpp (revision 2655)
@@ -0,0 +1,196 @@
+/****************************************************************************
+
+Copyright 2006 Virginia Polytechnic Institute and State University
+
+This file is part of the OSSIE TxDemo.
+
+OSSIE TxDemo is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2 of the License, or
+(at your option) any later version.
+
+OSSIE TxDemo is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with OSSIE TxDemo; if not, write to the Free Software
+Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+
+****************************************************************************/
+
+
+#include
+#include
+//#include "ossie/cf.h"
+#include "TxDemo.h"
+//#include ossie/PortTypes.h"
+
+//#include "ossie/Resource_impl.h"
+
+TxDemo_i::TxDemo_i(const char *uuid, omni_condition *condition) : Resource_impl(uuid), component_running(condition)
+{
+ dataOut = new standardInterfaces_i::complexShort_u("outPort");
+
+ //processing_thread = new omni_thread(process_data, (void *) this); //Create the thread for the writer's processing function
+ //processing_thread->start(); //Start the thread containing the writer's processing function
+ bit_sequence = new short[1];
+
+
+}
+
+CORBA::Object_ptr TxDemo_i::getPort( const char* portName ) throw (CORBA::SystemException, CF::PortSupplier::UnknownPort)
+{
+ std::cout << "TxDemo_i getPort called with : " << portName << std::endl;
+
+ CORBA::Object_var p;
+
+ p = dataOut->getPort(portName);
+
+ if (!CORBA::is_nil(p))
+ return p._retn();
+
+ /*exception*/
+ throw CF::PortSupplier::UnknownPort();
+}
+
+void TxDemo_i::start() throw (CORBA::SystemException, CF::Resource::StartError)
+{
+ //Moved thread creation here so that start can be called after stop is called without having to uninstall/reinstall waveform
+ processing_thread = new omni_thread(process_data, (void *) this); //Create the thread for the writer's processing function
+ TX_active = true;
+ processing_thread->start();
+ std::cout << "start called on TxDemo" << std::endl;
+}
+
+void TxDemo_i::stop() throw (CORBA::SystemException, CF::Resource::StopError)
+{
+ TX_active = false;
+ std::cout << "stop called on TxDemo" << std::endl;
+}
+
+void TxDemo_i::releaseObject() throw (CORBA::SystemException, CF::LifeCycle::ReleaseError)
+{
+ std::cout << "releaseObject called on TxDemo" << std::endl;
+
+ component_running->signal();
+}
+
+void TxDemo_i::initialize() throw (CF::LifeCycle::InitializeError, CORBA::SystemException)
+{
+ std::cout << "initialize called on TxDemo" << std::endl;
+}
+
+void TxDemo_i::configure(const CF::Properties& props) throw (CORBA::SystemException, CF::PropertySet::InvalidConfiguration, CF::PropertySet::PartialConfiguration)
+{
+ std::cout << "configure called on TXDemo" << std::endl;
+
+ std::cout << "props length : " << props.length() << std::endl;
+
+ for (unsigned int i = 0; i >= simple_1;
+ I_gain = (short) (simple_1);
+ }
+
+ //std::cout << "Property id : " << props[i].id << std::endl;
+
+ if (strcmp(props[i].id, "DCE:ea4785f5-f117-4df8-8c28-619a462b5fbb") == 0)
+ {
+ props[i].value >>= simple_2;
+ Q_gain = (short) (simple_2);
+ }
+
+ //std::cout << "Property id : " << props[i].id << std::endl;
+
+ if (strcmp(props[i].id, "DCE:be4f66e0-6b62-11db-a9e3-0016769e49cf") == 0)
+ {
+ props[i].value >>= simple_3;
+ Rand_Switch = (short) (simple_3);
+ }
+
+ //std::cout << "Property id : " << props[i].id << std::endl;
+
+
+ if (strcmp(props[i].id, "DCE:dd904cdc-6b66-11db-bf4a-0016769e49cf") == 0)
+ {
+ props[i].value >>= simple_4;
+ Rand_Bit_Length = (short) (simple_4);
+ }
+
+ //std::cout << "Property id : " << props[i].id << std::endl;
+
+
+ if (strcmp(props[i].id, "DCE:68916c6e-7d71-495c-bd41-8bc4ee1bd748") == 0)
+ {
+ props[i].value >>= simplesequence_ptr;
+ simplesequencelength = simplesequence_ptr->length();
+ std::cout << "simplesequence has length : " << simplesequencelength << std::endl;
+
+ delete []bit_sequence;
+ bit_sequence = new short[simplesequencelength];
+ for (unsigned int i = 0; i < simplesequencelength; i++)
+ {
+ bit_sequence[i] = (short)(*simplesequence_ptr)[i];
+ }
+ }
+ }
+}
+
+void process_data(void *data)
+{
+ std::cout << "TX data generation started" << std::endl;
+
+ TxDemo_i *TX = (TxDemo_i *) data;
+ PortTypes::ShortSequence I_out, Q_out;
+ unsigned int count;
+ short I_bit, Q_bit;
+ while(TX->TX_active)
+ {
+ std::cout << "I_gain is " << TX->I_gain << ", and Q_gain is " << TX->Q_gain << std::endl;
+ std::cout << "TX generating and applying simple gain" <Rand_Switch == 1)
+ {
+ I_out.length(TX->Rand_Bit_Length/2);
+ Q_out.length(TX->Rand_Bit_Length/2);
+ count = (unsigned int)TX->Rand_Bit_Length;
+ }
+ else
+ {
+ I_out.length(TX->simplesequencelength/2);
+ Q_out.length(TX->simplesequencelength/2);
+ count = TX->simplesequencelength;
+ }
+ for(unsigned int i=0; i < count; i = i+2)
+ {
+ if(TX->Rand_Switch == 1)
+ {
+ I_bit = (rand() > RAND_MAX/2 ? 1 : 0);
+ Q_bit = (rand() > RAND_MAX/2 ? 1 : 0);
+ I_out[i/2] = (1-2*I_bit)*(TX->I_gain);
+ Q_out[i/2] = (1-2*Q_bit)*(TX->Q_gain);
+ std::cout << "I(" << i << ") is " << 1-2*I_bit << ", and Q(" << i << ") is " << 1-2*Q_bit << std::endl;
+
+ }
+ else
+ {
+ I_out[i/2] = (1-2*(TX->bit_sequence[i]))*(TX->I_gain);
+ Q_out[i/2] = (1-2*(TX->bit_sequence[i+1]))*(TX->Q_gain);
+ std::cout << "I(" << i << ") is " << 1-2*(TX->bit_sequence[i]) << ", and Q(" << i << ") is " << 1-2*(TX->bit_sequence[i+1]) << std::endl;
+ }
+ std::cout << "TX_I(" << i << ") is " << I_out[i/2] << ", and TX_Q(" << i << ") is " << Q_out[i/2] << std::endl;
+ }
+ std::cout<<"TX pushing data"<dataOut->pushPacket(I_out, Q_out);
+ sleep(1);
+ }
+ TX->processing_thread->exit();
+}
+
+
Index: /waveforms/ossie_demo/tags/ossie_demo-0.6.1/ossie_demo/TxDemo/TxDemo.spd.xml
===================================================================
--- /waveforms/ossie_demo/tags/ossie_demo-0.6.1/ossie_demo/TxDemo/TxDemo.spd.xml (revision 2655)
+++ /waveforms/ossie_demo/tags/ossie_demo-0.6.1/ossie_demo/TxDemo/TxDemo.spd.xml (revision 2655)
@@ -0,0 +1,25 @@
+
+
+
+
+
+
+
+ OSSIE Project
+ Mobile and Portable Radio Research Group
+ http://www.mprg.org
+
+
+
+
+
+
+
+
+ Default Description
+
+
+
+
+
+
Index: /waveforms/ossie_demo/tags/ossie_demo-0.6.1/ossie_demo/TxDemo/TxDemo.prf.xml
===================================================================
--- /waveforms/ossie_demo/tags/ossie_demo-0.6.1/ossie_demo/TxDemo/TxDemo.prf.xml (revision 2655)
+++ /waveforms/ossie_demo/tags/ossie_demo-0.6.1/ossie_demo/TxDemo/TxDemo.prf.xml (revision 2655)
@@ -0,0 +1,64 @@
+
+
+
+
+
+
+ I Channel Gain
+ 8
+
+
+
+ Q Channel Gain
+ 10
+
+
+
+ Switch to turn on Random Bit Generator (Off/On) (0/1)
+ 1
+
+
+
+ Number of bits to output when Random is On (Even)
+ 50
+
+
+
+ Binary Sequence
+
+ 1
+ 1
+ 0
+ 0
+ 0
+ 1
+ 0
+ 0
+ 1
+ 1
+ 1
+ 1
+ 0
+ 1
+ 1
+ 0
+ 0
+ 0
+ 1
+ 1
+ 0
+ 0
+ 1
+ 1
+ 1
+ 1
+ 0
+ 0
+ 1
+ 1
+ 1
+ 0
+
+
+
+
Index: /waveforms/ossie_demo/tags/ossie_demo-0.6.1/ossie_demo/TxDemo/main.cpp
===================================================================
--- /waveforms/ossie_demo/tags/ossie_demo-0.6.1/ossie_demo/TxDemo/main.cpp (revision 2655)
+++ /waveforms/ossie_demo/tags/ossie_demo-0.6.1/ossie_demo/TxDemo/main.cpp (revision 2655)
@@ -0,0 +1,68 @@
+/****************************************************************************
+
+Copyright 2006 Virginia Polytechnic Institute and State University
+
+This file is part of the OSSIE TxDemo.
+
+OSSIE TxDemo is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2 of the License, or
+(at your option) any later version.
+
+OSSIE TxDemo is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with OSSIE TxDemo; if not, write to the Free Software
+Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+
+****************************************************************************/
+
+#include
+#include "ossie/ossieSupport.h"
+
+#include "TxDemo.h"
+
+using namespace std;
+using namespace standardInterfaces; // For standard OSSIE interface classes
+
+
+int main(int argc, char* argv[])
+
+{
+ ossieSupport::ORB *orb = new ossieSupport::ORB;
+ omni_mutex component_running_mutex;
+ omni_condition *component_running = new omni_condition(&component_running_mutex);
+
+ if (argc != 3) {
+ cout << argv[0] << " " << endl;
+ exit (-1);
+ }
+
+ char *uuid = argv[1];
+ char *label = argv[2];
+
+ cout << "Identifier - " << uuid << " Label - " << label << endl;
+
+ TxDemo_i* txdemo_servant;
+ CF::Resource_var txdemo_var;
+
+ // Create the txdemo component servant and object reference
+
+ txdemo_servant = new TxDemo_i(uuid, component_running);
+ txdemo_var = txdemo_servant->_this();
+
+ orb->bind_object_to_name((CORBA::Object_ptr) txdemo_var, label);
+
+ // This bit is ORB specific
+ // omniorb is threaded and the servants are running at this point
+ // so we block on the condition
+ // The releaseObject method clear the condition and the component exits
+
+ component_running->wait();
+ orb->unbind_name(label);
+ orb->orb->shutdown(0);
+
+}
Index: /waveforms/ossie_demo/tags/ossie_demo-0.6.1/ossie_demo/TxDemo/TxDemo.h
===================================================================
--- /waveforms/ossie_demo/tags/ossie_demo-0.6.1/ossie_demo/TxDemo/TxDemo.h (revision 2655)
+++ /waveforms/ossie_demo/tags/ossie_demo-0.6.1/ossie_demo/TxDemo/TxDemo.h (revision 2655)
@@ -0,0 +1,86 @@
+/****************************************************************************
+
+Copyright 2006 Virginia Polytechnic Institute and State University
+
+This file is part of the OSSIE TxDemo.
+
+OSSIE TxDemo is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2 of the License, or
+(at your option) any later version.
+
+OSSIE TxDemo is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with OSSIE TxDemo; if not, write to the Free Software
+Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+
+****************************************************************************/
+
+
+#ifndef TXDEMO_IMPL_H
+#define TXDEMO_IMPL_H
+
+#include
+#include "ossie/cf.h"
+
+
+#include "ossie/PortTypes.h"
+
+#include "standardinterfaces/complexShort.h"
+#include "standardinterfaces/complexShort_u.h"
+
+
+#include "ossie/Resource_impl.h"
+class TxDemo_i;
+
+void process_data(void *data);
+
+class TxDemo_i : public virtual Resource_impl
+{
+ friend class dataOut_i;
+ friend class dataIn_i;
+ friend void process_data(void *data);
+
+ public:
+ TxDemo_i(const char *uuid, omni_condition *sem);
+
+ void start() throw (CF::Resource::StartError, CORBA::SystemException);
+ void stop() throw (CF::Resource::StopError, CORBA::SystemException);
+
+ CORBA::Object_ptr getPort( const char* portName ) throw (CF::PortSupplier::UnknownPort, CORBA::SystemException);
+
+ void releaseObject() throw (CF::LifeCycle::ReleaseError, CORBA::SystemException);
+
+ void initialize() throw (CF::LifeCycle::InitializeError, CORBA::SystemException);
+ void configure(const CF::Properties&) throw (CORBA::SystemException, CF::PropertySet::InvalidConfiguration, CF::PropertySet::PartialConfiguration);
+
+
+ private:
+ TxDemo_i();
+ TxDemo_i(TxDemo_i&);
+
+ omni_condition *component_running; //for component shutdown
+ omni_thread *processing_thread; //for component writer function
+
+ CORBA::Short simple_1;
+ CORBA::Short simple_2;
+ CORBA::Short simple_3;
+ CORBA::Short simple_4;
+ short I_gain;
+ short Q_gain;
+ short Rand_Switch;
+ short Rand_Bit_Length;
+ unsigned int simplesequencelength;
+ CORBA::ShortSeq *simplesequence_ptr;
+ short *bit_sequence;
+ //simplesequence_ptr = new short[simplesequencelength];
+
+ //list components provides and uses ports
+ standardInterfaces_i::complexShort_u *dataOut;
+ bool TX_active;
+};
+#endif
Index: /waveforms/ossie_demo/tags/ossie_demo-0.6.1/ossie_demo/TxDemo/TxDemo.scd.xml
===================================================================
--- /waveforms/ossie_demo/tags/ossie_demo-0.6.1/ossie_demo/TxDemo/TxDemo.scd.xml (revision 2655)
+++ /waveforms/ossie_demo/tags/ossie_demo-0.6.1/ossie_demo/TxDemo/TxDemo.scd.xml (revision 2655)
@@ -0,0 +1,34 @@
+
+
+
+
+
+ 2.2
+
+ resource
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Index: /waveforms/ossie_demo/tags/ossie_demo-0.6.1/ossie_demo/TxDemo/Makefile.am
===================================================================
--- /waveforms/ossie_demo/tags/ossie_demo-0.6.1/ossie_demo/TxDemo/Makefile.am (revision 2655)
+++ /waveforms/ossie_demo/tags/ossie_demo-0.6.1/ossie_demo/TxDemo/Makefile.am (revision 2655)
@@ -0,0 +1,11 @@
+AM_CXXFLAGS = -Wall
+
+bin_PROGRAMS = TxDemo
+
+TxDemo_SOURCES = TxDemo.cpp TxDemo.h main.cpp
+
+ossieName = TxDemo
+xmldir = $(prefix)/xml/$(ossieName)
+dist_xml_DATA = TxDemo.prf.xml TxDemo.scd.xml \
+TxDemo.spd.xml
+
Index: /waveforms/ossie_demo/tags/ossie_demo-0.6.1/ossie_demo/DeviceManager.scd.xml
===================================================================
--- /waveforms/ossie_demo/tags/ossie_demo-0.6.1/ossie_demo/DeviceManager.scd.xml (revision 946)
+++ /waveforms/ossie_demo/tags/ossie_demo-0.6.1/ossie_demo/DeviceManager.scd.xml (revision 946)
@@ -0,0 +1,17 @@
+
+
+
+ 2.2
+
+ devicemanager
+
+
+
+
+
+
+
+
+
+
+
Index: /waveforms/ossie_demo/tags/ossie_demo-0.6.1/ossie_demo/configure.ac
===================================================================
--- /waveforms/ossie_demo/tags/ossie_demo-0.6.1/ossie_demo/configure.ac (revision 2704)
+++ /waveforms/ossie_demo/tags/ossie_demo-0.6.1/ossie_demo/configure.ac (revision 2704)
@@ -0,0 +1,31 @@
+AC_INIT(ossie_demo, 0.6.1)
+AM_INIT_AUTOMAKE
+
+AC_PREFIX_DEFAULT("/home/sca")
+
+AC_PROG_CXX
+AC_PROG_INSTALL
+AC_PROG_MAKE_SET
+
+AC_HEADER_SYS_WAIT
+
+AC_FUNC_FORK
+
+AC_CORBA_ORB
+
+export PKG_CONFIG_PATH="$PKG_CONFIG_PATH:/usr/local/lib/pkgconfig"
+PKG_CHECK_MODULES(OSSIE, ossie >= 0.6.0,,exit)
+CXXFLAGS="$CXXFLAGS $OSSIE_CFLAGS"
+IDL_FLAGS="$OSSIE_CFLAGS"
+AC_SUBST(IDL_FLAGS)
+
+PKG_CHECK_MODULES(SI, standardInterfaces >= 0.6.0,,exit)
+SI_PATH=`pkg-config --variable=includedir standardInterfaces`
+
+LIBS="$LIBS $OSSIE_LIBS $SI_LIBS"
+
+AC_SUBST(SI_PATH)
+
+AC_CONFIG_FILES(Makefile TxDemo/Makefile)
+
+AC_OUTPUT
Index: /waveforms/ossie_demo/tags/ossie_demo-0.6.1/ossie_demo/DomainManager.dmd.xml
===================================================================
--- /waveforms/ossie_demo/tags/ossie_demo-0.6.1/ossie_demo/DomainManager.dmd.xml (revision 946)
+++ /waveforms/ossie_demo/tags/ossie_demo-0.6.1/ossie_demo/DomainManager.dmd.xml (revision 946)
@@ -0,0 +1,10 @@
+
+
+
+OSSIE DomainManager Configuration File
+
+
+
+
+
+
Index: /waveforms/ossie_demo/tags/ossie_demo-0.6.1/ossie_demo/INSTALL
===================================================================
--- /waveforms/ossie_demo/tags/ossie_demo-0.6.1/ossie_demo/INSTALL (revision 991)
+++ /waveforms/ossie_demo/tags/ossie_demo-0.6.1/ossie_demo/INSTALL (revision 991)
@@ -0,0 +1,7 @@
+To install the waveform type:
+
+$ ./configure
+$ make
+$ make install
+
+Files will be installed relative to the /home/sca directory.
Index: /waveforms/ossie_demo/tags/ossie_demo-0.6.1/ossie_demo/DomainManager.scd.xml
===================================================================
--- /waveforms/ossie_demo/tags/ossie_demo-0.6.1/ossie_demo/DomainManager.scd.xml (revision 946)
+++ /waveforms/ossie_demo/tags/ossie_demo-0.6.1/ossie_demo/DomainManager.scd.xml (revision 946)
@@ -0,0 +1,17 @@
+
+
+
+ 2.2
+
+ domainmanager
+
+
+
+
+
+
+
+
+
+
+
Index: /waveforms/ossie_demo/tags/ossie_demo-0.6.1/ossie_demo/Makefile.am
===================================================================
--- /waveforms/ossie_demo/tags/ossie_demo-0.6.1/ossie_demo/Makefile.am (revision 2655)
+++ /waveforms/ossie_demo/tags/ossie_demo-0.6.1/ossie_demo/Makefile.am (revision 2655)
@@ -0,0 +1,13 @@
+AM_CXXFLAGS = -Wall
+
+ossieName = ossie_demo
+
+SUBDIRS = TxDemo
+
+waveformdir = $(prefix)/waveforms/$(ossieName)
+dist_waveform_DATA = ossie_demo.sad.xml ossie_demo_DAS.xml \
+DeviceManager.dcd.xml DeviceManager.spd.xml \
+DeviceManager.scd.xml DeviceManager.prf.xml \
+DomainManager.dmd.xml DomainManager.spd.xml \
+DomainManager.scd.xml DomainManager.prf.xml
+
Index: /waveforms/ossie_demo/tags/ossie_demo-0.6.1/ossie_demo/reconf
===================================================================
--- /waveforms/ossie_demo/tags/ossie_demo-0.6.1/ossie_demo/reconf (revision 932)
+++ /waveforms/ossie_demo/tags/ossie_demo-0.6.1/ossie_demo/reconf (revision 932)
@@ -0,0 +1,6 @@
+#!/bin/sh
+
+rm -f config.cache
+aclocal -I aclocal.d
+autoconf
+automake --foreign --add-missing
Index: /waveforms/ossie_demo/tags/ossie_demo-0.6.1/ossie_demo/ossie_demo_DAS.xml
===================================================================
--- /waveforms/ossie_demo/tags/ossie_demo-0.6.1/ossie_demo/ossie_demo_DAS.xml (revision 2655)
+++ /waveforms/ossie_demo/tags/ossie_demo-0.6.1/ossie_demo/ossie_demo_DAS.xml (revision 2655)
@@ -0,0 +1,20 @@
+
+
+
+
+
+
+
+ DCE:5eb1cd93-12ae-4c48-88c3-24894a7fb4f0
+ DCE:61757e9e-0f27-4ba4-a0cd-07694a64992f
+
+
+ DCE:c6da4e17-e1da-4353-a9ef-6f3aa5f6e3e8
+ DCE:61757e9e-0f27-4ba4-a0cd-07694a64992f
+
+
+ DCE:659a6000-ad69-486f-a96e-87a3a764b6c6
+ DCE:61757e9e-0f27-4ba4-a0cd-07694a64992f
+
+
+
Index: /waveforms/ossie_demo/tags/ossie_demo-0.6.1/ossie_demo/DeviceManager.spd.xml
===================================================================
--- /waveforms/ossie_demo/tags/ossie_demo-0.6.1/ossie_demo/DeviceManager.spd.xml (revision 2655)
+++ /waveforms/ossie_demo/tags/ossie_demo-0.6.1/ossie_demo/DeviceManager.spd.xml (revision 2655)
@@ -0,0 +1,17 @@
+
+
+
+
+
+
+
+
+
+ implementation of a Device Manager
+
+
+ domainmanager.exe
+
+
+
+