From 25d69826cf123ac23e4da742be281b5f2196e6fd Mon Sep 17 00:00:00 2001 From: Sandro Santilli Date: Mon, 31 Dec 2012 15:18:55 +0000 Subject: [PATCH] Use grep found by ./configure (and have ./configure look for it) git-svn-id: http://svn.osgeo.org/postgis/trunk@10942 b70326c6-7e19-0410-871a-916f4a2858ee --- configure.ac | 1 + extensions/postgis_topology/Makefile.in | 7 ++++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac index 6f430928a..f904246df 100644 --- a/configure.ac +++ b/configure.ac @@ -25,6 +25,7 @@ dnl AC_PROG_CC AC_PROG_CPP AC_PROG_CXX +AC_PROG_GREP AC_PATH_PROG([ANT], [ant], []) AC_SUBST([ANT]) diff --git a/extensions/postgis_topology/Makefile.in b/extensions/postgis_topology/Makefile.in index 19608a1db..6a55e8a4a 100644 --- a/extensions/postgis_topology/Makefile.in +++ b/extensions/postgis_topology/Makefile.in @@ -4,25 +4,26 @@ EXTENSION = postgis_topology EXTVERSION = @POSTGIS_LIB_VERSION@ MINORVERSION = @POSTGIS_MAJOR_VERSION@.@POSTGIS_MINOR_VERSION@ PGIS_MAJ_MIN=@POSTGIS_MAJOR_VERSION@@POSTGIS_MINOR_VERSION@ +GREP=@GREP@ MICRO_NUMBER = $(shell echo $(EXTVERSION) | sed "s/[0-9]\.[0-9]\.\([0-9]*\)[a-zA-Z]*[0-9]*/\1/") PREREL_NUMBER = $(shell echo $(EXTVERSION) | \ sed "s/[0-9]\.[0-9]\.\(.*\)/\1/" | \ - grep "[a-zA-Z]" | \ + $(GREP) "[a-zA-Z]" | \ sed "s/[0-9][a-zA-Z]\([0-9]*\)[a-zA-Z]*/\1/") MICRO_PREV = $(shell if test "$(MICRO_NUMBER)x" != "x"; then expr $(MICRO_NUMBER) - 1; fi) PREREL_PREV = $(shell if test "$(PREREL_NUMBER)x" != "x"; then expr $(PREREL_NUMBER) - 1; fi) PREREL_PREFIX = $(shell echo $(EXTVERSION) | \ sed "s/[0-9]\.[0-9]\.\(.*\)/\1/" | \ - grep "[a-zA-Z]" | \ + $(GREP) "[a-zA-Z]" | \ sed "s/\([0-9][a-zA-Z]*\)[0-9]*/\1/") DATA = $(filter-out $(wildcard sql/*--*.sql),$(wildcard sql/*.sql)) PG_CONFIG = @PGCONFIG@ -PG91 = $(shell $(PG_CONFIG) --version | grep -qE " 8\.| 9\.0" && echo no || echo yes) +PG91 = $(shell $(PG_CONFIG) --version | $(GREP) -qE " 8\.| 9\.0" && echo no || echo yes) SQL_BITS = $(wildcard sql_bits/*.sql) EXTRA_CLEAN += sql/*.sql ${SQL_BITS} -- 2.50.1