Commite1fdd22

committed

Make unknown-option-warning code more portable. echo -n is not portable,

and neither is "|" or "\|" in basic regular expressions.

1 parentd63ddfb commite1fdd22Copy full SHA for e1fdd22

File tree

+21

-20

lines changed

+21

-20

lines changed

Lines changed: 11 additions & 11 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-# $PostgreSQL: pgsql/config/general.m4,v 1.5 2006/08/11 18:51:50 alvherre Exp $`
	`1`	`+# $PostgreSQL: pgsql/config/general.m4,v 1.6 2006/10/13 20:23:07 petere Exp $`
`2`	`2`
`3`	`3`	`# This file defines new macros to process configure command line`
`4`	`4`	`# arguments, to replace the brain-dead AC_ARG_WITH and AC_ARG_ENABLE.`
`@@ -75,20 +75,20 @@ AC_ARG_WITH([$2], [$3], [`
`75`	`75`	`# PGAC_CHECK_ARGS()`
`76`	`76`	`# -----------------`
`77`	`77`	`# Checks if the user passed any --with/without/enable/disable arguments that`
`78`		`-# we don'trecognise. Just prints out a warning message, so this should be`
	`78`	`+# we don'trecognize. Just prints out a warning message, so this should be`
`79`	`79`	`# called near the end, so the user will see it.`
`80`	`80`
`81`	`81`	`AC_DEFUN([PGAC_CHECK_ARGS],`
`82`	`82`	`[`
`83`		- forvar in `set \|sed-ne '/^$with_\\|enable\_$/s/=.*//p'`; do
`84`		`-case $var in`
`85`		`-m4_undivert([PGAC_ARGS])`
`86`		`-with_gnu_ld) ;;`
`87`		`-*)`
`88`		`-echo-n "*** Option ignored: "`
`89`		`- echo $var \| sed -e 's/$[^=]*$/--\1/;s/_/-/g'`
`90`		`-;;`
`91`		`-esac`
	`83`	+ forpgac_var in `set \|sed's/=.*//' \| $EGREP 'with_\|enable_'`; do
	`84`	`+ case $pgac_var in`
	`85`	`+m4_undivert([PGAC_ARGS])`
	`86`	`+ with_gnu_ld) ;;`
	`87`	`+ *)`
	`88`	+pgac_txt=`echo$pgac_var \| tr '_' '-'`
	`89`	`+AC_MSG_WARN([option ignored: --$pgac_txt])`
	`90`	`+ ;;`
	`91`	`+ esac`
`92`	`92`	`done`
`93`	`93`	`])# PGAC_CHECK_ARGS`
`94`	`94`

Lines changed: 10 additions & 9 deletions

Original file line number	Diff line number	Diff line change
`@@ -22980,9 +22980,9 @@ fi`
`22980`	`22980`	`#`
`22981`	`22981`
`22982`	`22982`
`22983`		- forvar in `set \|sed-ne '/^$with_\\|enable\_$/s/=.*//p'`; do
`22984`		`-case $var in`
`22985`		`-with_template) ;;`
	`22983`	+ forpgac_var in `set \|sed's/=.*//' \| $EGREP 'with_\|enable_'`; do
	`22984`	`+ case $pgac_var in`
	`22985`	`+ with_template) ;;`
`22986`	`22986`	`with_docdir) ;;`
`22987`	`22987`	`with_includes) ;;`
`22988`	`22988`	`with_libraries) ;;`
`@@ -23014,12 +23014,13 @@ with_readline) ;;`
`23014`	`23014`	`with_libedit_preferred) ;;`
`23015`	`23015`	`with_zlib) ;;`
`23016`	`23016`
`23017`		`- with_gnu_ld) ;;`
`23018`		`- *)`
`23019`		`- echo -n "*** Option ignored: "`
`23020`		`- echo $var \| sed -e 's/$^=*$/--\1/;s/_/-/g'`
`23021`		`- ;;`
`23022`		`- esac`
	`23017`	`+ with_gnu_ld) ;;`
	`23018`	`+ *)`
	`23019`	+ pgac_txt=`echo $pgac_var \| tr '_' '-'`
	`23020`	`+ { echo "$as_me:$LINENO: WARNING: option ignored: --$pgac_txt" >&5`
	`23021`	`+echo "$as_me: WARNING: option ignored: --$pgac_txt" >&2;}`
	`23022`	`+ ;;`
	`23023`	`+ esac`
`23023`	`23024`	`done`
`23024`	`23025`
`23025`	`23026`

Comments

(0)