diff options
| author | Tony Cook <tony@develop-help.com> | 2008-10-29 09:24:05 +1100 |
|---|---|---|
| committer | H.Merijn Brand <h.m.brand@xs4all.nl> | 2008-10-28 17:52:04 +0000 |
| commit | f47f16450cc0b7d92fc1f3d3d728aa1b96868710 (patch) | |
| tree | ba03047036f3cf0903b779614caee763254a5558 /Configure | |
| parent | 3f083399695aa47ad00262eeef44bb1d66b9dc05 (diff) | |
| download | perl-f47f16450cc0b7d92fc1f3d3d728aa1b96868710.tar.gz | |
fix for failed Gconvert detection under C++
Message-ID: <20081028112405.GA14163@mars.tony.develop-help.com>
p4raw-id: //depot/perl@34617
Diffstat (limited to 'Configure')
| -rwxr-xr-x | Configure | 95 |
1 files changed, 49 insertions, 46 deletions
@@ -25,7 +25,7 @@ # $Id: Head.U 6 2006-08-25 22:21:46Z rmanfredi $ # -# Generated on Mon Oct 27 19:29:26 CET 2008 [metaconfig 3.5 PL0] +# Generated on Tue Oct 28 18:51:20 CET 2008 [metaconfig 3.5 PL0] # (with additional metaconfig patches by perlbug@perl.org) cat >c1$$ <<EOF @@ -9500,6 +9500,46 @@ esac prefixvar=vendorscript . ./installprefix +: script used to emit important warnings +cat >warn <<EOS +$startsh +if test \$# -gt 0; then + echo "\$@" >msg +else + cat >msg +fi +echo "*** WARNING:" >&4 +sed -e 's/^/*** /' <msg >&4 +echo "*** " >&4 +cat msg >>config.msg +echo " " >>config.msg +rm -f msg +EOS +chmod +x warn +$eunicefix warn + +: see which of string.h or strings.h is needed +echo " " +strings=`./findhdr string.h` +if $test "$strings" && $test -r "$strings"; then + echo "Using <string.h> instead of <strings.h>." >&4 + val="$define" +else + val="$undef" + strings=`./findhdr strings.h` + if $test "$strings" && $test -r "$strings"; then + echo "Using <strings.h> instead of <string.h>." >&4 + else + ./warn "No string header found -- You'll surely have problems." + fi +fi +set i_string +eval $setvar +case "$i_string" in +"$undef") strings=`./findhdr strings.h`;; +*) strings=`./findhdr string.h`;; +esac + : see if qgcvt exists set qgcvt d_qgcvt eval $inlibc @@ -9673,15 +9713,18 @@ char *myname = "sprintf"; #include <stdio.h> -#define I_STDLIB $i_stdlib +#$i_stdlib I_STDLIB #ifdef I_STDLIB #include <stdlib.h> #endif +#$i_string I_STRING +#ifdef I_STRING +# include <string.h> +#else +# include <strings.h> +#endif -int -checkit(expect, got) -char *expect; -char *got; +int checkit(char *expect, char *got) { if (strcmp(expect, got)) { printf("%s oddity: Expected %s, got %s\n", @@ -12353,46 +12396,6 @@ set d_open3 eval $setvar $rm_try -: script used to emit important warnings -cat >warn <<EOS -$startsh -if test \$# -gt 0; then - echo "\$@" >msg -else - cat >msg -fi -echo "*** WARNING:" >&4 -sed -e 's/^/*** /' <msg >&4 -echo "*** " >&4 -cat msg >>config.msg -echo " " >>config.msg -rm -f msg -EOS -chmod +x warn -$eunicefix warn - -: see which of string.h or strings.h is needed -echo " " -strings=`./findhdr string.h` -if $test "$strings" && $test -r "$strings"; then - echo "Using <string.h> instead of <strings.h>." >&4 - val="$define" -else - val="$undef" - strings=`./findhdr strings.h` - if $test "$strings" && $test -r "$strings"; then - echo "Using <strings.h> instead of <string.h>." >&4 - else - ./warn "No string header found -- You'll surely have problems." - fi -fi -set i_string -eval $setvar -case "$i_string" in -"$undef") strings=`./findhdr strings.h`;; -*) strings=`./findhdr string.h`;; -esac - : see if this is a sys/file.h system val='' set sys/file.h val |