--- cvsroot/App-Staticperl/mkbundle	2010/12/07 09:27:54	1.6
+++ cvsroot/App-Staticperl/mkbundle	2010/12/09 09:51:32	1.10
@@ -6,6 +6,7 @@
 our $VERBOSE  = 1;
 our $STRIP    = "pod"; # none, pod or ppi
 our $PERL     = 0;
+our $APP;
 our $VERIFY   = 0;
 our $STATIC   = 0;
 
@@ -17,6 +18,8 @@
 my @libs;
 my @static_ext;
 my $extralibs;
+my @staticlibs;
+my @incext;
 
 @ARGV
    or die "$0: use 'staticperl help' (or read the sources of staticperl)\n";
@@ -90,7 +93,7 @@
    my $package;
 
    while (<$fh>) {
-      if (/^\s*sub\s+([^[:space:];]+)\s*;?\s*$/) {
+      if (/^\s*sub\s+ ([^[:space:];]+) \s* (?:\([^)]*\))? \s*;?\s*$/x) {
          my $al = "auto/$package/$1.al";
          my $inc = find_inc $al;
 
@@ -211,6 +214,11 @@
    $pmbin{$as} = 1 if $_[1];
 }
 
+sub cmd_staticlib {
+   push @staticlibs, $_
+      for split /\s+/, $_[0];
+}
+
 sub cmd_file {
    open my $fh, "<", $_[0]
       or die "$_[0]: $!\n";
@@ -222,11 +230,17 @@
 
       if ($cmd eq "strip") {
          $STRIP = $args;
+      } elsif ($cmd eq "perl") {
+         $PERL = 1;
+      } elsif ($cmd eq "app") {
+         $APP = $args;
       } elsif ($cmd eq "eval") {
          trace_eval $_;
       } elsif ($cmd eq "use") {
          trace_module $_
             for split / /, $args;
+      } elsif ($cmd eq "staticlib") {
+         cmd_staticlib $args;
       } elsif ($cmd eq "boot") {
          cmd_boot $args;
       } elsif ($cmd eq "static") {
@@ -248,19 +262,24 @@
 Getopt::Long::Configure ("bundling", "no_auto_abbrev", "no_ignore_case");
 
 GetOptions
-   "strip=s"   => \$STRIP,
-   "verbose|v" => sub { ++$VERBOSE },
-   "quiet|q"   => sub { --$VERBOSE },
-   "perl"      => \$PERL,
-   "eval|e=s"  => sub { trace_eval   $_[1] },
-   "use|M=s"   => sub { trace_module $_[1] },
-   "boot=s"    => sub { cmd_boot     $_[1] },
-   "add=s"     => sub { cmd_add      $_[1], 0 },
-   "addbin=s"  => sub { cmd_add      $_[1], 1 },
-   "static"    => sub { $STATIC = 1 },
-   "<>"        => sub { cmd_file     $_[0] },
+   "strip=s"     => \$STRIP,
+   "verbose|v"   => sub { ++$VERBOSE },
+   "quiet|q"     => sub { --$VERBOSE },
+   "perl"        => \$PERL,
+   "app=s"       => \$APP,
+   "eval|e=s"    => sub { trace_eval    $_[1] },
+   "use|M=s"     => sub { trace_module  $_[1] },
+   "boot=s"      => sub { cmd_boot      $_[1] },
+   "add=s"       => sub { cmd_add       $_[1], 0 },
+   "addbin=s"    => sub { cmd_add       $_[1], 1 },
+   "static"      => sub { $STATIC = 1 },
+   "staticlib=s" => sub { cmd_staticlib $_[1] },
+   "<>"          => sub { cmd_file      $_[0] },
    or exit 1;
 
+die "cannot specify both --app and --perl\n"
+   if $PERL and defined $APP;
+
 my $data;
 my @index;
 my @order = sort {
@@ -613,12 +632,6 @@
   XSRETURN ($varpfx\_count);
 }
 
-static char *args[] = {
-  "staticperl",
-  "-e",
-  "0"
-};
-
 EOF
 
 #############################################################################
@@ -667,7 +680,39 @@
 #############################################################################
 # optional perl_init/perl_destroy
 
-if ($PERL) {
+if ($APP) {
+   print $fh <<EOF;
+
+int
+main (int argc, char *argv [])
+{
+  extern char **environ;
+  int exitstatus;
+
+  static char *args[] = {
+    "staticperl",
+    "-e",
+    "0"
+  };
+
+  PERL_SYS_INIT3 (&argc, &argv, &environ);
+  staticperl = perl_alloc ();
+  perl_construct (staticperl);
+
+  PL_exit_flags |= PERL_EXIT_DESTRUCT_END;
+
+  exitstatus = perl_parse (staticperl, staticperl_xs_init, sizeof (args) / sizeof (*args), args, environ);
+  if (!exitstatus)
+    perl_run (staticperl);
+
+  exitstatus = perl_destruct (staticperl);
+  perl_free (staticperl);
+  PERL_SYS_TERM ();
+
+  return exitstatus;
+}
+EOF
+} elsif ($PERL) {
    print $fh <<EOF;
 
 int
@@ -703,6 +748,12 @@
   int argc = sizeof (args) / sizeof (args [0]);
   char **argv = args;
 
+  static char *args[] = {
+    "staticperl",
+    "-e",
+    "0"
+  };
+
   PERL_SYS_INIT3 (&argc, &argv, &environ);
   staticperl = perl_alloc ();
   perl_construct (staticperl);
@@ -745,13 +796,17 @@
 {
    print "generating $PREFIX.ldopts... ";
 
-   my $str = $STATIC ? "--static " : "";
+   my $str = $STATIC ? "-static " : "";
 
    $str .= "$Config{ccdlflags} $Config{ldflags} @libs $Config{archlibexp}/CORE/$Config{libperl} $Config{perllibs}";
 
    my %seen;
    $str .= " $_" for grep !$seen{$_}++, ($extralibs =~ /(\S+)/g);
 
+   for (@staticlibs) {
+      $str =~ s/(^|\s) (-l\Q$_\E) ($|\s)/$1-Wl,-Bstatic $2 -Wl,-Bdynamic$3/gx;
+   }
+
    $str =~ s/([\(\)])/\\$1/g;
 
    print "$str\n\n";
@@ -761,8 +816,12 @@
    print $fh $str;
 }
 
-if ($PERL) {
-   system "$Config{cc} \$(cat bundle.ccopts\) -o perl bundle.c \$(cat bundle.ldopts\)";
+if ($PERL or defined $APP) {
+   $APP = "perl" unless defined $APP;
+
+   print "generating $APP...\n";
+
+   system "$Config{cc} \$(cat bundle.ccopts\) -o \Q$APP\E bundle.c \$(cat bundle.ldopts\)";
 
    unlink "$PREFIX.$_"
       for qw(ccopts ldopts c h);