View | Details | Raw Unified | Return to bug 58926
Collapse All | Expand All

(-)a/support/apxs.in (-10 / +1 lines)
Lines 506-513 if ($opt_i or $opt_e) { Link Here
506
	    push(@cmds, "chmod 755 $CFG_LIBEXECDIR/$t");
506
	    push(@cmds, "chmod 755 $CFG_LIBEXECDIR/$t");
507
        }
507
        }
508
508
509
        #   determine module symbolname and filename
509
        #   determine module symbolname
510
        my $filename = '';
511
        if ($name eq 'unknown') {
510
        if ($name eq 'unknown') {
512
            $name = '';
511
            $name = '';
513
            my $base = $f;
512
            my $base = $f;
Lines 518-532 if ($opt_i or $opt_e) { Link Here
518
                close(FP);
517
                close(FP);
519
                if ($content =~ m|.*AP_DECLARE_MODULE\s*\(\s*([a-zA-Z0-9_]+)\s*\)\s*=.*|s || $content =~ m|.*module\s+(?:AP_MODULE_DECLARE_DATA\s+)?([a-zA-Z0-9_]+)_module\s*=\s*.*|s) {
518
                if ($content =~ m|.*AP_DECLARE_MODULE\s*\(\s*([a-zA-Z0-9_]+)\s*\)\s*=.*|s || $content =~ m|.*module\s+(?:AP_MODULE_DECLARE_DATA\s+)?([a-zA-Z0-9_]+)_module\s*=\s*.*|s) {
520
                    $name = "$1";
519
                    $name = "$1";
521
                    $filename = "$base.c";
522
                    $filename =~ s|^[^/]+/||;
523
                }
520
                }
524
            }
521
            }
525
            if ($name eq '') {
522
            if ($name eq '') {
526
                if ($base =~ m|.*mod_([a-zA-Z0-9_]+)|) {
523
                if ($base =~ m|.*mod_([a-zA-Z0-9_]+)|) {
527
                    $name = "$1";
524
                    $name = "$1";
528
                    $filename = $base;
529
                    $filename =~ s|^[^/]+/||;
530
                }
525
                }
531
            }
526
            }
532
            if ($name eq '') {
527
            if ($name eq '') {
Lines 535-543 if ($opt_i or $opt_e) { Link Here
535
                exit(1);
530
                exit(1);
536
            }
531
            }
537
        }
532
        }
538
        if ($filename eq '') {
539
            $filename = "mod_${name}.c";
540
        }
541
        my $dir = $CFG_LIBEXECDIR;
533
        my $dir = $CFG_LIBEXECDIR;
542
        $dir =~ s|^$CFG_PREFIX/?||;
534
        $dir =~ s|^$CFG_PREFIX/?||;
543
        $dir =~ s|(.)$|$1/|;
535
        $dir =~ s|(.)$|$1/|;
544
- 

Return to bug 58926