X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=writemain.SH;h=ac1c5aaf45b3e9b625c6f297bd8ffcfdaff8dd0a;hb=024963f8e0e4bfbd631d6878a69f86cabc760a32;hp=2cd4704f0852242710a0cb001ab3f7484a1d6041;hpb=1aef975c78d2e948679875705c79cbbbddfe5ad7;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/writemain.SH b/writemain.SH
index 2cd4704..ac1c5aa 100644
--- 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:'`
 		;;
@@ -51,8 +56,30 @@ done
 
 
 sed '/Do not delete this line--writemain depends on it/q' miniperlmain.c
+
+
 if test X"$args" != "X" ; then
-    echo "    char *file = __FILE__;"
+    for ext in $args ; do
+: $ext will either be 'Name' or 'Name1/Name2' etc
+: convert ext into cname and mname
+mname=`echo $ext   | sed 's!/!::!g'`
+cname=`echo $mname | sed 's!:!_!g'`
+
+echo "EXTERN_C void boot_${cname} (pTHX_ CV* cv);"
+    done
+fi
+
+cat << 'EOP'
+
+static void
+xs_init(pTHX)
+{
+EOP
+
+if test X"$args" != "X" ; then
+    echo "    static const char file[] = __FILE__;"
+    echo "    dXSUB_SYS;"
+
     ai=''
 
     for ext in $args ; do
@@ -62,7 +89,6 @@ if test X"$args" != "X" ; then
 	mname=`echo $ext   | sed 's!/!::!g'`
 	cname=`echo $mname | sed 's!:!_!g'`
 
-	echo "    {   extern void boot_${cname} _((CV* cv));"
 	if test "$ext" = "DynaLoader"; then
 	    : Must NOT install 'DynaLoader::boot_DynaLoader' as 'bootstrap'!
 	    : boot_DynaLoader is called directly in DynaLoader.pm
@@ -70,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'