what it took to get it built with ACE on MacOS X

Patch:    ivtools-030718-johnston-080
For:      ivtools-1.0.7
Author:   [email protected]
Subject:  what it took to get it built with ACE on MacOS X
Requires:

This is an intermediate patch to ivtools-1.0.7.  To apply, cd to the
top-level directory of the ivtools source tree (the directory with src
and config subdirs), and apply like this:

	patch -p0 <ThisFile

Summary of Changes:

- what it took to get it built with ACE on MacOS X (though it doesn't
work yet).

Index: Attribute/paramlist.c
diff -c Attribute/paramlist.c:1.2 Attribute/paramlist.c:1.3
*** Attribute/paramlist.c:1.2	Mon Jul  7 12:23:57 2003
--- src/Attribute/paramlist.c	Fri Jul 18 12:15:22 2003
***************
*** 38,44 ****
--- 38,46 ----
   #include <iostream.h>
   #include <stdio.h>
   #include <string.h>
+ #ifndef __APPLE__
   #include <strstream.h>
+ #endif

 
/*****************************************************************************/

Index: ComTerp/comterpserv.h
diff -c ComTerp/comterpserv.h:1.1 ComTerp/comterpserv.h:1.2
*** ComTerp/comterpserv.h:1.1	Fri Sep 13 09:47:51 2002
--- src/ComTerp/comterpserv.h	Fri Jul 18 12:15:26 2003
***************
*** 33,38 ****
--- 33,42 ----
    * Server-oriented interpreter deals with strings
    */

+ #ifdef HAVE_ACE
+ #include <ace/config.h>
+ #endif
+
   #include <ComTerp/comterp.h>

   //: extended ComTerp that works with buffered IO.
Index: config_ivtools/rules.def
diff -c config_ivtools/rules.def:1.2 config_ivtools/rules.def:1.3
*** config_ivtools/rules.def:1.2	Tue Nov 26 15:29:31 2002
--- config/rules.def	Fri Jul 18 12:16:36 2003
***************
*** 714,720 ****
   Concat(lib,libname.so.rev): depobjs					@@\
   	@echo "building $@"						@@\
   	$(RM) $@~							@@\
! 	SharedLibraryCmd(ldobjs,-Wl\,-soname=Concat(lib\,libname.so.rev))@@\
   	$(RM) $@							@@\
   	$(MV) $@~ $@							@@\
   									@@\
--- 714,720 ----
   Concat(lib,libname.so.rev): depobjs					@@\
   	@echo "building $@"						@@\
   	$(RM) $@~							@@\
! 
	SharedLibraryCmd(ldobjs,/*-Wl\,-soname=Concat(lib\,libname.so.rev)*/)@@\
   	$(RM) $@							@@\
   	$(MV) $@~ $@							@@\
   									@@\
***************
*** 731,737 ****
   	@echo "building $@"						@@\
   	$(RM) $@~							@@\
   	$(RM) Concat(lib,libname.so)					@@\
! 	SharedLibraryCmd(ldobjs,-Wl\,-soname=Concat(lib\,libname.so.rev))@@\
   	$(RM) $@							@@\
   	$(MV) $@~ $@							@@\
   	$(LN) $@ Concat(lib,libname.so)					@@\
--- 731,737 ----
   	@echo "building $@"						@@\
   	$(RM) $@~							@@\
   	$(RM) Concat(lib,libname.so)					@@\
! 
	SharedLibraryCmdSun(ldobjs,/*-Wl\,-soname=Concat(lib\,libname.so.rev)*/) 
@@\
   	$(RM) $@							@@\
   	$(MV) $@~ $@							@@\
   	$(LN) $@ Concat(lib,libname.so)					@@\
Index: include_std/fstream.h
diff -c include_std/fstream.h:1.2 include_std/fstream.h:1.3
*** include_std/fstream.h:1.2	Sat Nov 16 09:02:32 2002
--- src/include/ivstd/fstream.h	Fri Jul 18 12:16:26 2003
***************
*** 4,10 ****
   #if __GNUC__>=3
   #define input ios_base::in
   #define output ios_base::out
! #if __GNUC__>3 || __GNUC__==3 && __GNUC_MINOR__>0 && !defined(__APPLE__)
   #include <ext/stdio_filebuf.h>
   #define fileptr_filebuf __gnu_cxx::stdio_filebuf<char>
   #else
--- 4,10 ----
   #if __GNUC__>=3
   #define input ios_base::in
   #define output ios_base::out
! #if __GNUC__>3 || __GNUC__==3 && __GNUC_MINOR__>0 /* && 
!defined(__APPLE__) */
   #include <ext/stdio_filebuf.h>
   #define fileptr_filebuf __gnu_cxx::stdio_filebuf<char>
   #else
