Index: /alf_plugins/speaker/trunk/speaker/aclocal.d/AC_PROG_CXX_LINK_SO_LIB.m4 =================================================================== --- /alf_plugins/speaker/trunk/speaker/aclocal.d/AC_PROG_CXX_LINK_SO_LIB.m4 (revision 2718) +++ /alf_plugins/speaker/trunk/speaker/aclocal.d/AC_PROG_CXX_LINK_SO_LIB.m4 (revision 2718) @@ -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: /alf_plugins/speaker/trunk/speaker/aclocal.d/AC_CORBA_OMNIEVENTS.m4 =================================================================== --- /alf_plugins/speaker/trunk/speaker/aclocal.d/AC_CORBA_OMNIEVENTS.m4 (revision 2718) +++ /alf_plugins/speaker/trunk/speaker/aclocal.d/AC_CORBA_OMNIEVENTS.m4 (revision 2718) @@ -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: /alf_plugins/speaker/trunk/speaker/aclocal.d/AC_CORBA_SEARCHDIRS.m4 =================================================================== --- /alf_plugins/speaker/trunk/speaker/aclocal.d/AC_CORBA_SEARCHDIRS.m4 (revision 2718) +++ /alf_plugins/speaker/trunk/speaker/aclocal.d/AC_CORBA_SEARCHDIRS.m4 (revision 2718) @@ -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: /alf_plugins/speaker/trunk/speaker/aclocal.d/AC_HAVE_XERCES_C.m4 =================================================================== --- /alf_plugins/speaker/trunk/speaker/aclocal.d/AC_HAVE_XERCES_C.m4 (revision 2718) +++ /alf_plugins/speaker/trunk/speaker/aclocal.d/AC_HAVE_XERCES_C.m4 (revision 2718) @@ -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: /alf_plugins/speaker/trunk/speaker/aclocal.d/AC_CXX_CLEAN_TEMPLATE_REPOSITORY.m4 =================================================================== --- /alf_plugins/speaker/trunk/speaker/aclocal.d/AC_CXX_CLEAN_TEMPLATE_REPOSITORY.m4 (revision 2718) +++ /alf_plugins/speaker/trunk/speaker/aclocal.d/AC_CXX_CLEAN_TEMPLATE_REPOSITORY.m4 (revision 2718) @@ -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: /alf_plugins/speaker/trunk/speaker/aclocal.d/AC_CORBA_ORB_OMNIORB3.m4 =================================================================== --- /alf_plugins/speaker/trunk/speaker/aclocal.d/AC_CORBA_ORB_OMNIORB3.m4 (revision 2718) +++ /alf_plugins/speaker/trunk/speaker/aclocal.d/AC_CORBA_ORB_OMNIORB3.m4 (revision 2718) @@ -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: /alf_plugins/speaker/trunk/speaker/aclocal.d/AC_CORBA_ORB_OMNIORB4.m4 =================================================================== --- /alf_plugins/speaker/trunk/speaker/aclocal.d/AC_CORBA_ORB_OMNIORB4.m4 (revision 2718) +++ /alf_plugins/speaker/trunk/speaker/aclocal.d/AC_CORBA_ORB_OMNIORB4.m4 (revision 2718) @@ -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: /alf_plugins/speaker/trunk/speaker/aclocal.d/AC_CXX_NAMESPACES.m4 =================================================================== --- /alf_plugins/speaker/trunk/speaker/aclocal.d/AC_CXX_NAMESPACES.m4 (revision 2718) +++ /alf_plugins/speaker/trunk/speaker/aclocal.d/AC_CXX_NAMESPACES.m4 (revision 2718) @@ -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: /alf_plugins/speaker/trunk/speaker/aclocal.d/AC_CXX_COMPILE_OBJ.m4 =================================================================== --- /alf_plugins/speaker/trunk/speaker/aclocal.d/AC_CXX_COMPILE_OBJ.m4 (revision 2718) +++ /alf_plugins/speaker/trunk/speaker/aclocal.d/AC_CXX_COMPILE_OBJ.m4 (revision 2718) @@ -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: /alf_plugins/speaker/trunk/speaker/aclocal.d/AC_FUNC_SIGSET.m4 =================================================================== --- /alf_plugins/speaker/trunk/speaker/aclocal.d/AC_FUNC_SIGSET.m4 (revision 2718) +++ /alf_plugins/speaker/trunk/speaker/aclocal.d/AC_FUNC_SIGSET.m4 (revision 2718) @@ -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: /alf_plugins/speaker/trunk/speaker/aclocal.d/ETR_SOCKET_NSL.m4 =================================================================== --- /alf_plugins/speaker/trunk/speaker/aclocal.d/ETR_SOCKET_NSL.m4 (revision 2718) +++ /alf_plugins/speaker/trunk/speaker/aclocal.d/ETR_SOCKET_NSL.m4 (revision 2718) @@ -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: /alf_plugins/speaker/trunk/speaker/aclocal.d/AC_PROG_CXX_AR.m4 =================================================================== --- /alf_plugins/speaker/trunk/speaker/aclocal.d/AC_PROG_CXX_AR.m4 (revision 2718) +++ /alf_plugins/speaker/trunk/speaker/aclocal.d/AC_PROG_CXX_AR.m4 (revision 2718) @@ -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: /alf_plugins/speaker/trunk/speaker/aclocal.d/AC_CXX_IDENTITY.m4 =================================================================== --- /alf_plugins/speaker/trunk/speaker/aclocal.d/AC_CXX_IDENTITY.m4 (revision 2718) +++ /alf_plugins/speaker/trunk/speaker/aclocal.d/AC_CXX_IDENTITY.m4 (revision 2718) @@ -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: /alf_plugins/speaker/trunk/speaker/aclocal.d/AC_CORBA_OMNI_PLATFORM.m4 =================================================================== --- /alf_plugins/speaker/trunk/speaker/aclocal.d/AC_CORBA_OMNI_PLATFORM.m4 (revision 2718) +++ /alf_plugins/speaker/trunk/speaker/aclocal.d/AC_CORBA_OMNI_PLATFORM.m4 (revision 2718) @@ -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: /alf_plugins/speaker/trunk/speaker/aclocal.d/AC_CXX_STD.m4 =================================================================== --- /alf_plugins/speaker/trunk/speaker/aclocal.d/AC_CXX_STD.m4 (revision 2718) +++ /alf_plugins/speaker/trunk/speaker/aclocal.d/AC_CXX_STD.m4 (revision 2718) @@ -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: /alf_plugins/speaker/trunk/speaker/aclocal.d/AC_CXX_BOOL.m4 =================================================================== --- /alf_plugins/speaker/trunk/speaker/aclocal.d/AC_CXX_BOOL.m4 (revision 2718) +++ /alf_plugins/speaker/trunk/speaker/aclocal.d/AC_CXX_BOOL.m4 (revision 2718) @@ -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: /alf_plugins/speaker/trunk/speaker/aclocal.d/ACX_PTHREAD.m4 =================================================================== --- /alf_plugins/speaker/trunk/speaker/aclocal.d/ACX_PTHREAD.m4 (revision 2718) +++ /alf_plugins/speaker/trunk/speaker/aclocal.d/ACX_PTHREAD.m4 (revision 2718) @@ -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: /alf_plugins/speaker/trunk/speaker/aclocal.d/AC_PROG_OMNIIDL.m4 =================================================================== --- /alf_plugins/speaker/trunk/speaker/aclocal.d/AC_PROG_OMNIIDL.m4 (revision 2718) +++ /alf_plugins/speaker/trunk/speaker/aclocal.d/AC_PROG_OMNIIDL.m4 (revision 2718) @@ -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: /alf_plugins/speaker/trunk/speaker/aclocal.d/AC_CORBA_IDLCOS.m4 =================================================================== --- /alf_plugins/speaker/trunk/speaker/aclocal.d/AC_CORBA_IDLCOS.m4 (revision 2718) +++ /alf_plugins/speaker/trunk/speaker/aclocal.d/AC_CORBA_IDLCOS.m4 (revision 2718) @@ -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: /alf_plugins/speaker/trunk/speaker/aclocal.d/AC_CXX_PIC_FLAG.m4 =================================================================== --- /alf_plugins/speaker/trunk/speaker/aclocal.d/AC_CXX_PIC_FLAG.m4 (revision 2718) +++ /alf_plugins/speaker/trunk/speaker/aclocal.d/AC_CXX_PIC_FLAG.m4 (revision 2718) @@ -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: /alf_plugins/speaker/trunk/speaker/aclocal.d/AC_CXX_HAVE_STL.m4 =================================================================== --- /alf_plugins/speaker/trunk/speaker/aclocal.d/AC_CXX_HAVE_STL.m4 (revision 2718) +++ /alf_plugins/speaker/trunk/speaker/aclocal.d/AC_CXX_HAVE_STL.m4 (revision 2718) @@ -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: /alf_plugins/speaker/trunk/speaker/aclocal.d/AC_CORBA_ORB.m4 =================================================================== --- /alf_plugins/speaker/trunk/speaker/aclocal.d/AC_CORBA_ORB.m4 (revision 2718) +++ /alf_plugins/speaker/trunk/speaker/aclocal.d/AC_CORBA_ORB.m4 (revision 2718) @@ -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: /alf_plugins/speaker/trunk/speaker/aclocal.d/aclocal.m4 =================================================================== --- /alf_plugins/speaker/trunk/speaker/aclocal.d/aclocal.m4 (revision 2718) +++ /alf_plugins/speaker/trunk/speaker/aclocal.d/aclocal.m4 (revision 2718) @@ -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: /alf_plugins/speaker/trunk/speaker/aclocal.d/AC_CXX_TEMPLATE_REPOSITORY.m4 =================================================================== --- /alf_plugins/speaker/trunk/speaker/aclocal.d/AC_CXX_TEMPLATE_REPOSITORY.m4 (revision 2718) +++ /alf_plugins/speaker/trunk/speaker/aclocal.d/AC_CXX_TEMPLATE_REPOSITORY.m4 (revision 2718) @@ -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: /alf_plugins/speaker/trunk/speaker/speaker.py =================================================================== --- /alf_plugins/speaker/trunk/speaker/speaker.py (revision 4126) +++ /alf_plugins/speaker/trunk/speaker/speaker.py (revision 4126) @@ -0,0 +1,240 @@ +#!/usr/bin/env python + +import sys +from omniORB import CORBA +import CosNaming +import CF, CF__POA +from amara import binderytools +import standardInterfaces +import standardInterfaces__POA +import time, threading +import ossaudiodev +import struct +import wx +import time + +class my_sound_structure(standardInterfaces__POA.complexShort): + def __init__(self, orb, gui): + #print "Initializing consumer..." + self.orb = orb + self.gui = gui + self.end_time = time.time() + self.begin_time = time.time() + + def pushPacket(self, Left_channel, Right_channel): + if self.gui.sound_state: + my_string = '' + if Right_channel[0]==0: # using the left channel + for y in range(0,len(Left_channel)): + upper_val = Left_channel[y]/256 + lower_val = Left_channel[y] - (upper_val * 256) + my_string += struct.pack('h', Left_channel[y]) + #my_string += struct.pack('B',lower_val) + #my_string += struct.pack('b',upper_val) + if self.gui.channels == 2: + my_string += '\0' + my_string += '\0' + else: + my_string += struct.pack('h', Left_channel[y]) + #my_string += struct.pack('B',lower_val) + #my_string += struct.pack('b',upper_val) + else: # using the right channel + for y in range(0,len(Right_channel)): + upper_val = Right_channel[y]/256 + lower_val = Right_channel[y] - (upper_val * 256) + my_string += struct.pack('h', Right_channel[y]) + #my_string += struct.pack('B',lower_val) + #my_string += struct.pack('b',upper_val) + if self.gui.channels == 2: + my_string += '\0' + my_string += '\0' + else: + my_string += struct.pack('h', Right_channel[y]) + #my_string += struct.pack('B',lower_val) + #my_string += struct.pack('b',upper_val) + self.gui.sound_driver.writeall(my_string) + self.end_time = time.time() + +class SpeakerFrame(wx.Frame): + + def __init__(self,parent, namespace, interface, ns_name, port_name): + self.namespace = namespace + self.interface = interface + self.ns_name = ns_name + self.port_name = port_name + self.parent = parent + self.setup_sound() + self.XLEFT = 25 + self.YTOP = 65 + self.VSPACE = 70 + self._init_ctrls(parent) + self.sound_state = True + self.channels = self.osschannels + self.sampleRateBox.SetValue(str(self.ossspeed)) + self.sampleTypeChoice.SetSelection(1) + + def _init_ctrls(self,prnt): + # Initialize the frame + wx.Frame.__init__(self, id=-1, name='irFrame', + parent=prnt, pos=wx.Point(-1, -1), size=wx.Size(600, 100), + style=wx.DEFAULT_FRAME_STYLE, title=u'Sound Out Control') + + self.panel = wx.Panel(parent=self, pos=wx.Point(1,1), size=wx.Size(450,450)) + + self.sampleRateBox = wx.TextCtrl(id=-1, + name=u'sampleRateBox', parent=self.panel, pos=wx.Point(self.XLEFT+320, self.YTOP-20), + size=wx.Size(100, 25),value=u'') + self.staticText1 = wx.StaticText(id=-1, + label=u'Sample Rate:', name='staticText1', parent=self.panel, + pos=wx.Point(self.XLEFT+325, self.YTOP-40), size=wx.Size(120, 17), style=0) + self.UpdateRateBtn = wx.Button(id=-1, label='update rate', + name='ExitBtn', parent=self.panel, pos=wx.Point(self.XLEFT+320, self.YTOP+2), + size=wx.Size(100, 25), style=0) + self.UpdateRateBtn.Bind(wx.EVT_BUTTON, self.OnUpdateRateBtn, id=-1) + + #self.bitChoice = wx.Choice(choices=["U8","U16","S16"], id=-1, name=u'bitChoice', + self.bitChoice = wx.Choice(choices=["U8"], id=-1, name=u'bitChoice', + parent=self.panel,pos=wx.Point(self.XLEFT+70,self.YTOP-20), size=wx.Size(75,27), style=0); + self.staticText5 = wx.StaticText(id=-1, + label=u'Bits Per Sample:', name='staticText5', parent=self.panel, + pos=wx.Point(self.XLEFT+75, self.YTOP-40), size=wx.Size(145, 17), style=0) + self.bitChoice.Bind(wx.EVT_BUTTON, self.OnSoundBtn, id=-1) + + self.sampleTypeChoice = wx.Choice(choices=["stereo","mono"], id=-1, name=u'sampleTypeChoice', + parent=self.panel,pos=wx.Point(self.XLEFT+195,self.YTOP-20), size=wx.Size(90,27), style=0); + self.staticText6 = wx.StaticText(id=-1, + label=u'Sample Type:', name='staticText5', parent=self.panel, + pos=wx.Point(self.XLEFT+200, self.YTOP-40), size=wx.Size(120, 17), style=0) + self.sampleTypeChoice.Bind(wx.EVT_CHOICE, self.OnsampleTypeChoice, id=-1) + + self.ExitBtn = wx.Button(id=-1, label='Exit', + name='ExitBtn', parent=self.panel, pos=wx.Point(self.XLEFT+460, self.YTOP-23), + size=wx.Size(80, 30), style=0) + self.ExitBtn.Bind(wx.EVT_BUTTON, self.OnExitBtn, id=-1) + + self.SoundBitmap = wx.Bitmap("/sdr/sca/tools/speaker/audio-on.xpm", wx.BITMAP_TYPE_XPM) + self.SoundBtn = wx.BitmapButton(id=-1, name='initBtn', parent=self.panel, pos=wx.Point(self.XLEFT, self.YTOP-40), + size=wx.Size(55, 55), style=0, bitmap=self.SoundBitmap) + self.SoundBtn.Bind(wx.EVT_BUTTON, self.OnSoundBtn, id=-1) + + # Bind the close event so we can disconnect the ports + self.Bind(wx.EVT_CLOSE, self.OnCloseWindow) + + def setup_sound(self): + self.timing_diff = 1000 + self.ossspeed = 100000 + self.osschannels = 1 + self.ossfmt = ossaudiodev.AFMT_S16_LE + self.CORBA_being_used = False + + self.sound_driver = ossaudiodev.open('w') + self.osschannels = self.sound_driver.channels(2) + #ossfmt = sound_driver.setfmt(ossaudiodev.AFMT_U8) + self.ossfmt = self.sound_driver.setfmt(ossaudiodev.AFMT_S16_LE) + self.ossspeed = self.sound_driver.speed(50000) + self.sound_driver.nonblock() + + if not ((self.ns_name==None) or (self.port_name==None)): + self.CORBA_being_used = True + self.orb = CORBA.ORB_init(sys.argv, CORBA.ORB_ID) + obj = self.orb.resolve_initial_references("NameService") + rootContext = obj._narrow(CosNaming.NamingContext) + if rootContext is None: + print "Failed to narrow the root naming context" + sys.exit(1) + name = [CosNaming.NameComponent(self.ns_name[0],""), + CosNaming.NameComponent(self.ns_name[1],""), + CosNaming.NameComponent(self.ns_name[2],"")] + + try: + ResourceRef = rootContext.resolve(name) + + except: + print "Required resource not found" + sys.exit(1) + + ResourceHandle = ResourceRef._narrow(CF.Resource) + PortReference = ResourceHandle.getPort(self.port_name) + if PortReference is None: + print "Failed to get Port reference" + self.PortHandle = PortReference._narrow(CF.Port) + + self.my_local_speaker = my_sound_structure(self.orb, self) + obj_poa = self.orb.resolve_initial_references("RootPOA") + poaManager = obj_poa._get_the_POAManager() + poaManager.activate() + obj_poa.activate_object(self.my_local_speaker) + self.PortHandle.connectPort(self.my_local_speaker._this(), "thisismyconnectionid_speaker") + self.connected_state = True + #orb.run() + + def OnCloseWindow(self,event): + if hasattr(self.parent, 'removeToolFrame'): + self.parent.removeToolFrame(self) + self = None + event.Skip() + + def __del__(self): + if self.CORBA_being_used: + if self.connected_state == True: + self.PortHandle.disconnectPort("thisismyconnectionid_speaker") + while (time.time() - self.my_local_speaker.end_time) < 1.0: + #print (time.time() - my_local_speaker.end_time) + time.sleep(1) + #sys.exit(0) + + def OnUpdateRateBtn(self, event): + inspeed = self.sampleRateBox.GetValue() + self.ossspeed = self.sound_driver.speed(int(inspeed)) + #print "This is my new speed: " + str(ossspeed) + " from this speed: " + inspeed + self.sampleRateBox.SetValue(str(self.ossspeed)) + pass + + def OnsampleTypeChoice(self, event): + sel = self.sampleTypeChoice.GetSelection() + #print "The selection is: " + str(sel) + if self.sampleTypeChoice.GetSelection()==1: + self.channels = 1 + else: + self.channels = 2 + + def OnExitBtn(self,event): + if self.CORBA_being_used: + self.PortHandle.disconnectPort("thisismyconnectionid_speaker") + self.connected_state = False + while (time.time() - self.my_local_speaker.end_time) < 1.0: + #print (time.time() - my_local_speaker.end_time) + time.sleep(1) + #sys.exit(0) + self.Close() + else: + self.Close() + + def OnSoundBtn(self,event): + if self.sound_state: + self.SoundBitmap = wx.Bitmap("/sdr/sca/tools/speaker/audio-off.xpm", wx.BITMAP_TYPE_XPM) + self.SoundBtn = wx.BitmapButton(id=-1, name='initBtn', parent=self.panel, pos=wx.Point(self.XLEFT, self.YTOP-40), + size=wx.Size(55, 55), style=0, bitmap=self.SoundBitmap) + self.SoundBtn.Bind(wx.EVT_BUTTON, self.OnSoundBtn, id=-1) + self.sound_state = False + else: + self.SoundBitmap = wx.Bitmap("/sdr/sca/tools/speaker/audio-on.xpm", wx.BITMAP_TYPE_XPM) + self.SoundBtn = wx.BitmapButton(id=-1, name='initBtn', parent=self.panel, pos=wx.Point(self.XLEFT, self.YTOP-40), + size=wx.Size(55, 55), style=0, bitmap=self.SoundBitmap) + self.SoundBtn.Bind(wx.EVT_BUTTON, self.OnSoundBtn, id=-1) + self.sound_state = True + +def create(parent, namespace, interface, ns_name, port_name): + return SpeakerFrame(parent, namespace, interface, ns_name, port_name) + +if __name__=="__main__": + if not (len(sys.argv)==5): + print "usage: plot.py " + sys.exit(1) + + wx.InitAllImageHandlers() + application = wx.App(0) + application.main = create(None, "standardInterfaces", "complexShort", [sys.argv[1], sys.argv[2], sys.argv[3]], sys.argv[4]) + application.main.Show() + application.SetTopWindow(application.main) + application.MainLoop() Index: /alf_plugins/speaker/trunk/speaker/toolconfig.xml =================================================================== --- /alf_plugins/speaker/trunk/speaker/toolconfig.xml (revision 2718) +++ /alf_plugins/speaker/trunk/speaker/toolconfig.xml (revision 2718) @@ -0,0 +1,12 @@ + + + + Speaker + speaker.py + speaker + speaker + + + + + Index: /alf_plugins/speaker/trunk/speaker/configure.ac =================================================================== --- /alf_plugins/speaker/trunk/speaker/configure.ac (revision 3006) +++ /alf_plugins/speaker/trunk/speaker/configure.ac (revision 3006) @@ -0,0 +1,12 @@ +AC_INIT(speaker, 0.5.0) +AM_INIT_AUTOMAKE + +AC_PREFIX_DEFAULT("/sdr") + +AC_PROG_INSTALL +INSTALL_DATA="/usr/bin/install -c -m 755" +AC_SUBST(INSTALL_DATA) + +AC_CONFIG_FILES(Makefile) + +AC_OUTPUT Index: /alf_plugins/speaker/trunk/speaker/Makefile.am =================================================================== --- /alf_plugins/speaker/trunk/speaker/Makefile.am (revision 2718) +++ /alf_plugins/speaker/trunk/speaker/Makefile.am (revision 2718) @@ -0,0 +1,5 @@ + +ossieName = speaker + +thistooldir = $(prefix)/tools/$(ossieName) +dist_thistool_DATA = speaker.py audio-off.xpm audio-on.xpm toolconfig.xml __init__.py Index: /alf_plugins/speaker/trunk/speaker/audio-off.xpm =================================================================== --- /alf_plugins/speaker/trunk/speaker/audio-off.xpm (revision 2718) +++ /alf_plugins/speaker/trunk/speaker/audio-off.xpm (revision 2718) @@ -0,0 +1,225 @@ +/* XPM */ +static char *dummy[]={ +"48 50 172 2", +".# c #000000", +".B c #060606", +"aC c #070707", +".c c #0a0a0a", +".i c #0f0f0f", +"aN c #111111", +".b c #131313", +"aq c #161616", +".m c #1c1c1c", +".M c #1d1d1d", +".a c #202020", +"aM c #252525", +".n c #2b2b2b", +".t c #2e2e2e", +".C c #2f2f2f", +".W c #333333", +".s c #353535", +"#e c #373737", +".d c #383838", +"aJ c #3d3d3d", +".h c #3e3e3e", +"aO c #4c4c4c", +".g c #4d4d4d", +".y c #4e4e4e", +".I c #4f4f4f", +".S c #505050", +".z c #515151", +".6 c #525252", +".J c #545454", +".A c #555555", +".r c #565656", +".R c #575757", +".K c #585858", +"aB c #595959", +".T c #5a5a5a", +".2 c #5b5b5b", +".L c #5c5c5c", +"#i c #5d5d5d", +"aD c #5e5e5e", +".U c #5f5f5f", +".3 c #616161", +"aI c #626262", +".V c #636363", +".4 c #666666", +"#b c #676767", +".f c #686868", +"aG c #696969", +".5 c #6a6a6a", +"aA c #6b6b6b", +"#c c #6c6c6c", +"#6 c #707070", +"#d c #717171", +"#m c #727272", +"av c #737373", +"#Q c #747474", +".X c #757575", +"aL c #767676", +"#n c #777777", +"#x c #787878", +"aK c #797979", +"aP c #7b7b7b", +"#o c #7c7c7c", +"#l c #7d7d7d", +"#y c #7e7e7e", +"aH c #7f7f7f", +"az c #808080", +"am c #818181", +"ak c #828282", +"#J c #838383", +"#z c #848484", +"ar c #858585", +"#K c #868686", +"an c #878787", +"a. c #888888", +".H c #898989", +"ad c #8b8b8b", +"#L c #8d8d8d", +"#j c #8e8e8e", +"ax c #8f8f8f", +"aE c #909090", +"#G c #919191", +"ao c #939393", +"aw c #949494", +"#0 c #959595", +"#S c #969696", +"#T c #979797", +".l c #989898", +"ay c #999999", +"as c #9a9a9a", +"#h c #9b9b9b", +".j c #9c9c9c", +"at c #9d9d9d", +"ap c #9e9e9e", +"#1 c #9f9f9f", +"au c #a0a0a0", +"#k c #a1a1a1", +"#p c #a2a2a2", +"aF c #a3a3a3", +"ah c #a4a4a4", +"al c #a5a5a5", +"#9 c #a6a6a6", +"#7 c #a7a7a7", +"a# c #a8a8a8", +".e c #a9a9a9", +"ai c #aaaaaa", +".7 c #ababab", +"ag c #acacac", +".x c #adadad", +"aa c #afafaf", +"#2 c #b0b0b0", +"ab c #b2b2b2", +"#3 c #b3b3b3", +"ac c #b5b5b5", +"#4 c #b7b7b7", +"#U c #b8b8b8", +"aj c #b9b9b9", +"#w c #bababa", +"#V c #bbbbbb", +"#5 c #bdbdbd", +"#W c #bfbfbf", +"#M c #c0c0c0", +"af c #c1c1c1", +"#X c #c2c2c2", +"#N c #c3c3c3", +"#I c #c5c5c5", +"#O c #c6c6c6", +".N c #c7c7c7", +"#Y c #c8c8c8", +"#a c #c9c9c9", +"#v c #cacaca", +"#B c #cbcbcb", +"#A c #cdcdcd", +"#C c #cecece", +"#P c #d0d0d0", +"#D c #d2d2d2", +"#q c #d3d3d3", +"#f c #d4d4d4", +"#E c #d5d5d5", +"#r c #d6d6d6", +".o c #d7d7d7", +"#F c #d8d8d8", +"#s c #d9d9d9", +"#g c #dbdbdb", +"ae c #dcdcdc", +"#t c #dddddd", +".8 c #dedede", +"#8 c #dfdfdf", +"#u c #e0e0e0", +".u c #e1e1e1", +".k c #e3e3e3", +".q c #e4e4e4", +".p c #e5e5e5", +".9 c #e6e6e6", +"#H c #e7e7e7", +".w c #e8e8e8", +"#. c #e9e9e9", +"#Z c #eaeaea", +"#R c #ebebeb", +".v c #ececec", +".D c #ededed", +".Y c #eeeeee", +"## c #f0f0f0", +".Z c #f1f1f1", +".G c #f2f2f2", +".0 c #f4f4f4", +".F c #f6f6f6", +".1 c #f7f7f7", +".O c #f8f8f8", +".E c #fafafa", +".P c #fbfbfb", +".Q c #fcfcfc", +"Qt c #ffffff", +"QtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQt", +"QtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQt", +"QtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQt", +"QtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQt", +"QtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQt", +"QtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQt", +"QtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQt", +"QtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQt", +"QtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQt", +"QtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQt", +"QtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQt", +"QtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQt", +"QtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQt.#.a.b.cQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQt", +"QtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQt.#.d.e.f.g.h.#QtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQt", +"QtQtQtQtQtQtQtQtQtQtQtQtQtQtQt.i.j.k.l.g.g.g.mQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQt", +"QtQtQtQtQtQtQtQtQtQtQtQtQtQt.n.o.p.q.r.g.g.g.sQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQt", +"QtQtQtQtQtQtQtQtQtQtQtQtQt.t.u.v.w.x.g.g.y.z.A.BQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQt", +"QtQtQtQtQtQtQtQtQtQtQtQt.C.D.E.F.G.H.g.I.J.K.L.MQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQt", +"QtQtQtQtQtQtQtQtQtQtQt.#.N.O.P.Q.Q.R.S.A.T.U.V.WQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQt", +"QtQtQtQtQtQtQtQt.#.#.#.X.Y.Z.0.1.q.S.r.2.3.4.5.6.#QtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQt", +"QtQtQtQtQtQtQt.#.g.e.7.8.9#..D###a.A.2.3#b#c#d.U.#QtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQt", +"QtQtQtQtQtQtQt#e#f#f#f#g.8.u.p.w#h#i#j#k#l#m#n#o.#QtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQt", +"QtQtQtQtQtQt.##p.v.v#g#q#r#s#t#u#h.H#g#v#w#x#y#z.#QtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQt", +"QtQtQtQtQtQt.##u#u#u#A#B#C#D#E#F#G#h#H#I#I#J#K#L.#QtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQt", +"QtQtQtQtQtQt.##q#q#q#M#N#O#v#A#P#Q.x#R#I#I#S#j#T.#QtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQt", +"QtQtQtQtQtQt.##I#I#I#U#V#W#X#I#Y#m.x#Z#I#I#h#0#1.#QtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQt", +"QtQtQtQtQtQt.##U#U#U#2#3#4#w#5#M#6#7#8#I#I.j.j#9.#QtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQt", +"QtQtQtQtQtQt.#a.#7#7a#.7aaabac#Uad#0ae#Iaf#T#pag.#QtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQt", +"QtQtQtQtQtQtQt.d#0#0.jah#7ai.x#2a.#naj#V.7#h#7ab.#QtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQt", +"QtQtQtQtQtQtQt.#.6ak.H.j#1#pala#am.X#lanaoapaiac.#QtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQt", +"QtQtQtQtQtQtQtQt.#aq.Mar#Sasatau#jav#ya.awauaga..#QtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQt", +"QtQtQtQtQtQtQtQtQtQtQt.C#Kaxayay#S#c#ya.awauag#lQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQt", +"QtQtQtQtQtQtQtQtQtQtQt.#.Razax.layaA#lanao#1aiaBQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQt", +"QtQtQtQtQtQtQtQtQtQtQtQtaCaDamax#h.X#oar#G.ja#.nQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQt", +"QtQtQtQtQtQtQtQtQtQtQtQtQtaC.UakaE#J#Qak#L.laF.#QtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQt", +"QtQtQtQtQtQtQtQtQtQtQtQtQtQtaCaB#J#GaGaH.HawaI.#QtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQt", +"QtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtaJ#oaKaL#J#jaMQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQt", +"QtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtaNaO#baP.L.#QtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQt", +"QtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQt.#aN.#QtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQt", +"QtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQt", +"QtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQt", +"QtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQt", +"QtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQt", +"QtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQt", +"QtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQt", +"QtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQt", +"QtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQt", +"QtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQt", +"QtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQt", +"QtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQt"}; Index: /alf_plugins/speaker/trunk/speaker/reconf =================================================================== --- /alf_plugins/speaker/trunk/speaker/reconf (revision 2722) +++ /alf_plugins/speaker/trunk/speaker/reconf (revision 2722) @@ -0,0 +1,6 @@ +#!/bin/sh + +rm -f config.cache +aclocal -I aclocal.d +autoconf +automake --foreign --add-missing Index: /alf_plugins/speaker/trunk/speaker/audio-on.xpm =================================================================== --- /alf_plugins/speaker/trunk/speaker/audio-on.xpm (revision 2718) +++ /alf_plugins/speaker/trunk/speaker/audio-on.xpm (revision 2718) @@ -0,0 +1,227 @@ +/* XPM */ +static char *dummy[]={ +"48 50 174 2", +".e c None", +".a c #000000", +".# c #01326e", +".D c #060606", +"aE c #070707", +".d c #0a0a0a", +".k c #0f0f0f", +"aP c #111111", +".c c #131313", +"as c #161616", +".o c #1c1c1c", +".O c #1d1d1d", +".b c #202020", +"aO c #252525", +".p c #2b2b2b", +".v c #2e2e2e", +".E c #2f2f2f", +".Y c #333333", +".u c #353535", +"#g c #373737", +".f c #383838", +"aL c #3d3d3d", +".j c #3e3e3e", +"aQ c #4c4c4c", +".i c #4d4d4d", +".A c #4e4e4e", +".K c #4f4f4f", +".U c #505050", +".B c #515151", +".8 c #525252", +".L c #545454", +".C c #555555", +".t c #565656", +".T c #575757", +".M c #585858", +"aD c #595959", +".V c #5a5a5a", +".4 c #5b5b5b", +".N c #5c5c5c", +"#k c #5d5d5d", +"aF c #5e5e5e", +".W c #5f5f5f", +".5 c #616161", +"aK c #626262", +".X c #636363", +".6 c #666666", +"#d c #676767", +".h c #686868", +"aI c #696969", +".7 c #6a6a6a", +"aC c #6b6b6b", +"#e c #6c6c6c", +"#8 c #707070", +"#f c #717171", +"#o c #727272", +"ax c #737373", +"#S c #747474", +".Z c #757575", +"aN c #767676", +"#p c #777777", +"#z c #787878", +"aM c #797979", +"aR c #7b7b7b", +"#q c #7c7c7c", +"#n c #7d7d7d", +"#A c #7e7e7e", +"aJ c #7f7f7f", +"aB c #808080", +"ao c #818181", +"am c #828282", +"#L c #838383", +"#B c #848484", +"at c #858585", +"#M c #868686", +"ap c #878787", +"aa c #888888", +".J c #898989", +"af c #8b8b8b", +"#N c #8d8d8d", +"#l c #8e8e8e", +"az c #8f8f8f", +"aG c #909090", +"#I c #919191", +"aq c #939393", +"ay c #949494", +"#2 c #959595", +"#U c #969696", +"#V c #979797", +".n c #989898", +"aA c #999999", +"au c #9a9a9a", +"#j c #9b9b9b", +".l c #9c9c9c", +"av c #9d9d9d", +"ar c #9e9e9e", +"#3 c #9f9f9f", +"aw c #a0a0a0", +"#m c #a1a1a1", +"#r c #a2a2a2", +"aH c #a3a3a3", +"aj c #a4a4a4", +"an c #a5a5a5", +"a# c #a6a6a6", +"#9 c #a7a7a7", +"ab c #a8a8a8", +".g c #a9a9a9", +"ak c #aaaaaa", +".9 c #ababab", +"ai c #acacac", +".z c #adadad", +"ac c #afafaf", +"#4 c #b0b0b0", +"ad c #b2b2b2", +"#5 c #b3b3b3", +"ae c #b5b5b5", +"#6 c #b7b7b7", +"#W c #b8b8b8", +"al c #b9b9b9", +"#y c #bababa", +"#X c #bbbbbb", +"#7 c #bdbdbd", +"#Y c #bfbfbf", +"#O c #c0c0c0", +"ah c #c1c1c1", +"#Z c #c2c2c2", +"#P c #c3c3c3", +"#K c #c5c5c5", +"#Q c #c6c6c6", +".P c #c7c7c7", +"#0 c #c8c8c8", +"#c c #c9c9c9", +"#x c #cacaca", +"#D c #cbcbcb", +"#C c #cdcdcd", +"#E c #cecece", +"#R c #d0d0d0", +"#F c #d2d2d2", +"#s c #d3d3d3", +"#h c #d4d4d4", +"#G c #d5d5d5", +"#t c #d6d6d6", +".q c #d7d7d7", +"#H c #d8d8d8", +"#u c #d9d9d9", +"#i c #dbdbdb", +"ag c #dcdcdc", +"#v c #dddddd", +"#. c #dedede", +"a. c #dfdfdf", +"#w c #e0e0e0", +".w c #e1e1e1", +".m c #e3e3e3", +".s c #e4e4e4", +".r c #e5e5e5", +"## c #e6e6e6", +"#J c #e7e7e7", +".y c #e8e8e8", +"#a c #e9e9e9", +"#1 c #eaeaea", +"#T c #ebebeb", +".x c #ececec", +".F c #ededed", +".0 c #eeeeee", +"#b c #f0f0f0", +".1 c #f1f1f1", +".I c #f2f2f2", +".2 c #f4f4f4", +".H c #f6f6f6", +".3 c #f7f7f7", +".Q c #f8f8f8", +".G c #fafafa", +".R c #fbfbfb", +".S c #fcfcfc", +"Qt c #ffffff", +"QtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQt", +"QtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQt", +"QtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQt", +"QtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQt", +"QtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQt", +"QtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQt", +"QtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQt", +"QtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQt", +"QtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQt", +"QtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQt.#.#.#QtQtQtQtQtQtQtQt", +"QtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQt.#.#.#QtQtQtQtQtQtQt", +"QtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQt.#.#QtQtQtQtQtQtQt", +"QtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQt.a.b.c.d.eQtQtQtQtQtQtQtQtQtQt.#QtQtQtQtQtQt.#.#QtQtQtQtQtQt", +"QtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQt.a.f.g.h.i.j.aQtQtQtQtQtQtQtQtQtQt.#.#QtQtQtQtQt.#.#QtQtQtQtQtQt", +"QtQtQtQtQtQtQtQtQtQtQtQtQtQt.e.k.l.m.n.i.i.i.oQtQtQtQtQtQtQtQtQtQtQt.#.#QtQtQtQtQt.#.#QtQtQtQtQt", +"QtQtQtQtQtQtQtQtQtQtQtQtQtQt.p.q.r.s.t.i.i.i.u.aQtQtQtQtQtQtQtQtQtQtQt.#.#QtQtQtQt.#.#QtQtQtQtQt", +"QtQtQtQtQtQtQtQtQtQtQtQt.e.v.w.x.y.z.i.i.A.B.C.DQtQtQtQtQtQtQtQtQtQtQtQt.#.#QtQtQt.#.#.#QtQtQtQt", +"QtQtQtQtQtQtQtQtQtQtQtQt.E.F.G.H.I.J.i.K.L.M.N.OQtQtQtQtQtQtQtQtQtQtQtQtQt.#QtQtQtQt.#.#QtQtQtQt", +"QtQtQtQtQtQtQtQtQtQtQt.a.P.Q.R.S.S.T.U.C.V.W.X.YQtQtQtQtQtQtQt.#.#QtQtQtQt.#.#QtQtQt.#.#QtQtQtQt", +"QtQtQtQtQtQtQt.e.a.a.a.Z.0.1.2.3.s.U.t.4.5.6.7.8.aQtQtQtQtQtQtQt.#.#QtQtQt.#.#QtQtQt.#.#QtQtQtQt", +"QtQtQtQtQtQtQt.a.i.g.9#.###a.F#b#c.C.4.5#d#e#f.W.aQtQtQtQtQtQtQtQt.#QtQtQtQt.#QtQtQt.#.#QtQtQtQt", +"QtQtQtQtQtQtQt#g#h#h#h#i#..w.r.y#j#k#l#m#n#o#p#q.aQtQtQtQtQtQtQtQtQt.#QtQtQt.#.#QtQtQt.#.#QtQtQt", +"QtQtQtQtQtQt.a#r.x.x#i#s#t#u#v#w#j.J#i#x#y#z#A#B.aQtQtQtQtQtQtQtQtQt.#QtQtQt.#.#QtQtQt.#.#QtQtQt", +"QtQtQtQtQtQt.a#w#w#w#C#D#E#F#G#H#I#j#J#K#K#L#M#N.aQtQtQtQtQtQtQtQtQt.#QtQtQt.#.#QtQtQt.#.#QtQtQt", +"QtQtQtQtQtQt.a#s#s#s#O#P#Q#x#C#R#S.z#T#K#K#U#l#V.aQtQtQtQtQtQtQtQtQt.#QtQtQtQt.#QtQtQt.#.#QtQtQt", +"QtQtQtQtQtQt.a#K#K#K#W#X#Y#Z#K#0#o.z#1#K#K#j#2#3.aQtQtQtQtQtQtQtQtQt.#QtQtQtQt.#QtQtQt.#.#QtQtQt", +"QtQtQtQtQtQt.a#W#W#W#4#5#6#y#7#O#8#9a.#K#K.l.la#.aQtQtQtQtQtQtQtQtQt.#QtQtQt.#.#QtQtQt.#.#QtQtQt", +"QtQtQtQtQtQt.aaa#9#9ab.9acadae#Waf#2ag#Kah#V#rai.aQtQtQtQtQtQtQtQtQt.#QtQtQt.#.#QtQtQt.#.#QtQtQt", +"QtQtQtQtQtQtQt.f#2#2.laj#9ak.z#4aa#pal#X.9#j#9ad.aQtQtQtQtQtQtQtQtQt.#QtQtQt.#.#QtQtQt.#QtQtQtQt", +"QtQtQtQtQtQtQt.a.8am.J.l#3#ranabao.Z#napaqarakae.aQtQtQtQtQtQtQtQt.#QtQtQtQt.#QtQtQt.#.#QtQtQtQt", +"QtQtQtQtQtQtQtQt.aas.Oat#Uauavaw#lax#Aaaayawaiaa.aQtQtQtQtQtQtQtQt.#QtQtQtQt.#QtQtQt.#.#QtQtQtQt", +"QtQtQtQtQtQtQtQtQtQtQt.E#MazaAaA#U#e#Aaaayawai#nQtQtQtQtQtQtQtQt.#QtQtQtQt.#.#QtQtQt.#.#QtQtQtQt", +"QtQtQtQtQtQtQtQtQtQtQt.a.TaBaz.naAaC#napaq#3akaDQtQtQtQtQtQtQt.#QtQtQtQtQt.#QtQtQtQt.#.#QtQtQtQt", +"QtQtQtQtQtQtQtQtQtQtQtQtaEaFaoaz#j.Z#qat#I.lab.pQtQtQtQtQtQtQtQtQtQtQtQt.#.#QtQtQt.#.#QtQtQtQtQt", +"QtQtQtQtQtQtQtQtQtQtQtQtQtaE.WamaG#L#Sam#N.naH.aQtQtQtQtQtQtQtQtQtQtQt.#.#QtQtQtQt.#.#QtQtQtQtQt", +"QtQtQtQtQtQtQtQtQtQtQtQtQtQtaEaD#L#IaIaJ.JayaK.aQtQtQtQtQtQtQtQtQtQt.#.#.#QtQtQt.#.#.#QtQtQtQtQt", +"QtQtQtQtQtQtQtQtQtQtQtQtQtQtQt.aaL#qaMaN#L#laOQtQtQtQtQtQtQtQtQtQt.#.#.#QtQtQtQt.#.#QtQtQtQtQtQt", +"QtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtaPaQ#daR.N.aQtQtQtQtQtQtQtQtQtQt.#QtQtQtQtQt.#.#.#QtQtQtQtQtQt", +"QtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQt.aaP.aQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQt.#.#.#QtQtQtQtQtQtQt", +"QtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQt.#.#QtQtQtQtQtQtQtQt", +"QtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQt.#.#QtQtQtQtQtQtQtQtQt", +"QtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQt", +"QtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQt", +"QtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQt", +"QtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQt", +"QtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQt", +"QtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQt", +"QtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQt", +"QtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQt", +"QtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQt"};