← Back to branch summary

~ubuntu-branches/ubuntu/trusty/postgis/trusty-updates

« back to all changes in this revision

Viewing changes to configure.ac

  • Committer: Package Import Robot
  • Author(s): Markus Wanner
  • Date: 2013-12-12 20:38:27 UTC
  • mfrom: (22.1.5 sid)
  • Revision ID: package-import@ubuntu.com-20131212203827-l99pq9urf9emmm4r
Tags: 2.1.1-1
* New upstream release
* Drop patches upstream-r11979, upstream-r11983, upstream-r11990, and
  minor-r11979-correction; these are included in this release.
* control, rules, liblwgeom-2.1.*.{install,symbols}: adapt to new liblwgeom
  version.
* Adjust patch debian-versions: in doc/Makefile.comments, refer to
  Postgres 9.3, as that's now default. Set POSTGIS_LIBXML2_VERSION to
  2.9.1, as currently shipped.
* Adjust line numbers in patches honor-build-flags and link-liblwgeom

Show diffs side-by-side

added added

removed removed

Lines of Context:
configure.ac
34
34
dnl
35
35
AC_PATH_PROG([CPPBIN], [cpp], [])
36
36
if test "x$CPPBIN" != "x"; then
37
 
  SQLPP="${CPPBIN} -traditional-cpp -P"
 
37
  SQLPP="${CPPBIN} -w -traditional-cpp -P"
38
38
else
39
39
  AC_PATH_PROG([GPP], [gpp_], [])
40
40
  if test "x$GPP" != "x"; then
41
41
    SQLPP="${GPP} -C -s \'" dnl Use better string support
42
42
  else
43
 
    SQLPP="${CPP} -traditional-cpp"
 
43
    SQLPP="${CPP} -w -traditional-cpp"
44
44
  fi
45
45
fi
46
46
AC_SUBST([SQLPP])
379
379
dnl Extract the version information from pg_config
380
380
dnl Note: we extract the major & minor separately, ensure they are numeric, and then combine to give
381
381
dnl the final version. This is to guard against user error... 
382
 
PGSQL_MAJOR_VERSION=`$PG_CONFIG --version | sed 's/[[A-Za-z ]]*//' | cut -d. -f1 | sed 's/[[^0-9]]//g'` 
383
 
PGSQL_MINOR_VERSION=`$PG_CONFIG --version | sed 's/[[A-Za-z ]]*//' | cut -d. -f2 | sed 's/[[^0-9]]//g'` 
 
382
PGSQL_MAJOR_VERSION=`$PG_CONFIG --version | sed 's/[[^0-9]]*\([[0-9]]\)\.\([[0-9]]\).*/\1/'`
 
383
PGSQL_MINOR_VERSION=`$PG_CONFIG --version | sed 's/[[^0-9]]*\([[0-9]]\)\.\([[0-9]]\).*/\2/'`
384
384
PGSQL_FULL_VERSION=`$PG_CONFIG --version`
385
385
POSTGIS_PGSQL_VERSION="$PGSQL_MAJOR_VERSION$PGSQL_MINOR_VERSION"
386
386