diff --git a/Configure b/Configure index ef2257f43838..08c89bed781a 100755 --- a/Configure +++ b/Configure @@ -17484,14 +17484,16 @@ $rm_try esac esac -: Check the syntax of LC_ALL when categories are set to different locales -echo " " -$echo "Checking the syntax of LC_ALL when categories are set to different locales..." >&4 +case "$perl_lc_all_separator$perl_lc_all_category_positions_init" in + "") + : Check the syntax of LC_ALL when categories are set to different locales + echo " " + $echo "Checking the syntax of LC_ALL when categories are set to different locales..." >&4 -case $d_setlocale in - $define) -$rm -f try try.* -$cat >try.c <<'EOF' + case $d_setlocale in + $define) + $rm -f try try.* + $cat >try.c <<'EOF' #include #include #include @@ -17821,45 +17823,53 @@ main (const int argc, const char ** argv) #endif EOF -set try -if eval $compile_ok; then - output=`$run ./try 2>/dev/null` - separator=`echo "$output" | $sed 1q` - case $separator in - "\"=;\"") - d_perl_lc_all_uses_name_value_pairs="$define" - d_perl_lc_all_separator="$undef" - perl_lc_all_separator= - d_perl_lc_all_category_positions_init="$undef" - perl_lc_all_category_positions_init= - ;; - "") d_perl_lc_all_uses_name_value_pairs="$undef" - d_perl_lc_all_separator="$undef" - perl_lc_all_separator= - d_perl_lc_all_category_positions_init="$undef" - perl_lc_all_category_positions_init= - ;; - *) d_perl_lc_all_uses_name_value_pairs="$undef" - d_perl_lc_all_separator="$define" - perl_lc_all_separator="$separator" - d_perl_lc_all_category_positions_init="$define" - perl_lc_all_category_positions_init=`echo "$output" | sed -n 2p` - ;; - esac -else - $echo "Failed to compile lc_all probe" >&4 -fi -$rm -f try try.* -;; -*) d_perl_lc_all_separator="$undef" - perl_lc_all_separator= - d_perl_lc_all_category_positions_init="$undef" - perl_lc_all_category_positions_init= - - # No setlocale(), but using this default allows our code to compile - # and run without having to have a bunch more #ifdef's - d_perl_lc_all_uses_name_value_pairs="$define" -;; + set try + if eval $compile_ok; then + output=`$run ./try 2>/dev/null` + separator=`echo "$output" | $sed 1q` + case $separator in + "\"=;\"") + d_perl_lc_all_uses_name_value_pairs="$define" + d_perl_lc_all_separator="$undef" + perl_lc_all_separator= + d_perl_lc_all_category_positions_init="$undef" + perl_lc_all_category_positions_init= + ;; + "") d_perl_lc_all_uses_name_value_pairs="$undef" + d_perl_lc_all_separator="$undef" + perl_lc_all_separator= + d_perl_lc_all_category_positions_init="$undef" + perl_lc_all_category_positions_init= + ;; + *) d_perl_lc_all_uses_name_value_pairs="$undef" + d_perl_lc_all_separator="$define" + perl_lc_all_separator="$separator" + d_perl_lc_all_category_positions_init="$define" + perl_lc_all_category_positions_init=`echo "$output" | sed -n 2p` + ;; + esac + else + $echo "Failed to compile lc_all probe" >&4 + fi + $rm -f try try.* + ;; + *) d_perl_lc_all_separator="$undef" + perl_lc_all_separator= + d_perl_lc_all_category_positions_init="$undef" + perl_lc_all_category_positions_init= + + # No setlocale(), but using this default allows our code to + # compile and run without having to have a bunch more #ifdef's + d_perl_lc_all_uses_name_value_pairs="$define" + ;; + esac # case on $d_setlocale + ;; + + *) # Has an lc_all definition passed-in + d_perl_lc_all_separator="$define" + d_perl_lc_all_category_positions_init="$define" + d_perl_lc_all_uses_name_value_pairs="$undef" + ;; esac : see if pipe2 exists