From 50fde11fa12d9035a49fa8771a7098eeeed986d7 Mon Sep 17 00:00:00 2001 From: Ben Elliston Date: Tue, 9 Nov 1999 13:10:43 +0000 Subject: [PATCH] 1999-11-09 Akim Demaille * acgeneral.m4 (AC_INIT_PARSE_ARGS): Avoid using double quotes inside "`...`": some shells parse this incorrectly. --- ChangeLog | 3 +++ acgeneral.m4 | 10 +++++----- lib/autoconf/general.m4 | 10 +++++----- 3 files changed, 13 insertions(+), 10 deletions(-) diff --git a/ChangeLog b/ChangeLog index 3e371e6d..dbd4e301 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 1999-11-09 Akim Demaille + * acgeneral.m4 (AC_INIT_PARSE_ARGS): Avoid using double quotes + inside "`...`": some shells parse this incorrectly. + * autoheader.m4 (AH_CHECK_LIB): Template HAVE_LIBFOO, not HAVE_FOO. diff --git a/acgeneral.m4 b/acgeneral.m4 index 2bd60eda..7dc28478 100644 --- a/acgeneral.m4 +++ b/acgeneral.m4 @@ -859,7 +859,7 @@ changequote([, ])dnl ac_feature=`echo "$ac_option"|sed -e 's/-*disable-//'` # Reject names that are not valid shell variable names. changequote(, )dnl - if test -n "`echo "$ac_feature"| sed 's/[-a-zA-Z0-9_]//g'`"; then + if echo "$ac_feature" | grep '[^-a-zA-Z0-9_]' >/dev/null 2>&1; then changequote([, ])dnl AC_MSG_ERROR($ac_feature: invalid feature name) fi @@ -870,7 +870,7 @@ changequote([, ])dnl ac_feature=`echo "$ac_option"|sed -e 's/-*enable-//' -e 's/=.*//'` # Reject names that are not valid shell variable names. changequote(, )dnl - if test -n "`echo "$ac_feature"| sed 's/[-_a-zA-Z0-9]//g'`"; then + if echo "$ac_feature" | grep '[^-a-zA-Z0-9_]' >/dev/null 2>&1; then changequote([, ])dnl AC_MSG_ERROR($ac_feature: invalid feature name) fi @@ -1123,7 +1123,7 @@ Some of the influent environment variables:$ac_arg_var_help" ac_package=`echo "$ac_option"|sed -e 's/-*with-//' -e 's/=.*//'` # Reject names that are not valid shell variable names. changequote(, )dnl - if test -n "`echo "$ac_package"| sed 's/[-_a-zA-Z0-9]//g'`"; then + if echo "$ac_feature" | grep '[^-a-zA-Z0-9_]' >/dev/null 2>&1; then changequote([, ])dnl AC_MSG_ERROR($ac_package: invalid package name) fi @@ -1138,7 +1138,7 @@ changequote([, ])dnl ac_package=`echo "$ac_option"|sed -e 's/-*without-//'` # Reject names that are not valid shell variable names. changequote(, )dnl - if test -n "`echo "$ac_package"| sed 's/[-a-zA-Z0-9_]//g'`"; then + if echo "$ac_feature" | grep '[^-a-zA-Z0-9_]' >/dev/null 2>&1; then changequote([, ])dnl AC_MSG_ERROR($ac_package: invalid package name) fi @@ -1179,7 +1179,7 @@ changequote([, ])dnl *) changequote(, )dnl - if test -n "`echo "$ac_option"| sed 's/[-a-z0-9.]//g'`"; then + if echo "$ac_feature" | grep '[^-a-zA-Z0-9.]' >/dev/null 2>&1; then changequote([, ])dnl AC_MSG_WARN($ac_option: invalid host type) fi diff --git a/lib/autoconf/general.m4 b/lib/autoconf/general.m4 index 2bd60eda..7dc28478 100644 --- a/lib/autoconf/general.m4 +++ b/lib/autoconf/general.m4 @@ -859,7 +859,7 @@ changequote([, ])dnl ac_feature=`echo "$ac_option"|sed -e 's/-*disable-//'` # Reject names that are not valid shell variable names. changequote(, )dnl - if test -n "`echo "$ac_feature"| sed 's/[-a-zA-Z0-9_]//g'`"; then + if echo "$ac_feature" | grep '[^-a-zA-Z0-9_]' >/dev/null 2>&1; then changequote([, ])dnl AC_MSG_ERROR($ac_feature: invalid feature name) fi @@ -870,7 +870,7 @@ changequote([, ])dnl ac_feature=`echo "$ac_option"|sed -e 's/-*enable-//' -e 's/=.*//'` # Reject names that are not valid shell variable names. changequote(, )dnl - if test -n "`echo "$ac_feature"| sed 's/[-_a-zA-Z0-9]//g'`"; then + if echo "$ac_feature" | grep '[^-a-zA-Z0-9_]' >/dev/null 2>&1; then changequote([, ])dnl AC_MSG_ERROR($ac_feature: invalid feature name) fi @@ -1123,7 +1123,7 @@ Some of the influent environment variables:$ac_arg_var_help" ac_package=`echo "$ac_option"|sed -e 's/-*with-//' -e 's/=.*//'` # Reject names that are not valid shell variable names. changequote(, )dnl - if test -n "`echo "$ac_package"| sed 's/[-_a-zA-Z0-9]//g'`"; then + if echo "$ac_feature" | grep '[^-a-zA-Z0-9_]' >/dev/null 2>&1; then changequote([, ])dnl AC_MSG_ERROR($ac_package: invalid package name) fi @@ -1138,7 +1138,7 @@ changequote([, ])dnl ac_package=`echo "$ac_option"|sed -e 's/-*without-//'` # Reject names that are not valid shell variable names. changequote(, )dnl - if test -n "`echo "$ac_package"| sed 's/[-a-zA-Z0-9_]//g'`"; then + if echo "$ac_feature" | grep '[^-a-zA-Z0-9_]' >/dev/null 2>&1; then changequote([, ])dnl AC_MSG_ERROR($ac_package: invalid package name) fi @@ -1179,7 +1179,7 @@ changequote([, ])dnl *) changequote(, )dnl - if test -n "`echo "$ac_option"| sed 's/[-a-z0-9.]//g'`"; then + if echo "$ac_feature" | grep '[^-a-zA-Z0-9.]' >/dev/null 2>&1; then changequote([, ])dnl AC_MSG_WARN($ac_option: invalid host type) fi -- 2.47.2