From 58f78ebcbe20a898debbef649b97abde005c3058 Mon Sep 17 00:00:00 2001 From: Mark Cave-Ayland Date: Sat, 14 Jan 2012 00:48:48 +0000 Subject: [PATCH] Fix up AC_DEFINE macros in configure.ac that don't have a description. While autoheader emits a warning, it actually fails and does not regenerate postgis_config.h.in. Along with this fix, we commit an updated version of postgis_config.h created from a fresh invocation of autoheader minus the PACKAGE_* macros. git-svn-id: http://svn.osgeo.org/postgis/trunk@8805 b70326c6-7e19-0410-871a-916f4a2858ee --- configure.ac | 8 +++-- postgis_config.h.in | 85 ++++++++++++++++++++++++++++++++++++++++----- 2 files changed, 81 insertions(+), 12 deletions(-) diff --git a/configure.ac b/configure.ac index 0e605f60f..f642808ef 100644 --- a/configure.ac +++ b/configure.ac @@ -103,7 +103,7 @@ case $host_os in PWDREGRESS="pwd" ;; esac -AC_DEFINE_UNQUOTED([PWDREGRESS]) +AC_DEFINE_UNQUOTED([PWDREGRESS], [PWDREGRESS], [Define command to determine the current directory during regression]) AC_SUBST([PWDREGRESS]) @@ -658,7 +658,7 @@ AC_CHECK_LIB([json], [json_object_get], [HAVE_JSON=Yes], [], []) LIBS="$LIBS_SAVE" if test "$HAVE_JSON" = "Yes"; then - AC_DEFINE([HAVE_LIBJSON],1) + AC_DEFINE([HAVE_LIBJSON], 1, [Define to 1 if libjson is present]) fi AC_SUBST([JSON_CPPFLAGS]) @@ -910,7 +910,9 @@ if test "x$RASTER" = "xraster"; then dnl # { AC_MSG_RESULT([found]) dnl Check if the new polygonize function is present - AC_CHECK_LIB([gdal], [GDALFPolygonize], [AC_DEFINE_UNQUOTED([GDALFPOLYGONIZE], [1])], [AC_DEFINE_UNQUOTED([GDALFPOLYGONIZE], [0])], []) + AC_CHECK_LIB([gdal], [GDALFPolygonize], + [AC_DEFINE_UNQUOTED([GDALFPOLYGONIZE], [1], [Define to 1 if GDALFPolygonize function is available])], + [AC_DEFINE_UNQUOTED([GDALFPOLYGONIZE], [0], [Define to 1 if GDALFPolygonize function is available])]) dnl Extract the linker and include flags LIBGDAL_LDFLAGS=`$GDAL_CONFIG --libs` diff --git a/postgis_config.h.in b/postgis_config.h.in index dadf66cd6..48a0e720e 100644 --- a/postgis_config.h.in +++ b/postgis_config.h.in @@ -1,34 +1,71 @@ /* postgis_config.h.in. Generated from configure.ac by autoheader. */ +/* Define to 1 if translation of program messages to the user's native + language is requested. */ +#undef ENABLE_NLS + +/* Define to 1 if GDALFPolygonize function is available */ +#undef GDALFPOLYGONIZE + +/* Define to 1 if you have the MacOS X function CFLocaleCopyCurrent in the + CoreFoundation framework. */ +#undef HAVE_CFLOCALECOPYCURRENT + +/* Define to 1 if you have the MacOS X function CFPreferencesCopyAppValue in + the CoreFoundation framework. */ +#undef HAVE_CFPREFERENCESCOPYAPPVALUE + +/* Define if the GNU dcgettext() function is already present or preinstalled. + */ +#undef HAVE_DCGETTEXT + /* Define to 1 if you have the header file. */ #undef HAVE_DLFCN_H -/* Defined if libiconv headers and library are present */ +/* Define if the GNU gettext() function is already present or preinstalled. */ +#undef HAVE_GETTEXT + +/* Define if you have the iconv() function and it works. */ #undef HAVE_ICONV +/* Define to 1 if you have the `iconvctl' function. */ +#undef HAVE_ICONVCTL + /* ieeefp.h header */ #undef HAVE_IEEEFP_H /* Define to 1 if you have the header file. */ #undef HAVE_INTTYPES_H -/* Define to 1 if the platform supports vasprintf */ -#undef HAVE_VASPRINTF - -/* Define to 1 if the platform supports asprintf */ -#undef HAVE_ASPRINTF - /* Define to 1 if you have the `geos_c' library (-lgeos_c). */ #undef HAVE_LIBGEOS_C +/* Define to 1 if you have the `libiconvctl' function. */ +#undef HAVE_LIBICONVCTL + +/* Define to 1 if libjson is present */ +#undef HAVE_LIBJSON + /* Define to 1 if you have the `pq' library (-lpq). */ #undef HAVE_LIBPQ /* Define to 1 if you have the `proj' library (-lproj). */ #undef HAVE_LIBPROJ -/* Define to 1 if you have the `json-c' */ -#undef HAVE_LIBJSON +/* Define to 1 if you have the `xml2' library (-lxml2). */ +#undef HAVE_LIBXML2 + +/* Define to 1 if you have the header file. */ +#undef HAVE_LIBXML_PARSER_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_LIBXML_TREE_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_LIBXML_XPATHINTERNALS_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_LIBXML_XPATH_H /* Define to 1 if you have the header file. */ #undef HAVE_MEMORY_H @@ -67,6 +104,9 @@ /* PostGIS library debug level (0=disabled) */ #undef POSTGIS_DEBUG_LEVEL +/* GDAL library version */ +#undef POSTGIS_GDAL_VERSION + /* GEOS library version */ #undef POSTGIS_GEOS_VERSION @@ -94,6 +134,30 @@ /* PROJ library version */ #undef POSTGIS_PROJ_VERSION +/* PostGIS Raster build date */ +#undef POSTGIS_RASTER_BUILD_DATE + +/* PostGIS Raster library version */ +#undef POSTGIS_RASTER_LIB_VERSION + +/* PostGIS Raster major version */ +#undef POSTGIS_RASTER_MAJOR_VERSION + +/* PostGIS Raster micro version */ +#undef POSTGIS_RASTER_MICRO_VERSION + +/* PostGIS Raster minor version */ +#undef POSTGIS_RASTER_MINOR_VERSION + +/* PostGIS Raster scripts version */ +#undef POSTGIS_RASTER_SCRIPTS_VERSION + +/* PostGIS Raster version */ +#undef POSTGIS_RASTER_VERSION + +/* Define to 1 if a warning is outputted every time a double is truncated */ +#undef POSTGIS_RASTER_WARN_ON_TRUNCATION + /* PostGIS scripts version */ #undef POSTGIS_SCRIPTS_VERSION @@ -103,6 +167,9 @@ /* PostGIS version */ #undef POSTGIS_VERSION +/* Define command to determine the current directory during regression */ +#undef PWDREGRESS + /* Define to 1 if you have the ANSI C header files. */ #undef STDC_HEADERS -- 2.40.0