Index: top_ivtools/configure
diff -c top_ivtools/configure:1.1 top_ivtools/configure:1.2
*** top_ivtools/configure:1.1	Fri Sep 13 09:47:27 2002
--- ./configure	Fri Jul 18 12:15:17 2003
***************
*** 644,659 ****
   	echo ""
   else
   	echo "Building with ACE support ACE=$ACE"
! 	if test -f $ACE_LIBS/libACE.a -o -f $ACE_LIBS/libACE.so ; then
   		echo "$ac_t""Found libACE.* in $ACE_LIBS " 1>&6
   	        ACE_ENABLED=1
   	else
! 	        if test -f $ACE/ace/libACE.a -o -f $ACE/ace/libACE.so ; then
   			echo "$ac_t""Found libACE.* in $ACE/ace " 1>&6
   		        ACE_ENABLED=1
   			ACE_LIBS=$ACE/ace
   	        else
! 			{ echo "configure: error: Can not find 
libACE.a or libACE.so in $ACE_LIBS ($ACE).
   			Use --with-ace-libs to specify location of 
ACE " 1>&2; exit 1; }
   	        fi

--- 644,659 ----
   	echo ""
   else
   	echo "Building with ACE support ACE=$ACE"
! 	if test -f $ACE_LIBS/libACE.a -o -f $ACE_LIBS/libACE.so -o -f 
$ACE_LIBS/libACE.dylib ; then
   		echo "$ac_t""Found libACE.* in $ACE_LIBS " 1>&6
   	        ACE_ENABLED=1
   	else
! 	        if test -f $ACE/ace/libACE.a -o -f $ACE/ace/libACE.so 
-o -f $ACE/ace/libACE.dylib ; then
   			echo "$ac_t""Found libACE.* in $ACE/ace " 1>&6
   		        ACE_ENABLED=1
   			ACE_LIBS=$ACE/ace
   	        else
! 			{ echo "configure: error: Can not find 
libACE.a or libACE.so or libACE.dylib in $ACE_LIBS ($ACE).
   			Use --with-ace-libs to specify location of 
ACE " 1>&2; exit 1; }
   	        fi

***************
*** 692,708 ****
   	echo ""
   else
   	echo "Building with clippoly support CLIPPOLY=$CLIPPOLY"
! 	if test -f $CLIPPOLY_LIBS/libclippoly.a -o -f 
$CLIPPOLY_LIBS/libclippoly.so ; then
   		echo "$ac_t""Found libclippoly.* in $CLIPPOLY_LIBS " 1>&6
   		CLIPPOLY_ENABLED=1
   	else
! 		if test -f $CLIPPOLY/libclippoly.a -o -f 
$CLIPPOLY/libclippoly.so ; then
   			echo "$ac_t""Found libclippoly.* in $CLIPPOLY " 1>&6
   			CLIPPOLY_ENABLED=1
   			CLIPPOLY_LIBS=$CLIPPOLY
   		else

! 	        { echo "configure: error: Can not find libclippoly.a 
or libclippoly.so in $CLIPPOLY ($CLIPPOLY_LIBS)
   Use --with-clippoly-libs to specify location of clippoly libraries" 
1>&2; exit 1; }
   		fi
   	fi
--- 692,708 ----
   	echo ""
   else
   	echo "Building with clippoly support CLIPPOLY=$CLIPPOLY"
! 	if test -f $CLIPPOLY_LIBS/libclippoly.a -o -f 
$CLIPPOLY_LIBS/libclippoly.so -o -f $CLIPPOLY_LIBS/libclippoly.dylib 
; then
   		echo "$ac_t""Found libclippoly.* in $CLIPPOLY_LIBS " 1>&6
   		CLIPPOLY_ENABLED=1
   	else
! 		if test -f $CLIPPOLY/libclippoly.a -o -f 
$CLIPPOLY/libclippoly.so -o -f $CLIPPOLY/libclippoly.dylib ; then
   			echo "$ac_t""Found libclippoly.* in $CLIPPOLY " 1>&6
   			CLIPPOLY_ENABLED=1
   			CLIPPOLY_LIBS=$CLIPPOLY
   		else

! 	        { echo "configure: error: Can not find libclippoly.a 
or libclippoly.so or libclippoly.dylib in $CLIPPOLY ($CLIPPOLY_LIBS)
   Use --with-clippoly-libs to specify location of clippoly libraries" 
1>&2; exit 1; }
   		fi
   	fi
Index: top_ivtools/configure.in
diff -c top_ivtools/configure.in:1.1 top_ivtools/configure.in:1.2
*** top_ivtools/configure.in:1.1	Fri Sep 13 09:47:28 2002
--- ./configure.in	Fri Jul 18 12:15:17 2003
***************
*** 49,64 ****
   	echo ""
   else
   	echo "Building with ACE support ACE=$ACE"
! 	if test -f $ACE_LIBS/libACE.a -o -f $ACE_LIBS/libACE.so ; then
   		AC_MSG_RESULT( Found libACE.* in $ACE_LIBS )
   	        ACE_ENABLED=1
   	else
! 	        if test -f $ACE/ace/libACE.a -o -f $ACE/ace/libACE.so ; then
   			AC_MSG_RESULT( Found libACE.* in $ACE/ace )
   		        ACE_ENABLED=1
   			ACE_LIBS=$ACE/ace
   	        else
! 			AC_MSG_ERROR( Can not find libACE.a or 
libACE.so in $ACE_LIBS ($ACE).
   			Use --with-ace-libs to specify location of ACE )
   	        fi

--- 49,64 ----
   	echo ""
   else
   	echo "Building with ACE support ACE=$ACE"
! 	if test -f $ACE_LIBS/libACE.a -o -f $ACE_LIBS/libACE.so -o -f 
$ACE_LIBS/libACE.dylib ; then
   		AC_MSG_RESULT( Found libACE.* in $ACE_LIBS )
   	        ACE_ENABLED=1
   	else
! 	        if test -f $ACE/ace/libACE.a -o -f $ACE/ace/libACE.so 
-o -f $ACE/ace/libACE.dylib ; then
   			AC_MSG_RESULT( Found libACE.* in $ACE/ace )
   		        ACE_ENABLED=1
   			ACE_LIBS=$ACE/ace
   	        else
! 			AC_MSG_ERROR( Can not find libACE.a or 
libACE.so or libACE.dylib in $ACE_LIBS ($ACE).
   			Use --with-ace-libs to specify location of ACE )
   	        fi

***************
*** 89,105 ****
   	echo ""
   else
   	echo "Building with clippoly support CLIPPOLY=$CLIPPOLY"
! 	if test -f $CLIPPOLY_LIBS/libclippoly.a -o -f 
$CLIPPOLY_LIBS/libclippoly.so ; then
   		AC_MSG_RESULT( Found libclippoly.* in $CLIPPOLY_LIBS )
   		CLIPPOLY_ENABLED=1
   	else
! 		if test -f $CLIPPOLY/libclippoly.a -o -f 
$CLIPPOLY/libclippoly.so ; then
   			AC_MSG_RESULT( Found libclippoly.* in $CLIPPOLY )
   			CLIPPOLY_ENABLED=1
   			CLIPPOLY_LIBS=$CLIPPOLY
   		else

! 	        AC_MSG_ERROR( Can not find libclippoly.a or 
libclippoly.so in $CLIPPOLY ($CLIPPOLY_LIBS)
   Use --with-clippoly-libs to specify location of clippoly libraries)
   		fi
   	fi
--- 89,105 ----
   	echo ""
   else
   	echo "Building with clippoly support CLIPPOLY=$CLIPPOLY"
! 	if test -f $CLIPPOLY_LIBS/libclippoly.a -o -f 
$CLIPPOLY_LIBS/libclippoly.so -o -f $CLIPPOLY_LIBS/libclippoly.dylib 
; then
   		AC_MSG_RESULT( Found libclippoly.* in $CLIPPOLY_LIBS )
   		CLIPPOLY_ENABLED=1
   	else
! 		if test -f $CLIPPOLY/libclippoly.a -o -f 
$CLIPPOLY/libclippoly.so -o -f $CLIPPOLY/libclippoly.dylib ; then
   			AC_MSG_RESULT( Found libclippoly.* in $CLIPPOLY )
   			CLIPPOLY_ENABLED=1
   			CLIPPOLY_LIBS=$CLIPPOLY
   		else

! 	        AC_MSG_ERROR( Can not find libclippoly.a or 
libclippoly.so or libclippoly.dylib in $CLIPPOLY ($CLIPPOLY_LIBS)
   Use --with-clippoly-libs to specify location of clippoly libraries)
   		fi
   	fi
*** /dev/null	 Fri Jul 18 12:16:40 PDT 2003
--- patches/ivtools-030718-johnston-075
*************** patches/ivtools-030718-johnston-075
*** 0 ****
--- 1 ----
+ ivtools-030718-johnston-075


-------------------------------------------------------
This SF.net email sponsored by: Enterprise Linux Forum Conference & Expo
The Event For Linux Datacenter Solutions & Strategies in The Enterprise 
Linux in the Boardroom; in the Front Office; & in the Server Room 
http://www.enterpriselinuxforum.com