Changeset: 0cb8cfc2c395 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=0cb8cfc2c395
Modified Files:
configure.ag
Branch: SciQL-2
Log Message:
removed gdal, geotiff and fits
diffs (truncated from 309 to 300 lines):
diff --git a/configure.ag b/configure.ag
--- a/configure.ag
+++ b/configure.ag
@@ -2397,137 +2397,137 @@ AC_SUBST(SAMTOOLS_LIBS, $SAMTOOLS_LIBS)
AM_CONDITIONAL(HAVE_SAMTOOLS, test x"$have_samtools" != xno)
-# geotiff
-org_have_geotiff="auto"
-have_geotiff=$org_have_geotiff
-AC_ARG_WITH(geotiff,
- AS_HELP_STRING([--with-geotiff=DIR],[geotiff library is installed in DIR]),
- [have_geotiff="$withval"], [have_geotiff="auto"])
-# first autoconf for distributions that added a .pc file themselves (Fedora)
-if test "x$have_geotiff" != xno; then
-
- case "$have_geotiff" in
- auto|yes)
- PKG_CHECK_MODULES([GEOTIFF], [libgeotiff],
[have_geotiff="pkgconf"], [have_geotiff="$have_geotiff"])
- ;;
- *)
- GEOTIFF_CFLAGS="-I$have_geotiff/include"
- GEOTIFF_LIBS="-L$have_geotiff/lib"
- ;;
- esac
-fi
+## geotiff
+#org_have_geotiff="auto"
+#have_geotiff=$org_have_geotiff
+#AC_ARG_WITH(geotiff,
+# AS_HELP_STRING([--with-geotiff=DIR],[geotiff library is installed in
DIR]),
+# [have_geotiff="$withval"], [have_geotiff="auto"])
+## first autoconf for distributions that added a .pc file themselves (Fedora)
+#if test "x$have_geotiff" != xno; then
+#
+# case "$have_geotiff" in
+# auto|yes)
+# PKG_CHECK_MODULES([GEOTIFF], [libgeotiff],
[have_geotiff="pkgconf"], [have_geotiff="$have_geotiff"])
+# ;;
+# *)
+# GEOTIFF_CFLAGS="-I$have_geotiff/include"
+# GEOTIFF_LIBS="-L$have_geotiff/lib"
+# ;;
+# esac
+#fi
+## try to detect it manually like upstream provides it
+#if test "x$have_geotiff" != xno && test "x$have_geotiff" != xpkgconf; then
+# save_CPPFLAGS="$CPPFLAGS"
+# save_LDFLAGS="$LDFLAGS"
+# save_LIBS="$LIBS"
+# CPPFLAGS="$CPPFLAGS $GEOTIFF_CFLAGS"
+# LDFLAGS="$LDFLAGS $GEOTIFF_LIBS"
+# LIBS=""
+# AC_CHECK_HEADER(tiffio.h, AC_CHECK_LIB(tiff, TIFFOpen))
+# found_xtiffio_h=yes
+# AC_CHECK_HEADER(xtiffio.h,,
+# AC_CHECK_HEADER(geotiff/xtiffio.h,
+# [if test "x$GEOTIFF_CFLAGS" = x; then
+# GEOTIFF_CFLAGS="-I/usr/include/geotiff"
+# else
+# GEOTIFF_CFLAGS="$GEOTIFF_CFLAGS/geotiff"
+# fi
+# CPPFLAGS="$save_CPPFLAGS $GEOTIFF_CFLAGS"],
+# AC_CHECK_HEADER(libgeotiff/xtiffio.h,
+# [if test "x$GEOTIFF_CFLAGS" = x; then
+#
GEOTIFF_CFLAGS="-I/usr/include/libgeotiff"
+# else
+#
GEOTIFF_CFLAGS="$GEOTIFF_CFLAGS/libgeotiff"
+# fi
+# CPPFLAGS="$save_CPPFLAGS $GEOTIFF_CFLAGS"],
+# [found_xtiffio_h=no])))
+# if test "x$found_xtiffio_h" = xyes; then
+# AC_CHECK_LIB(geotiff, XTIFFOpen,
+# [AC_DEFINE(HAVE_GEOTIFF, 1, [Define if you have the
geotiff library])
+# have_geotiff=yes
+# LIBS="$LIBS -lgeotiff"],
+# [ if test "x$have_geotiff" != xauto; then
AC_MSG_ERROR([-lgeotiff library not found]); fi
+# have_geotiff=no; why_have_geotiff="(geotiff library
not found)" ],
+# [$MATH_LIBS])
+# else
+# if test "x$have_geotiff" != xauto; then AC_MSG_ERROR([xtiffio.h
header not found]); fi
+# have_geotiff=no; why_have_geotiff="(xtiffio.h header not found)"
+# fi
+# GEOTIFF_LIBS="$GEOTIFF_LIBS $LIBS"
+# LDFLAGS="$save_LDFLAGS"
+# CPPFLAGS="$save_CPPFLAGS"
+# LIBS="$save_LIBS"
+# if test "x$have_geotiff" != "xyes"; then
+# GEOTIFF_CFLAGS=""
+# GEOTIFF_LIBS=""
+# fi
+#fi
+#AC_SUBST(geotiff_CFLAGS, $GEOTIFF_CFLAGS)
+#AC_SUBST(geotiff_LIBS, $GEOTIFF_LIBS)
+#AM_CONDITIONAL(HAVE_GEOTIFF, test x"$have_geotiff" != xno)
+#
+## gdal
+#org_have_gdal="auto"
+#have_gdal=$org_have_gdal
+#AC_ARG_WITH(gdal,
+# AS_HELP_STRING([--with-gdal=DIR],[gdal library is installed in DIR]),
+# [have_gdal="$withval"], [have_gdal="auto"])
+## first autoconf for distributions that added a .pc file themselves (Fedora)
+#if test "x$have_gdal" != xno; then
+#
+# case "$have_gdal" in
+# auto|yes)
+# PKG_CHECK_MODULES([GDAL], [libgdal], [have_gdal="pkgconf"],
[have_gdal="$have_gdal"])
+# ;;
+# *)
+# GDAL_CFLAGS="-I$have_gdal/include"
+# GDAL_LIBS="-L$have_gdal/lib"
+# ;;
+# esac
+#fi
# try to detect it manually like upstream provides it
-if test "x$have_geotiff" != xno && test "x$have_geotiff" != xpkgconf; then
- save_CPPFLAGS="$CPPFLAGS"
- save_LDFLAGS="$LDFLAGS"
- save_LIBS="$LIBS"
- CPPFLAGS="$CPPFLAGS $GEOTIFF_CFLAGS"
- LDFLAGS="$LDFLAGS $GEOTIFF_LIBS"
- LIBS=""
- AC_CHECK_HEADER(tiffio.h, AC_CHECK_LIB(tiff, TIFFOpen))
- found_xtiffio_h=yes
- AC_CHECK_HEADER(xtiffio.h,,
- AC_CHECK_HEADER(geotiff/xtiffio.h,
- [if test "x$GEOTIFF_CFLAGS" = x; then
- GEOTIFF_CFLAGS="-I/usr/include/geotiff"
- else
- GEOTIFF_CFLAGS="$GEOTIFF_CFLAGS/geotiff"
- fi
- CPPFLAGS="$save_CPPFLAGS $GEOTIFF_CFLAGS"],
- AC_CHECK_HEADER(libgeotiff/xtiffio.h,
- [if test "x$GEOTIFF_CFLAGS" = x; then
-
GEOTIFF_CFLAGS="-I/usr/include/libgeotiff"
- else
-
GEOTIFF_CFLAGS="$GEOTIFF_CFLAGS/libgeotiff"
- fi
- CPPFLAGS="$save_CPPFLAGS $GEOTIFF_CFLAGS"],
- [found_xtiffio_h=no])))
- if test "x$found_xtiffio_h" = xyes; then
- AC_CHECK_LIB(geotiff, XTIFFOpen,
- [AC_DEFINE(HAVE_GEOTIFF, 1, [Define if you have the
geotiff library])
- have_geotiff=yes
- LIBS="$LIBS -lgeotiff"],
- [ if test "x$have_geotiff" != xauto; then
AC_MSG_ERROR([-lgeotiff library not found]); fi
- have_geotiff=no; why_have_geotiff="(geotiff library
not found)" ],
- [$MATH_LIBS])
- else
- if test "x$have_geotiff" != xauto; then AC_MSG_ERROR([xtiffio.h
header not found]); fi
- have_geotiff=no; why_have_geotiff="(xtiffio.h header not found)"
- fi
- GEOTIFF_LIBS="$GEOTIFF_LIBS $LIBS"
- LDFLAGS="$save_LDFLAGS"
- CPPFLAGS="$save_CPPFLAGS"
- LIBS="$save_LIBS"
- if test "x$have_geotiff" != "xyes"; then
- GEOTIFF_CFLAGS=""
- GEOTIFF_LIBS=""
- fi
-fi
-AC_SUBST(geotiff_CFLAGS, $GEOTIFF_CFLAGS)
-AC_SUBST(geotiff_LIBS, $GEOTIFF_LIBS)
-AM_CONDITIONAL(HAVE_GEOTIFF, test x"$have_geotiff" != xno)
-
-# gdal
-org_have_gdal="auto"
-have_gdal=$org_have_gdal
-AC_ARG_WITH(gdal,
- AS_HELP_STRING([--with-gdal=DIR],[gdal library is installed in DIR]),
- [have_gdal="$withval"], [have_gdal="auto"])
-# first autoconf for distributions that added a .pc file themselves (Fedora)
-if test "x$have_gdal" != xno; then
-
- case "$have_gdal" in
- auto|yes)
- PKG_CHECK_MODULES([GDAL], [libgdal], [have_gdal="pkgconf"],
[have_gdal="$have_gdal"])
- ;;
- *)
- GDAL_CFLAGS="-I$have_gdal/include"
- GDAL_LIBS="-L$have_gdal/lib"
- ;;
- esac
-fi
-# try to detect it manually like upstream provides it
-if test "x$have_gdal" != xno && test "x$have_gdal" != xpkgconf; then
- save_CPPFLAGS="$CPPFLAGS"
- save_LDFLAGS="$LDFLAGS"
- save_LIBS="$LIBS"
- CPPFLAGS="$CPPFLAGS $GDAL_CFLAGS"
- LDFLAGS="$LDFLAGS $GDAL_LIBS"
- LIBS=""
- found_gdal_h=yes
- AC_CHECK_HEADER(gdal.h,,
- AC_CHECK_HEADER(gdal/gdal.h,
- [if test "x$GDAL_CFLAGS" = x; then
- GDAL_CFLAGS="-I/usr/include/gdal"
- else
- GDAL_CFLAGS="$GDAL_CFLAGS/gdal"
- fi
- CPPFLAGS="$save_CPPFLAGS $GDAL_CFLAGS"],
- [found_gdal_h=no]))
- if test "x$found_gdal_h" = xyes; then
- AC_CHECK_LIB(gdal, GDALAllRegister,
- [AC_DEFINE(HAVE_GDAL, 1, [Define if you have the gdal
library])
- have_gdal=yes
- LIBS="$LIBS -lgdal"],
- [ if test "x$have_gdal" != xauto; then
AC_MSG_ERROR([-lgdal library not found]); fi
- have_gdal=no; why_have_gdal="(gdal library not
found)" ],
- [$MATH_LIBS])
- else
- if test "x$have_gdal" != xauto; then AC_MSG_ERROR([gdal.h
header not found]); fi
- have_gdal=no; why_have_gdal="(gdal.h header not found)"
- fi
- GDAL_LIBS="$GDAL_LIBS $LIBS"
- LDFLAGS="$save_LDFLAGS"
- CPPFLAGS="$save_CPPFLAGS"
- LIBS="$save_LIBS"
- if test "x$have_gdal" != "xyes"; then
- GDAL_CFLAGS=""
- GDAL_LIBS=""
- fi
-fi
-AC_SUBST(gdal_CFLAGS, $GDAL_CFLAGS)
-AC_SUBST(gdal_LIBS, $GDAL_LIBS)
-AM_CONDITIONAL(HAVE_GDAL, test x"$have_gdal" != xno)
+#if test "x$have_gdal" != xno && test "x$have_gdal" != xpkgconf; then
+# save_CPPFLAGS="$CPPFLAGS"
+# save_LDFLAGS="$LDFLAGS"
+# save_LIBS="$LIBS"
+# CPPFLAGS="$CPPFLAGS $GDAL_CFLAGS"
+# LDFLAGS="$LDFLAGS $GDAL_LIBS"
+# LIBS=""
+# found_gdal_h=yes
+# AC_CHECK_HEADER(gdal.h,,
+# AC_CHECK_HEADER(gdal/gdal.h,
+# [if test "x$GDAL_CFLAGS" = x; then
+# GDAL_CFLAGS="-I/usr/include/gdal"
+# else
+# GDAL_CFLAGS="$GDAL_CFLAGS/gdal"
+# fi
+# CPPFLAGS="$save_CPPFLAGS $GDAL_CFLAGS"],
+# [found_gdal_h=no]))
+# if test "x$found_gdal_h" = xyes; then
+# AC_CHECK_LIB(gdal, GDALAllRegister,
+# [AC_DEFINE(HAVE_GDAL, 1, [Define if you have the gdal
library])
+# have_gdal=yes
+# LIBS="$LIBS -lgdal"],
+# [ if test "x$have_gdal" != xauto; then
AC_MSG_ERROR([-lgdal library not found]); fi
+# have_gdal=no; why_have_gdal="(gdal library not
found)" ],
+# [$MATH_LIBS])
+# else
+# if test "x$have_gdal" != xauto; then AC_MSG_ERROR([gdal.h
header not found]); fi
+# have_gdal=no; why_have_gdal="(gdal.h header not found)"
+# fi
+# GDAL_LIBS="$GDAL_LIBS $LIBS"
+# LDFLAGS="$save_LDFLAGS"
+# CPPFLAGS="$save_CPPFLAGS"
+# LIBS="$save_LIBS"
+# if test "x$have_gdal" != "xyes"; then
+# GDAL_CFLAGS=""
+# GDAL_LIBS=""
+# fi
+#fi
+#AC_SUBST(gdal_CFLAGS, $GDAL_CFLAGS)
+#AC_SUBST(gdal_LIBS, $GDAL_LIBS)
+#AM_CONDITIONAL(HAVE_GDAL, test x"$have_gdal" != xno)
# geos, only used in geom module
@@ -2599,16 +2599,16 @@ esac
AC_SUBST(GEOS_INCS)
AC_SUBST(GEOS_LIBS)
-org_have_cfitsio=no
-have_cfitsio=$org_have_cfitsio
-if test "x$enable_fits" != xno; then
- PKG_CHECK_MODULES([cfitsio], [cfitsio],
- [have_cfitsio=yes; AC_DEFINE(HAVE_FITS, 1, [Define if the fits
module is to be enabled])],
- [have_cfitsio=no; why_have_cfitsio="(cfitsio library not found)"
- if test "x$enable_fits" = xyes; then AC_MSG_ERROR([cfitsio
library required for FITS support]); fi;
- enable_fits=no; disable_fits="(cfitsio library not found)"])
-fi
-AM_CONDITIONAL(HAVE_FITS, test x"$have_cfitsio" != xno)
+#org_have_cfitsio=no
+#have_cfitsio=$org_have_cfitsio
+#if test "x$enable_fits" != xno; then
+# PKG_CHECK_MODULES([cfitsio], [cfitsio],
+# [have_cfitsio=yes; AC_DEFINE(HAVE_FITS, 1, [Define if the fits
module is to be enabled])],
+# [have_cfitsio=no; why_have_cfitsio="(cfitsio library not found)"
+# if test "x$enable_fits" = xyes; then AC_MSG_ERROR([cfitsio
library required for FITS support]); fi;
+# enable_fits=no; disable_fits="(cfitsio library not found)"])
+#fi
+#AM_CONDITIONAL(HAVE_FITS, test x"$have_cfitsio" != xno)
PKG_CHECK_MODULES([atomic_ops], [atomic_ops], [have_atomic_ops="yes"],
[have_atomic_ops="no"; why_have_atomic_ops="(atomic_ops library not
found)"])
@@ -3440,8 +3440,8 @@ for comp in \
'atomic_ops ' \
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
