rdelaage
/
postgresql
mirror of https://git.postgresql.org/git/postgresql.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

and neither is "|" or "\|" in basic regular expressions.
This commit is contained in:
Peter Eisentraut 2006-10-13 20:23:07 +00:00
parent d63ddfb872
commit e1fdd2263f
2 changed files with 21 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
config/general.m4
View File

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

19
configure vendored
View File

@ -22980,9 +22980,9 @@ fi
# #
for var in `set |sed -ne '/^\(with_\|enable\_\)/ s/=.*//p'` ; do for pgac_var in `set | sed 's/=.*//' | $EGREP 'with_|enable_'`; do
case $var in case $pgac_var in
with_template) ;; with_template) ;;
with_docdir) ;; with_docdir) ;;
with_includes) ;; with_includes) ;;
with_libraries) ;; with_libraries) ;;
@ -23014,12 +23014,13 @@ with_readline) ;;
with_libedit_preferred) ;; with_libedit_preferred) ;;
with_zlib) ;; with_zlib) ;;
with_gnu_ld) ;; with_gnu_ld) ;;
*) *)
echo -n "*** Option ignored: " pgac_txt=`echo $pgac_var | tr '_' '-'`
echo $var | sed -e 's/\(^=*\)/--\1/;s/_/-/g' { echo "$as_me:$LINENO: WARNING: option ignored: --$pgac_txt" >&5
;; echo "$as_me: WARNING: option ignored: --$pgac_txt" >&2;}
esac ;;
esac
done done