[Hdrflow-svn] SF.net SVN: hdrflow: [293] trunk/lib/openlibraries

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

Revision: 293
          http://hdrflow.svn.sourceforge.net/hdrflow/?rev=293&view=rev
Author:   glslang
Date:     2007-09-01 14:50:34 -0700 (Sat, 01 Sep 2007)

Log Message:
-----------
+build fixes

Modified Paths:
--------------
    trunk/lib/openlibraries/configure.ac
    trunk/lib/openlibraries/m4/openimagelib.m4
    trunk/lib/openlibraries/src/openimagelib/plugins/tiff/Makefile.am

Added Paths:
-----------
    trunk/lib/openlibraries/m4/tiff.m4

Modified: trunk/lib/openlibraries/configure.ac
===================================================================
--- trunk/lib/openlibraries/configure.ac	2007-09-01 20:57:47 UTC (rev 292)
+++ trunk/lib/openlibraries/configure.ac	2007-09-01 21:50:34 UTC (rev 293)
@@ -155,6 +155,7 @@
 AC_SUBST(XML2_LIBS)
 
 AC_CHECK_OPENIMAGELIB( )
+AC_CHECK_TIFF( )
 
 AC_CHECK_QUICKTIME( )
 

Modified: trunk/lib/openlibraries/m4/openimagelib.m4
===================================================================
--- trunk/lib/openlibraries/m4/openimagelib.m4	2007-09-01 20:57:47 UTC (rev 292)
+++ trunk/lib/openlibraries/m4/openimagelib.m4	2007-09-01 21:50:34 UTC (rev 293)
@@ -36,13 +36,6 @@
 			 		 AC_MSG_RESULT([*** JPEG support is not available ***]))
 		AM_CONDITIONAL(HAVE_LIBJPEG, test x"$have_libjpeg" = "xyes")
 		AC_SUBST(JPEG_LIBS)
-
-		dnl libtiff support
-		AC_CHECK_LIB(tiff, TIFFOpen,
-			 		 have_libtiff=yes TIFF_LIBS="-ltiff",
-			 		 AC_MSG_RESULT([*** TIFF support is not available ***]))
-		AM_CONDITIONAL(HAVE_LIBTIFF, test x"$have_libtiff" = "xyes")
-		AC_SUBST(TIFF_LIBS)
 	fi
 
 	AM_CONDITIONAL(HAVE_OPENIMAGELIB, test x"$ac_use_openimagelib" = "xyes")

Added: trunk/lib/openlibraries/m4/tiff.m4
===================================================================
--- trunk/lib/openlibraries/m4/tiff.m4	                        (rev 0)
+++ trunk/lib/openlibraries/m4/tiff.m4	2007-09-01 21:50:34 UTC (rev 293)
@@ -0,0 +1,47 @@
+
+#
+#
+#
+
+AC_DEFUN([AC_CHECK_TIFF],[
+	AC_ARG_WITH(tiffprefix,	AC_HELP_STRING([--with-tiffprefix], [TIFF installation prefix directory]),,
+				with_tiffprefix="")
+
+	TIFF_PREFIX="$with_tiffprefix"
+	TIFF_INCLUDE_PATH=""
+	TIFF_LIB_PATH=""
+	TIFF_LIBS=""
+
+	AS_IF([test "x$with_tiffprefix" != "x" ],
+		[ AC_MSG_WARN([*** TIFF prefix is user defined. Current value is $with_tiffprefix. ***])
+		  TIFF_INCLUDE="$with_tiffprefix/include/"
+		  TIFF_INCLUDE_PATH="-I$TIFF_INCLUDE"
+		  TIFF_LIB_PATH="-L$with_tiffprefix/$OL_LIBNAME"],
+		  AC_MSG_RESULT([*** TIFF prefix is not defined. Will use system defaults. ***]))
+						  	     
+	save_LDFLAGS="$LDFLAGS"
+	LDFLAGS="$TIFF_LIB_PATH $save_LDFLAGS"
+
+	AC_CHECK_LIB(TIFF, TIFFOpen,
+		[AC_CHECK_HEADER(${TIFF_INCLUDE}/tiffio.h,
+		[ac_have_tiff="yes" TIFF_LIBS="-ltiff" AC_DEFINE(HAVE_TIFF_H, 1,[Define this if you have TIFF support])],
+		[AC_MSG_ERROR([*** TIFF support is not available. Please install libtiff to proceed. ***])])]
+
+	LDFLAGS="$save_LDFLAGS", [AC_MSG_ERROR([*** TIFF support is not available. Please install libtiff to proceed. ***])],[])
+				    
+	if test x$ac_have_tiff = "xyes"; then
+		ac_use_tiff=yes
+	fi
+
+	AC_SUBST(TIFF_PREFIX)
+	AC_SUBST(TIFF_INCLUDE_PATH)
+	AC_SUBST(TIFF_LIB_PATH)
+	AC_SUBST(TIFF_LIBS)
+	AM_CONDITIONAL(HAVE_LIBTIFF, test x"$ac_use_tiff" = "xyes")
+
+	if test x$ac_use_tiff = "xyes"; then
+		ifelse([$1], , :, [$1])
+	else
+		ifelse([$2], , :, [$2])
+	fi
+])

Modified: trunk/lib/openlibraries/src/openimagelib/plugins/tiff/Makefile.am
===================================================================
--- trunk/lib/openlibraries/src/openimagelib/plugins/tiff/Makefile.am	2007-09-01 20:57:47 UTC (rev 292)
+++ trunk/lib/openlibraries/src/openimagelib/plugins/tiff/Makefile.am	2007-09-01 21:50:34 UTC (rev 293)
@@ -15,6 +15,7 @@
 libopenimagelib_tiff_la_CXXFLAGS = 	\
 	$(OLIB_CXXFLAGS) 		\
 	$(BOOST_INCLUDE_PATH)		\
+	$(TIFF_INCLUDE_PATH)	\
 	-DIL_EXPORTS
 
 libopenimagelib_tiff_la_LIBADD = 	\


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