[Hdrflow-svn] SF.net SVN: hdrflow: [238] trunk

[<gl...@us...>]

Revision: 238
          http://hdrflow.svn.sourceforge.net/hdrflow/?rev=238&view=rev
Author:   glslang
Date:     2007-08-08 14:44:20 -0700 (Wed, 08 Aug 2007)

Log Message:
-----------
+ build updates

Modified Paths:
--------------
    trunk/lib/openlibraries/configure.ac
    trunk/lib/openlibraries/m4/umbrella_framework.m4
    trunk/lib/openlibraries/src/umbrella_framework/Makefile.am
    trunk/unity.sh

Modified: trunk/lib/openlibraries/configure.ac
===================================================================
--- trunk/lib/openlibraries/configure.ac	2007-08-08 20:13:45 UTC (rev 237)
+++ trunk/lib/openlibraries/configure.ac	2007-08-08 21:44:20 UTC (rev 238)
@@ -132,6 +132,9 @@
 dnl OFX support
 AC_CHECK_OFX( )
 
+dnl Umbrella Framework
+AC_CHECK_UMBRELLA_FRAMEWORK()
+
 dnl Boost support
 AC_LANG([C++])
 AC_CHECK_BOOST( )

Modified: trunk/lib/openlibraries/m4/umbrella_framework.m4
===================================================================
--- trunk/lib/openlibraries/m4/umbrella_framework.m4	2007-08-08 20:13:45 UTC (rev 237)
+++ trunk/lib/openlibraries/m4/umbrella_framework.m4	2007-08-08 21:44:20 UTC (rev 238)
@@ -10,6 +10,7 @@
 
 	UMBRELLA_FLAGS=""
 
+	AC_MSG_CHECKING(if building an umbrella framework)
 	if test x$enableumbrellaframework = "xyes" ; then
 		case $host in
 			*-apple-darwin*)

Modified: trunk/lib/openlibraries/src/umbrella_framework/Makefile.am
===================================================================
--- trunk/lib/openlibraries/src/umbrella_framework/Makefile.am	2007-08-08 20:13:45 UTC (rev 237)
+++ trunk/lib/openlibraries/src/umbrella_framework/Makefile.am	2007-08-08 21:44:20 UTC (rev 238)
@@ -5,6 +5,8 @@
 
 libdir = $(OPENMEDIALIB_LIBPATH)
 
+if HAVE_UMBRELLAFRAMEWORK
+
 lib_LTLIBRARIES = libumbrella_framework.la
 
 libumbrella_framework_la_SOURCES = 	\
@@ -33,4 +35,7 @@
 
 library_include_HEADERS = 	\
 	openlibraries.hpp
+	
+endif
 
+

Modified: trunk/unity.sh
===================================================================
--- trunk/unity.sh	2007-08-08 20:13:45 UTC (rev 237)
+++ trunk/unity.sh	2007-08-08 21:44:20 UTC (rev 238)
@@ -96,28 +96,32 @@
 		header_path_second=`cut -d '/' -f 6 header_temp.$$`
 		header_path="$header_path_first/$header_path_second"
 	
-		cp $1/$i current_header.$$
+		if [ -r $1/$i ]
+		then 
+			cp $1/$i current_header.$$
 	
-		deplist="openpluginlib/pl openimagelib/il openmedialib/ml"
-		for j in $deplist
-		do	case $j in
-			openpluginlib* ) 
-				sed -e "s|$j|HDRFlowPlugin|g" -i '' current_header.$$ > $2.framework/Versions/Current/Headers/$i
-				;;
-			openimagelib* ) 
-				sed -e "s|$j|HDRFlowImage|g" -i '' current_header.$$ > $2.framework/Versions/Current/Headers/$i
-				;;
-			openmedialib* ) 
-				sed -e "s|$j|HDRFlowMedia|g" -i '' current_header.$$ > $2.framework/Versions/Current/Headers/$i
-				;;
-			esac
-		done
+			deplist="openpluginlib/pl openimagelib/il openmedialib/ml"
+			for j in $deplist
+			do	case $j in
+				openpluginlib* ) 
+					sed -e "s|$j|HDRFlowPlugin|g" -i '' current_header.$$ > $2.framework/Versions/Current/Headers/$i
+					;;
+				openimagelib* ) 
+					sed -e "s|$j|HDRFlowImage|g" -i '' current_header.$$ > $2.framework/Versions/Current/Headers/$i
+					;;
+				openmedialib* ) 
+					sed -e "s|$j|HDRFlowMedia|g" -i '' current_header.$$ > $2.framework/Versions/Current/Headers/$i
+					;;
+				esac
+			done
 
-		sed -e "s|$header_path|$2|g" -e "s|GL/glew.h|HDRFlowPlugin/glew.h|g" -e "s|boost/|HDRFlowPlugin/boost/|" current_header.$$ > $2.framework/Versions/Current/Headers/$i
-	done
-	
-	rm header_temp.$$
-	rm current_header.$$
+			sed -e "s|$header_path|$2|g" -e "s|GL/glew.h|HDRFlowPlugin/glew.h|g" -e "s|boost/|HDRFlowPlugin/boost/|" current_header.$$ > $2.framework/Versions/Current/Headers/$i
+		
+			rm current_header.$$
+		fi
+		
+		rm header_temp.$$
+	done	
 }
 
 make_framework_libs( )


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.