Move CGI's Changes file to its proper place

[perl5.git] / writemain.SH

diff --git a/writemain.SH b/writemain.SH
index c70ac20..ac1c5aa 100644 (file)
--- a/writemain.SH
+++ b/writemain.SH
@@ -1,4 +1,4 @@
-case $CONFIG in
+case $PERL_CONFIG_SH in
 '')
        if test -f config.sh; then TOP=.;
        elif test -f ../config.sh; then TOP=..;
@@ -21,6 +21,7 @@ echo "Extracting writemain (with variable substitutions)"
 : Move anything that needs config subs from !NO!SUBS! section to !GROK!THIS!.
 : Protect any dollar signs and backticks that you do not want interpreted
 : by putting a backslash in front.  You may delete these comments.
+rm -f writemain
 $spitshell >writemain <<!GROK!THIS!
 $startsh
 !GROK!THIS!
@@ -36,7 +37,11 @@ $spitshell >>writemain <<'!NO!SUBS!'
 orig="$*"
 args=''
 : Remove any .a suffixes and any leading path components
-for file in `echo $orig | sed 's/\.a//g'` ; do
+for file in $orig ; do
+        case "$file" in
+           *.a)  file=`echo $file | sed 's/\.a//g'`;;
+           *.o)  file=`echo $file | sed 's/\.o//g'`;;
+        esac
        case "$file" in
        ext/*)  file=`echo $file | sed 's:ext/\(.*\)/[^/]*:\1:'`
                ;;
@@ -60,19 +65,21 @@ if test X"$args" != "X" ; then
 mname=`echo $ext   | sed 's!/!::!g'`
 cname=`echo $mname | sed 's!:!_!g'`
 
-echo "EXTERN_C void boot_${cname} _((CV* cv));"
+echo "EXTERN_C void boot_${cname} (pTHX_ CV* cv);"
     done
 fi
 
 cat << 'EOP'
 
 static void
-xs_init()
+xs_init(pTHX)
 {
 EOP
 
 if test X"$args" != "X" ; then
-    echo "    char *file = __FILE__;"
+    echo "    static const char file[] = __FILE__;"
+    echo "    dXSUB_SYS;"
+
     ai=''
 
     for ext in $args ; do
@@ -82,7 +89,6 @@ if test X"$args" != "X" ; then
        mname=`echo $ext   | sed 's!/!::!g'`
        cname=`echo $mname | sed 's!:!_!g'`
 
-       echo "    {"
        if test "$ext" = "DynaLoader"; then
            : Must NOT install 'DynaLoader::boot_DynaLoader' as 'bootstrap'!
            : boot_DynaLoader is called directly in DynaLoader.pm
@@ -90,21 +96,7 @@ if test X"$args" != "X" ; then
        else
            echo "        newXS(\"${mname}::bootstrap\", boot_${cname}, file);"
        fi
-       # does this extension wish to supply automatic booting code?
-    for aifile in ext/$ext/AutoInit.* ; do
-               case $aifile in
-               *.c)echo "      /* autoinit code from $aifile follows: */"
-                       echo "  {"; cat $aifile; echo " }"
-                       ;;
-               *.pl) ai="$ai `cat $aifile | tr '\012' ' '`;"
-                       ;;
-               esac
-       done
-       echo "    }"
     done
-    if test "X$ai" != "X"; then
-       echo "    autoboot_preamble = \"BEGIN { $ai }\";"
-    fi
 fi
 
 cat << 'EOP'