X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=configure.com;h=c1c2a2c428d48fff7d8dd976142b283f54305d3f;hb=5b3e00df85f0acd4faa55a140aa762a15b19dca3;hp=0afe56e11baee1b32b79d412c0e38bc5d6dc1000;hpb=9b5c89798cac25472c30cfc655e92d420ec36862;p=p5sagit%2Fp5-mst-13.2.git diff --git a/configure.com b/configure.com index 0afe56e..c1c2a2c 100644 --- a/configure.com +++ b/configure.com @@ -507,6 +507,11 @@ $ ENDIF $! $ dirname = F$EXTRACT(0,F$LOCATE("]",file_2_find),file_2_find) + "]" $ file_2_find = file_2_find - dirname +$! +$! may not need double dot check on ODS-5 volumes +$ found = F$SEARCH(dirname + file_2_find) +$ IF found .NES. "" THEN GOTO Read_loop_manifest +$! $ dots = 0 $Dot_loop: $ dot_ele = F$ELEMENT(dots,".",file_2_find) @@ -728,8 +733,11 @@ $ DECK $ EOD $ bool_dflt="n" $ rp="Do you really want to continue? [''bool_dflt'] " -$ IF (fastread) THEN fastread := FALSE +$ fastread_save = fastread +$ fastread := FALSE $ GOSUB myread +$ fastread = fastread_save +$ delete/symbol fastread_save $ IF ans $ THEN $ echo4 "Okay, continuing." @@ -1275,6 +1283,7 @@ $ got_sub = "false" $ got_api_revision = "false" $ got_api_version = "false" $ got_api_subversion = "false" +$ got_perl_patchlevel= "false" $ OPEN/READONLY CONFIG 'patchlevel_h' $Patchlevel_h_loop: $ READ/END_Of_File=Close_patch/ERROR=Close_patch CONFIG line @@ -1308,11 +1317,19 @@ $ line = F$EDIT(line,"COMPRESS, TRIM") $ api_subversion = F$ELEMENT(2," ",line) $ got_api_subversion = "true" $ ENDIF +$ IF ((F$LOCATE("""DEVEL",line).NE.F$LENGTH(line)).AND.(.NOT.got_perl_patchlevel)) +$ THEN +$ line = F$EDIT(line,"COMPRESS, TRIM") +$ perl_patchlevel = F$ELEMENT(1,"""",line) +$ perl_patchlevel = perl_patchlevel - "DEVEL" +$ got_perl_patchlevel = "true" +$ ENDIF $ IF (.NOT. got_patch) .OR. - (.NOT. got_sub) .OR. - (.NOT. got_api_revision) .OR. - (.NOT. got_api_version) .OR. - - (.NOT. got_api_subversion) - + (.NOT. got_api_subversion) .OR. - + (.NOT. got_perl_patchlevel) - THEN GOTO Patchlevel_h_loop $Close_patch: $ CLOSE CONFIG @@ -1322,13 +1339,14 @@ $ subversion="0" $ api_revision="0" $ api_version="0" $ api_subversion="0" +$ perl_patchlevel="0" $ ENDIF -$ IF (F$STRING(subversion) .NES. "0") +$ version_patchlevel_string = "version ''patchlevel' subversion ''subversion'" +$ IF got_perl_patchlevel .AND. perl_patchlevel .NES. "0" $ THEN -$ echo "(You have ''package' revision ''revision' patchlevel ''patchlevel' subversion ''subversion'.)" -$ ELSE -$ echo "(You have ''package' revision ''revision' patchlevel ''patchlevel'.)" +$ version_patchlevel_string = "''version_patchlevel_string' patch ''perl_patchlevel'" $ ENDIF +$ echo "(You have ''package' ''version_patchlevel_string'.)" $! $ version = revision + "_" + patchlevel + "_" + subversion $! @@ -2362,7 +2380,12 @@ $ echo "the IEEE math option." $ bool_dflt = use_ieee_math $ if f$type(useieee) .nes. "" $ then -$ if useieee .or. useieee .eqs. "define" then bool_dflt="y" +$ if useieee .or. useieee .eqs. "define" +$ then +$ bool_dflt="y" +$ else +$ bool_dflt="n" +$ endif $ endif $ rp = "Use IEEE math? [''bool_dflt'] " $ GOSUB myread @@ -2495,6 +2518,7 @@ $ IF F$EXTRACT(0,4,line) .EQS. "ext/" THEN - xxx = F$EXTRACT(4,line_len - 16,line) $ IF xxx .EQS. "DynaLoader" THEN goto ext_loop ! omit $ IF xxx .EQS. "SDBM_File/sdbm" THEN goto ext_loop ! sub extension - omit +$ IF xxx .EQS. "Devel/PPPort/harness" THEN goto ext_loop ! sub extension - omit $ IF F$EXTRACT(0,8,line) .EQS. "vms/ext/" THEN - xxx = "VMS/" + F$EXTRACT(8,line_len - 20,line) $ known_extensions = known_extensions + " ''xxx'" @@ -2890,9 +2914,9 @@ $ lib_ext=".olb" $ ENDIF $ dlobj="dl_vms''obj_ext'" $! -$ cppstdin="''perl_cc'/noobj/preprocess=sys$output sys$input" +$ cppstdin="''perl_cc'/noobj/comments=as_is/preprocess=sys$output sys$input" $ cppminus=" " -$ cpprun="''perl_cc'/noobj/preprocess=sys$output sys$input" +$ cpprun="''perl_cc'/noobj/comments=as_is/preprocess=sys$output sys$input" $ cpplast=" " $! $ timetype="time_t" @@ -4911,9 +4935,73 @@ $ WS " }" $ WS " printf(""%d\n"", i);" $ WS " exit(0);" $ WS "}" +$ CS $ GOSUB compile $ d_nv_preserves_uv_bits = tmp $ ENDIF +$! +$ echo4 "Checking whether your kill() uses SYS$FORCEX..." +$ kill_by_sigprc = "undef" +$ OS +$ WS "#include " +$ WS "#include " +$ WS "void handler(int s) { printf(""%d\n"",s); } " +$ WS "main(){" +$ WS " printf(""0"");" +$ WS " signal(1,handler); kill(0,1);" +$ WS "}" +$ CS +$ ON ERROR THEN CONTINUE +$ GOSUB compile +$ IF tmp .NES. "01" +$ THEN +$ echo "Yes, it does." +$ echo4 "Checking whether we can use SYS$SIGPRC instead" +$ OS +$ WS "#include " +$ WS "#include " +$ WS "unsigned long code = 0;" +$ WS "int handler(unsigned long *args) {" +$ WS " code = args[1];" +$ WS " return 1;" +$ WS "}" +$ WS "main() { " +$ WS " int iss, sys$sigprc();" +$ WS " lib$establish(handler);" +$ WS " iss = sys$sigprc(0,0,0x1234);" +$ WS " iss = ((iss&1)==1 && code == 0x1234);" +$ WS " printf(""%d\n"",iss);" +$ WS "}" +$ CS +$ GOSUB compile +$ IF tmp .EQS. "1" +$ THEN +$ echo "looks like we can" +$ kill_by_sigprc = "define" +$! +$! since SIGBUS and SIGSEGV indistinguishable, make them the same here. +$! sigusr1 and sigusr2 show up in VMS6.2 and later +$! +$ if vms_ver .GES. "6.2" +$ then +$ sig_name="ZERO HUP INT QUIT ILL TRAP IOT EMT FPE KILL BUS SEGV SYS PIPE ALRM TERM ABRT USR1 USR2"",0" +$ psnwc1="""ZERO"",""HUP"",""INT"",""QUIT"",""ILL"",""TRAP"",""IOT"",""EMT"",""FPE"",""KILL"",""BUS"",""SEGV"",""SYS""," +$ psnwc2="""PIPE"",""ALRM"",""TERM"",""ABRT"",""USR1"",""USR2"",0" +$ sig_name_init = psnwc1 + psnwc2 +$ sig_num="0 1 2 3 4 5 6 7 8 9 10 10 12 13 14 15 6 16 17"",0" +$ sig_num_init="0,1,2,3,4,5,6,7,8,9,10,10,12,13,14,15,6,16,17,0" +$ sig_size="19" +$ else +$ sig_name="ZERO HUP INT QUIT ILL TRAP IOT EMT FPE KILL BUS SEGV SYS PIPE ALRM TERM ABRT"",0" +$ psnwc1="""ZERO"",""HUP"",""INT"",""QUIT"",""ILL"",""TRAP"",""IOT"",""EMT"",""FPE"",""KILL"",""BUS"",""SEGV"",""SYS""," +$ psnwc2="""PIPE"",""ALRM"",""TERM"",""ABRT"",0" +$ sig_name_init = psnwc1 + psnwc2 +$ sig_num="0 1 2 3 4 5 6 7 8 9 10 10 12 13 14 15 6"",0" +$ sig_num_init="0,1,2,3,4,5,6,7,8,9,10,10,12,13,14,15,6,0" +$ sig_size="17" +$ endif +$ ENDIF +$ ENDIF $ DELETE/SYMBOL tmp $! $! Finally the composite ones. All config @@ -4995,7 +5083,13 @@ $ WC "cpplast='" + cpplast + "'" $ WC "cppminus='" + cppminus + "'" $ WC "cpprun='" + cpprun + "'" $ WC "cppstdin='" + cppstdin + "'" +$ IF use64bitint .OR. use64bitint .EQS. "define" +$ THEN +$! gcvt() does not work for > 16 decimal places; fallback to sprintf +$ WC "d_Gconvert='sprintf((b),""%.*" + (nvgformat-"""") + ",(n),(x))'" +$ ELSE $ WC "d_Gconvert='my_gconvert(x,n,t,b)'" +$ ENDIF $ WC "d_PRIEldbl='" + d_PRIEUldbl + "'" $ WC "d_PRIFldbl='" + d_PRIFUldbl + "'" $ WC "d_PRIGldbl='" + d_PRIGUldbl + "'" @@ -5039,6 +5133,7 @@ $ WC "d_cuserid='define'" $ WC "d_dbl_dig='define'" $ WC "d_dbminitproto='undef'" $ WC "d_difftime='define'" +$ WC "d_dirfd='undef'" $ WC "d_dirnamlen='define'" $ WC "d_dlerror='undef'" $ WC "d_dlsymun='undef'" @@ -5185,6 +5280,7 @@ $ WC "d_perl_otherlibdirs='undef'" $ WC "d_phostname='" + d_phostname + "'" $ WC "d_pipe='define'" $ WC "d_poll='undef'" +$ WC "d_procselfexe='undef'" $ WC "d_pthread_atfork='undef'" $ WC "d_pthread_yield='" + d_pthread_yield + "'" $ WC "d_pthreads_created_joinable='" + d_pthreads_created_joinable + "'" @@ -5528,6 +5624,7 @@ $! WC "prefix='" + vms_prefix + "'" $ WC "prefix='" + prefix + "'" $ WC "privlib='" + privlib + "'" $ WC "privlibexp='" + privlibexp + "'" +$ WC "procselfexe=' '" $ WC "prototype='define'" $ WC "ptrsize='" + ptrsize + "'" $ WC "quadkind='" + quadkind + "'" @@ -5552,6 +5649,7 @@ $ WC "sPRIx64='" + sPRIx64 + "'" $ WC "sSCNfldbl='" + sSCNfldbl + "'" $ WC "sched_yield='" + sched_yield + "'" $ WC "scriptdir='" + scriptdir + "'" +$ WC "scriptdirexp='" + scriptdir + "'" ! use scriptdir for now $ WC "seedfunc='" + seedfunc + "'" $ WC "selectminbits='32'" $ WC "selecttype='" + selecttype + "'" @@ -5635,6 +5733,7 @@ $ WC "vendorarchexp='" + "'" $ WC "vendorlib_stem='" + "'" $ WC "vendorlibexp='" + "'" $ WC "version='" + version + "'" +$ WC "version_patchlevel_string='" + version_patchlevel_string + "'" $ WC "vms_cc_type='" + vms_cc_type + "'" ! VMS specific $ WC "vms_prefix='" + vms_prefix + "'" ! VMS specific $ WC "vms_ver='" + vms_ver + "'" ! VMS specific @@ -5745,6 +5844,7 @@ $ THEN $! Alas this does not help to build Fcntl $! WC "#define PERL_IGNORE_FPUSIG SIGFPE" $ ENDIF +$ IF kill_by_sigprc .EQS. "define" then WC "#define KILL_BY_SIGPRC" $ CLOSE CONFIG $! $ echo4 "Doing variable substitutions on .SH files..." @@ -5982,8 +6082,6 @@ $ CALL Bad_environment "LIB" $ CALL Bad_environment "T" $ CALL Bad_environment "FOO" $ CALL Bad_environment "EXT" -$ CALL Bad_environment "SOME_LOGICAL_NAME_NOT_LIKELY" -$ CALL Bad_environment "DOWN_LOGICAL_NAME_NOT_LIKELY" $ CALL Bad_environment "TEST" "SYMBOL" $ IF f$search("config.msg") .eqs. "" THEN echo "OK." $! @@ -6086,9 +6184,11 @@ $ WRITE CONFIG "$ dprofpp == ""'"+"'Perl' ''vms_prefix':[utils]dprofpp.c $ ENDIF $ WRITE CONFIG "$ h2ph == ""'"+"'Perl' ''vms_prefix':[utils]h2ph.com""" $ WRITE CONFIG "$ h2xs == ""'"+"'Perl' ''vms_prefix':[utils]h2xs.com""" +$ WRITE CONFIG "$ libnetcfg == ""'"+"'Perl' ''vms_prefix':[utils]libnetcfg.com""" $ WRITE CONFIG "$!perlcc == ""'"+"'Perl' ''vms_prefix':[utils]perlcc.com""" $ WRITE CONFIG "$ perlivp == ""'"+"'Perl' ''vms_prefix':[utils]perlivp.com""" $ WRITE CONFIG "$ splain == ""'"+"'Perl' ''vms_prefix':[utils]splain.com""" +$ WRITE CONFIG "$ xsubpp == ""'"+"'Perl' ''vms_prefix':[utils]xsubpp.com""" $ ELSE $ WRITE CONFIG "$ Perldoc == ""Perl ''vms_prefix':[lib.pod]Perldoc.com -t""" $ WRITE CONFIG "$ pod2text == ""Perl pod2text""" @@ -6103,9 +6203,11 @@ $ WRITE CONFIG "$ dprofpp == ""Perl ''vms_prefix':[utils]dprofpp.com""" $ ENDIF $ WRITE CONFIG "$ h2ph == ""Perl ''vms_prefix':[utils]h2ph.com""" $ WRITE CONFIG "$ h2xs == ""Perl ''vms_prefix':[utils]h2xs.com""" +$ WRITE CONFIG "$ libnetcfg == ""Perl ''vms_prefix':[utils]libnetcfg.com""" $ WRITE CONFIG "$!perlcc == ""Perl ''vms_prefix':[utils]perlcc.com""" $ WRITE CONFIG "$ perlivp == ""Perl ''vms_prefix':[utils]perlivp.com""" $ WRITE CONFIG "$ splain == ""Perl ''vms_prefix':[utils]splain.com""" +$ WRITE CONFIG "$ xsubpp == ""Perl ''vms_prefix':[utils]xsubpp.com""" $ ENDIF $ CLOSE CONFIG $! @@ -6173,12 +6275,13 @@ $ DELETE/NOLOG/NOCONFIRM config.msg; $ ENDIF $! $Clean_up: +$ SET NOON $ IF (silent) $ THEN +$ CLOSE/NOLOG STDOUT $ DEASSIGN SYS$OUTPUT -$! DEASSIGN SYS$ERROR $ ENDIF -$ IF F$GETJPI("","FILCNT").GT.vms_filcnt THEN CLOSE CONFIG +$ CLOSE/NOLOG CONFIG $ IF F$GETJPI("","FILCNT").GT.vms_filcnt $ THEN WRITE SYS$ERROR "%Config-W-VMS, WARNING: There is a file still open" $ ENDIF