"Fossies" - the Fresh Open Source Software Archive  

Source code changes of the file "configure.ac" between
libgeotiff-1.5.1.tar.gz and libgeotiff-1.6.0.tar.gz

About: libgeotiff is a library (built on top of libtiff) for reading and writing coordinate system information from and to GeoTIFF files (GeoTIFF establishes a TIFF based interchange format for georeferenced raster imagery).

configure.ac  (libgeotiff-1.5.1):configure.ac  (libgeotiff-1.6.0)
m4_define([VERSION_MAJOR], [1]) m4_define([VERSION_MAJOR], [1])
m4_define([VERSION_MINOR], [5]) m4_define([VERSION_MINOR], [6])
m4_define([VERSION_POINT], [1]) m4_define([VERSION_POINT], [0])
m4_define([GEOTIFF_VERSION], m4_define([GEOTIFF_VERSION],
[VERSION_MAJOR.VERSION_MINOR.VERSION_POINT]) [VERSION_MAJOR.VERSION_MINOR.VERSION_POINT])
m4_include([m4/ax_prog_doxygen.m4]) m4_include([m4/ax_prog_doxygen.m4])
AC_PREREQ([2.59]) AC_PREREQ([2.59])
AC_INIT([libgeotiff], [GEOTIFF_VERSION], [warmerdam@pobox.com]) AC_INIT([libgeotiff], [GEOTIFF_VERSION], [warmerdam@pobox.com])
AC_CANONICAL_BUILD AC_CANONICAL_BUILD
AC_CONFIG_MACRO_DIR([m4]) AC_CONFIG_MACRO_DIR([m4])
skipping to change at line 32 skipping to change at line 32
dnl ######################################################################### dnl #########################################################################
AM_INIT_AUTOMAKE AM_INIT_AUTOMAKE
AM_MAINTAINER_MODE AM_MAINTAINER_MODE
AC_PROG_CC AC_PROG_CC
AC_PROG_INSTALL AC_PROG_INSTALL
AC_PROG_LN_S AC_PROG_LN_S
AC_PROG_MAKE_SET AC_PROG_MAKE_SET
AC_PROG_LIBTOOL AC_PROG_LIBTOOL
dnl AC_PROG_CC
dnl AC_COMPILER_WFLAGS
dnl AC_PROG_RANLIB
dnl AC_COMPILER_PIC
dnl AC_LD_SHARED
dnl ######################################################################### dnl #########################################################################
dnl Default compilation flags dnl Default compilation flags
dnl ######################################################################### dnl #########################################################################
m4_define([debug_default],[no]) m4_define([debug_default],[no])
CFLAGS="$CFLAGS" CFLAGS="$CFLAGS"
dnl We want to honor the users wishes with regard to linking. dnl We want to honor the users wishes with regard to linking.
LIBS="$LDFLAGS $LIBS" LIBS="$LDFLAGS $LIBS"
skipping to change at line 207 skipping to change at line 200
TIFF_INC=-I$with_libtiff TIFF_INC=-I$with_libtiff
fi fi
LIBS_SAVED="$LIBS" LIBS_SAVED="$LIBS"
AC_CHECK_LIB(tiff,TIFFOpen,[TIFF_CONFIG=yes], AC_CHECK_LIB(tiff,TIFFOpen,[TIFF_CONFIG=yes],
AC_MSG_ERROR([failed to link with -ltiff to find TIFFOpen]),-lm) AC_MSG_ERROR([failed to link with -ltiff to find TIFFOpen]),-lm)
AC_CHECK_LIB(tiff,TIFFMergeFieldInfo,[TIFF_CONFIG=yes], AC_CHECK_LIB(tiff,TIFFMergeFieldInfo,[TIFF_CONFIG=yes],
AC_MSG_ERROR([Libtiff 3.6.0 Beta or later required for this versi on of AC_MSG_ERROR([Libtiff 3.6.0 Beta or later required for this versi on of
libgeotiff. Please upgrade or use an older version of libgeotiff.]),-lm) libgeotiff. Please upgrade or use an older version of libgeotiff.]),-lm)
LIBS="$LIBS_SAVED" LIBS="$LIBS_SAVED"
else else
AC_CHECK_LIB(tiff,TIFFOpen,[TIFF_CONFIG=yes], PKG_CHECK_MODULES(LIBTIFF, libtiff-4,
AC_MSG_ERROR([You will need to substantially rewrite libxtiff to [TIFF_INC="$LIBTIFF_CFLAGS" LIBS="$LIBS $LIBTIFF_LIBS" TIFF_
CONFIG="yes"],
[AC_CHECK_LIB(tiff,TIFFOpen,[TIFF_CONFIG=yes],
AC_MSG_ERROR([You will need to substantially r
ewrite libxtiff to
build libgeotiff without libtiff]),-lm) build libgeotiff without libtiff]),-lm)
LIBS_SAVED="$LIBS" LIBS_SAVED="$LIBS"
AC_CHECK_LIB(tiff,TIFFMergeFieldInfo,[TIFF_CONFIG=yes], AC_CHECK_LIB(tiff,TIFFMergeFieldInfo,[TIFF_CONFIG=yes],
AC_MSG_ERROR([Libtiff 3.6.0 Beta or later required for this versi AC_MSG_ERROR([Libtiff 3.6.0 Beta or later requi
on of red for this version of
libgeotiff. Please upgrade libtiff or use an older version of libgeotiff.]),-lm) libgeotiff. Please upgrade libtiff or use an older version of libgeotiff.]),-lm)
LIBS="$LIBS -ltiff" LIBS="$LIBS -ltiff"
TIFF_INC= TIFF_INC=
TIFF_CONFIG="yes" TIFF_CONFIG="yes"])
fi fi
AC_SUBST([TIFF_INC]) AC_SUBST([TIFF_INC])
AC_SUBST([TIFF_PREFIX]) AC_SUBST([TIFF_PREFIX])
AM_CONDITIONAL([TIFF_IS_CONFIG], [test ! x$TIFF_CONFIG = xno]) AM_CONDITIONAL([TIFF_IS_CONFIG], [test ! x$TIFF_CONFIG = xno])
dnl --------------------------------------------------------------------------- dnl ---------------------------------------------------------------------------
dnl PROJ.6 related stuff dnl PROJ.6 related stuff
dnl --------------------------------------------------------------------------- dnl ---------------------------------------------------------------------------
skipping to change at line 239 skipping to change at line 234
AC_ARG_WITH(proj,[ --with-proj=ARG Compile with PROJ.x (ARG=yes or path)],,) AC_ARG_WITH(proj,[ --with-proj=ARG Compile with PROJ.x (ARG=yes or path)],,)
PROJ_INCLUDE="" PROJ_INCLUDE=""
if test "x$with_proj" = "xno" ; then if test "x$with_proj" = "xno" ; then
AC_MSG_ERROR([PROJ 6 is a required dependency.]) AC_MSG_ERROR([PROJ 6 is a required dependency.])
else else
if test "x$with_proj" = "xyes" -o "x$with_proj" = "x"; then if test "x$with_proj" = "xyes" -o "x$with_proj" = "x"; then
ORIG_LIBS="$LIBS" PKG_CHECK_MODULES(PROJ, proj, [LIBS="$LIBS $PROJ_LIBS" PROJ_FOUND=yes], [PRO
LIBS="-lproj $ORIG_LIBS" J_FOUND=no])
AC_CHECK_LIB(proj,proj_create_from_wkt,PROJ_FOUND=yes,PROJ_FOUND=no,) if test "$PROJ_FOUND" = "no"; then
ORIG_LIBS="$LIBS"
LIBS="-lproj $ORIG_LIBS"
AC_CHECK_LIB(proj,proj_create_from_wkt,PROJ_FOUND=yes,PROJ_FOUND=no,)
fi
if test "$PROJ_FOUND" = "no"; then if test "$PROJ_FOUND" = "no"; then
AC_CHECK_LIB(proj,internal_proj_create_from_wkt,PROJ_FOUND=yes,PROJ_FOUN D=no,) AC_CHECK_LIB(proj,internal_proj_create_from_wkt,PROJ_FOUND=yes,PROJ_FOUN D=no,)
if test "$PROJ_FOUND" = "yes"; then if test "$PROJ_FOUND" = "yes"; then
PROJ_INCLUDE="-DPROJ_RENAME_SYMBOLS" PROJ_INCLUDE="-DPROJ_RENAME_SYMBOLS"
fi fi
fi fi
if test "$PROJ_FOUND" = "no"; then if test "$PROJ_FOUND" = "no"; then
LIBS="-linternalproj $ORIG_LIBS" LIBS="-linternalproj $ORIG_LIBS"
AC_CHECK_LIB(internalproj,internal_proj_create_from_wkt,PROJ_FOUND=yes,P ROJ_FOUND=no,) AC_CHECK_LIB(internalproj,internal_proj_create_from_wkt,PROJ_FOUND=yes,P ROJ_FOUND=no,)
if test "$PROJ_FOUND" = "yes"; then if test "$PROJ_FOUND" = "yes"; then
skipping to change at line 312 skipping to change at line 310
PROJ_INCLUDE="$PROJ_INCLUDE -I$with_proj/include" PROJ_INCLUDE="$PROJ_INCLUDE -I$with_proj/include"
AC_MSG_NOTICE([proj.h found]) AC_MSG_NOTICE([proj.h found])
else else
AC_MSG_ERROR([proj.h not found]) AC_MSG_ERROR([proj.h not found])
fi fi
fi fi
fi fi
AC_SUBST(PROJ_INCLUDE) AC_SUBST(PROJ_INCLUDE)
AC_ARG_ENABLE(towgs84, [ --disable-towgs84 Disable WGS84 parameters for b AC_ARG_ENABLE(towgs84, [ --disable-towgs84 Disable WGS84 parameters for b
inary compatibility with pre-1.4.1], AC_DEFINE(GEO_NORMALIZE_DISABLE_TOWGS84, [] inary compatibility with pre-1.4.1], AC_DEFINE([GEO_NORMALIZE_DISABLE_TOWGS84],
, [Disable WGS84 parameters])) [], [Disable WGS84 parameters]))
AC_MSG_CHECKING([if libtool needs -no-undefined flag to build shared libraries])
case "${host}" in
*-*-cygwin* | *-*-mingw*|*-*-aix*)
## Add in the -no-undefined flag to LDFLAGS for libtool.
AC_MSG_RESULT([yes])
NOUNDEFINED=" -no-undefined"
;;
*)
## Don't add in anything.
AC_MSG_RESULT([no])
;;
esac
AC_SUBST([NOUNDEFINED])
dnl ######################################################################### dnl #########################################################################
dnl Doxygen settings dnl Doxygen settings
dnl ######################################################################### dnl #########################################################################
DX_HTML_FEATURE(ON) DX_HTML_FEATURE(ON)
DX_CHM_FEATURE(OFF) DX_CHM_FEATURE(OFF)
DX_CHI_FEATURE(OFF) DX_CHI_FEATURE(OFF)
DX_MAN_FEATURE(ON) DX_MAN_FEATURE(ON)
DX_RTF_FEATURE(OFF) DX_RTF_FEATURE(OFF)
 End of changes. 7 change blocks. 
24 lines changed or deleted 39 lines changed or added

Home  |  About  |  Features  |  All  |  Newest  |  Dox  |  Diffs  |  RSS Feeds  |  Screenshots  |  Comments  |  Imprint  |  Privacy  |  HTTP(S)