[Xastir-checkins] CVS: xastir configure.ac,1.94,1.95

[Derrick J B. <sh...@us...>]

Update of /cvsroot/xastir/xastir
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7984

Modified Files:
	configure.ac 
Log Message:
update libgeotiff/libtiff/libproj configure tests such that 
1) libproj is checked for only once
2) libtiff is used if found when testing for libgeotiff

revised test from Tom Russo KM5VY and tested on MacOS X and Linux.



Index: configure.ac
===================================================================
RCS file: /cvsroot/xastir/xastir/configure.ac,v
retrieving revision 1.94
retrieving revision 1.95
diff -C2 -d -r1.94 -r1.95
*** configure.ac	16 Jul 2004 18:27:29 -0000	1.94
--- configure.ac	27 Aug 2004 01:07:03 -0000	1.95
***************
*** 234,251 ****
  
  
! # Check for libgeotiff and required libraries
! use_geotiff=no
! if test "${use_proj}" = "yes"; then
!   use_geotiff=yes
!   AC_ARG_WITH(geotiff,[  --without-geotiff       Disable geotiff features.],use_geotiff=$withval)
!   if test "${use_geotiff}" = "yes"; then
!     use_geotiff=no
!     AC_CHECK_LIB(tiff, TIFFClose, AC_CHECK_LIB(proj, pj_init, AC_CHECK_LIB(geotiff, GTIFNew, use_geotiff=yes
!     LIBS="$LIBS -ltiff -lgeotiff"
!     AC_DEFINE(HAVE_LIBGEOTIFF, , Define to 1 if you have the `geotiff' library (-lgeotiff). )
!     )))
!   fi
! fi
! 
  
  # Check for AX.25 library 
--- 234,254 ----
  
  
! #check for libtiff, libgeotiff
! if test "${use_proj}" = "yes" ; then
!     use_geotiff=yes
!     AC_ARG_WITH(geotiff, [  --without-geotiff       Disable geotiff features.],
!     use_geotiff=$withval)
!     if test "${use_geotiff}" = "yes"; then
!         AC_CHECK_LIB(tiff, TIFFClose, use_tiff=yes
! LIBS="$LIBS -ltiff"
!         AC_DEFINE(HAVE_TIFF, ,Define to 1 if you have the 'tiff' library (-ltiff)))
! 	if test "${use_tiff}" = "yes"; then
!            use_geotiff=no
!            AC_CHECK_LIB(geotiff, GTIFNew, use_geotiff=yes
! 	       LIBS="$LIBS -lgeotiff"
!                AC_DEFINE(HAVE_LIBGEOTIFF, ,Define to 1 if you have the `geotiff' library (-lgeotiff).))
!         fi
!     fi
! fi 
  
  # Check for AX.25 library