perl-modperl-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From steve...@apache.org
Subject svn commit: r1543387 - in /perl/apxs/trunk: Configure.pl README apr_win32.pl apu_win32.pl apxs_win32 apxs_win32.pl
Date Tue, 19 Nov 2013 11:26:43 GMT
Author: stevehay
Date: Tue Nov 19 11:26:42 2013
New Revision: 1543387

URL: http://svn.apache.org/r1543387
Log:
Import http://archive.apache.org/dist/perl/win32-bin/apxs_win32-0.2.tar.gz

Modified:
    perl/apxs/trunk/Configure.pl
    perl/apxs/trunk/README
    perl/apxs/trunk/apr_win32.pl
    perl/apxs/trunk/apu_win32.pl
    perl/apxs/trunk/apxs_win32
    perl/apxs/trunk/apxs_win32.pl

Modified: perl/apxs/trunk/Configure.pl
URL: http://svn.apache.org/viewvc/perl/apxs/trunk/Configure.pl?rev=1543387&r1=1543386&r2=1543387&view=diff
==============================================================================
--- perl/apxs/trunk/Configure.pl (original)
+++ perl/apxs/trunk/Configure.pl Tue Nov 19 11:26:42 2013
@@ -3,10 +3,10 @@ use strict;
 use warnings;
 use Getopt::Long;
 require Win32;
-use File::Spec::Functions qw(catfile catdir);
 use Config;
 use ExtUtils::MakeMaker;
 use File::Basename;
+use File::Spec::Functions;
 require 'util.pl';
 
 BEGIN {
@@ -47,9 +47,8 @@ sub search {
     die "Can't find a suitable Apache2 installation!" 
         unless ($apache and -d $apache and check($apache));
     
-    $apache = Win32::GetShortPathName($apache) if $apache =~ / /;
-    $apache =~ s!\\!/!g;
-    $apache =~ s!/$!!;
+    $apache = Win32::GetShortPathName($apache);
+    $apache =~ s!\\$!!;
     my $ans = prompt(qq{\nUse "$apache" for your Apache2 directory?}, 'yes');
     unless ($ans =~ /^y/i) {
         die <<'END';
@@ -98,13 +97,13 @@ sub which {
         for my $drive (@drives) {
             for ('Apache2', 'Program Files/Apache2',
                  'Program Files/Apache Group/Apache2') {
-                my $bin = File::Spec->catpath($drive, $_, 'bin');
+                my $bin = catfile $drive, $_, 'bin';
                 push @extras, $bin if (-d $bin);
             }
         }
     }
     my @a = map {catfile($_, $program) } 
-        (File::Spec->path(), @extras);
+        (path(), @extras);
     for my $base(@a) {
         return $base if -x $base;
         for my $ext (@path_ext) {

Modified: perl/apxs/trunk/README
URL: http://svn.apache.org/viewvc/perl/apxs/trunk/README?rev=1543387&r1=1543386&r2=1543387&view=diff
==============================================================================
--- perl/apxs/trunk/README (original)
+++ perl/apxs/trunk/README Tue Nov 19 11:26:42 2013
@@ -1,12 +1,12 @@
-This distribution contains scripts to install the utilities
-apxs, apr-config, and apu-config on Win32 for use with Apache2.
-To install, at a DOS prompt run
-   perl Configure.pl
-which will attempt to find your top-level Apache2 directory.
-If this is unsuccessful, or the guess is wrong, run
-   perl Configure.pl --with-apache2=\Path\to\Apache2
-The utilties will be placed under \Path\to\Apache2\bin\.
-
-Randy Kobes <randy@theoryx5.uwinnipeg.ca>
-Aug 17, 2003
-
+This distribution contains scripts to install the utilities
+apxs, apr-config, and apu-config on Win32 for use with Apache2.
+To install, at a DOS prompt run
+   perl Configure.pl
+which will attempt to find your top-level Apache2 directory.
+If this is unsuccessful, or the guess is wrong, run
+   perl Configure.pl --with-apache2=\Path\to\Apache2
+The utilties will be placed under \Path\to\Apache2\bin\.
+
+Randy Kobes <randy@theoryx5.uwinnipeg.ca>
+March 17, 2004
+

Modified: perl/apxs/trunk/apr_win32.pl
URL: http://svn.apache.org/viewvc/perl/apxs/trunk/apr_win32.pl?rev=1543387&r1=1543386&r2=1543387&view=diff
==============================================================================
--- perl/apxs/trunk/apr_win32.pl (original)
+++ perl/apxs/trunk/apr_win32.pl Tue Nov 19 11:26:42 2013
@@ -88,7 +88,7 @@ my %apr_args = (APR_MAJOR_VERSION => $ve
                 LD => $Config{ld},
                 SHELL => $ENV{comspec},
                 CPPFLAGS => '',
-                CFLAGS => q{ /nologo /MD /W3 /O2 /D "WIN32" /D "_WINDOWS" /D "NDEBUG"
},
+                CFLAGS => q{ /nologo /MD /W3 /O2 /D WIN32 /D _WINDOWS /D NDEBUG },
                 LDFLAGS => q{ kernel32.lib /nologo /subsystem:windows /dll /machine:I386
},
 		LIBS => '',
                 EXTRA_INCLUDES => '',

Modified: perl/apxs/trunk/apu_win32.pl
URL: http://svn.apache.org/viewvc/perl/apxs/trunk/apu_win32.pl?rev=1543387&r1=1543386&r2=1543387&view=diff
==============================================================================
--- perl/apxs/trunk/apu_win32.pl (original)
+++ perl/apxs/trunk/apu_win32.pl Tue Nov 19 11:26:42 2013
@@ -88,7 +88,7 @@ my %apu_args = (APRUTIL_MAJOR_VERSION =>
                 LD => $Config{ld},
                 SHELL => $ENV{comspec},
                 CPPFLAGS => '',
-                CFLAGS => q{ /nologo /MD /W3 /O2 /D "WIN32" /D "_WINDOWS" /D "NDEBUG"
},
+                CFLAGS => q{ /nologo /MD /W3 /O2 /D WIN32 /D _WINDOWS /D NDEBUG },
                 LDFLAGS => q{ kernel32.lib /nologo /subsystem:windows /dll /machine:I386
},
                 LIBS => '',
                 EXTRA_INCLUDES => '',

Modified: perl/apxs/trunk/apxs_win32
URL: http://svn.apache.org/viewvc/perl/apxs/trunk/apxs_win32?rev=1543387&r1=1543386&r2=1543387&view=diff
==============================================================================
--- perl/apxs/trunk/apxs_win32 (original)
+++ perl/apxs/trunk/apxs_win32 Tue Nov 19 11:26:42 2013
@@ -22,6 +22,7 @@ require 5.003;
 use strict;
 package apxs;
 use File::Copy;
+use File::Spec::Functions;
 
 ##
 ##  Configuration
@@ -29,43 +30,46 @@ use File::Copy;
 
 my %config_vars = ();
 
-my $installbuilddir = "%exp_installbuilddir%";
+my $installbuilddir = '%exp_installbuilddir%';
 get_config_vars("$installbuilddir/config_vars.mk",\%config_vars);
 
 # read the configuration variables once
 
-my $prefix         = get_vars("prefix");
-my $CFG_PREFIX     = $prefix;
-my $exec_prefix    = get_vars("exec_prefix");
-my $datadir        = get_vars("datadir");
-my $localstatedir  = get_vars("localstatedir");
-my $CFG_TARGET     = get_vars("progname");
-my $CFG_SYSCONFDIR = get_vars("sysconfdir");
-my $CFG_SYSCONF    = get_vars("sysconf");
-my $CFG_CFLAGS     = join ' ', map { get_vars($_) }
+my $prefix          = get_vars('prefix');
+my $CFG_PREFIX      = $prefix;
+my $exec_prefix     = get_vars('exec_prefix');
+my $datadir         = get_vars('datadir');
+my $localstatedir   = get_vars('localstatedir');
+my $CFG_TARGET      = get_vars('progname');
+my $CFG_SYSCONFDIR  = get_vars('sysconfdir');
+my $CFG_SYSCONF     = get_vars('sysconf');
+my $CFG_CFLAGS      = join ' ', map { get_vars($_) }
     qw(SHLTCFLAGS CFLAGS NOTEST_CPPFLAGS EXTRA_CPPFLAGS EXTRA_CFLAGS);
-my $includedir     = get_vars("includedir");
-my $CFG_INCLUDEDIR = eval qq("$includedir");
-my $libdir         = get_vars("libdir");
-my $CFG_LIBDIR     = eval qq("$libdir");
-my $CFG_CC         = get_vars("CC");
-my $CFG_LD         = get_vars("LD");
-my $CFG_LDFLAGS    = get_vars("LDFLAGS");
-my $libexecdir     = get_vars("libexecdir");
-my $CFG_LIBEXECDIR = eval qq("$libexecdir");
-my $sbindir        = get_vars("sbindir");
-my $CFG_SBINDIR    = eval qq("$sbindir");
-my $ltflags        = $ENV{'LTFLAGS'};
-$ltflags or $ltflags = "--silent";
+my $includedir      = get_vars('includedir');
+my $CFG_INCLUDEDIR  = $includedir;
+my $libdir          = get_vars('libdir');
+my $CFG_LIBDIR      = $libdir;
+my $CFG_CC          = get_vars('CC');
+my $CFG_LD          = get_vars('LD');
+my $CFG_LDFLAGS     = get_vars('LDFLAGS');
+my $libexecdir      = get_vars('libexecdir');
+my $CFG_LIBEXECDIR  = $libexecdir;
+my $sbindir         = get_vars('sbindir');
+my $CFG_SBINDIR     = $sbindir;
+my $ltflags         = $ENV{LTFLAGS};
+my $apr_libname     = get_vars('APR_LIBNAME');
+my $aprutil_libname = get_vars('APRUTIL_LIBNAME');
+
+$ltflags or $ltflags = '--silent';
 
 my %internal_vars = map {$_ => 1}
     qw(TARGET CC CFLAGS CFLAGS_SHLIB LD_SHLIB LDFLAGS_SHLIB LIBS_SHLIB
        PREFIX SBINDIR INCLUDEDIR LIBEXECDIR SYSCONFDIR SYSCONF);
 
-my $CP    = "%CP%";
-my $CHMOD = "%CHMOD%";
-my $RM_F  = "%RM_F%";
-my $TOUCH = "%TOUCH%";
+my $CP    = '%CP%';
+my $CHMOD = '%CHMOD%';
+my $RM_F  = '%RM_F%';
+my $TOUCH = '%TOUCH%';
 
 ##
 ##  parse argument line
@@ -156,13 +160,16 @@ sub Getopts {
 }
 
 sub usage {
-    print STDERR "Usage: apxs -g [-S <var>=<val>] -n <modname>\n";
-    print STDERR "       apxs -q [-S <var>=<val>] <query> ...\n";
-    print STDERR "       apxs -c [-S <var>=<val>] [-o <dsofile>] [-D <name>[=<value>]]\n";
-    print STDERR "               [-I <incdir>] [-L <libdir>] [-l <libname>]
[-Wc,<flags>]\n";
-    print STDERR "               [-Wl,<flags>] [-p] <files> ...\n";
-    print STDERR "       apxs -i [-S <var>=<val>] [-a] [-A] [-n <modname>]
<dsofile> ...\n";
-    print STDERR "       apxs -e [-S <var>=<val>] [-a] [-A] [-n <modname>]
<dsofile> ...\n";
+    print STDERR <<'END';
+Usage: apxs -g [-S <var>=<val>] -n <modname>
+       apxs -q [-S <var>=<val>] <query> ...
+       apxs -c [-S <var>=<val>] [-o <dsofile>] [-D <name>[=<value>]]
+               [-I <incdir>] [-L <libdir>] [-l <libname>] [-Wc,<flags>]
+               [-Wl,<flags>] [-p] <files> ...
+       apxs -i [-S <var>=<val>] [-a] [-A] [-n <modname>] <dsofile>
...
+       apxs -e [-S <var>=<val>] [-a] [-A] [-n <modname>] <dsofile>
...
+
+END
     exit(1);
 }
 
@@ -203,19 +210,15 @@ if (@opt_S) {
 ##
 ##  Initial shared object support check
 ##
-my $httpd = get_vars("sbindir") . "/" . get_vars("progname");
-$httpd = eval qq("$httpd");
-$httpd = eval qq("$httpd");
-my $envvars = get_vars("sbindir") . "/envvars";
-$envvars = eval qq("$envvars");
-$envvars = eval qq("$envvars");
+my $httpd = catfile get_vars("sbindir"), get_vars("progname");
+my $envvars = catfile get_vars("sbindir"), "envvars";
 
 #allow apxs to be run from the source tree, before installation
 if ($0 =~ m:support/apxs$:) {
     ($httpd = $0) =~ s:support/apxs$::;
 }
 
-unless (-f "$httpd") {
+unless (-f $httpd) {
     error("$httpd not found or not executable");
     exit 1;
 }
@@ -242,8 +245,8 @@ sub get_vars {
                 ? $config_vars{$arg}
                     : $config_vars{lc $arg};
             $val =~ s/[()]//g;
-            $result .= eval "qq($val)" if defined $val;
-            $result .= ";;";
+            $result .= $val if defined $val;
+            $result .= ";;"; 
             $ok = 1;
         }
         if (not $ok) {
@@ -251,7 +254,7 @@ sub get_vars {
                 or exists $internal_vars{lc $arg}) {
                 my $val = exists $internal_vars{$arg} ? $arg : lc $arg;
                 $val = eval "\$CFG_$val";
-                $result .= eval "qq($val)" if defined $val;
+                $result .= $val if defined $val;
                 $result .= ";;";
                 $ok = 1;
             }
@@ -333,8 +336,8 @@ if ($opt_q) {
 my $apr_bindir = get_vars("APR_BINDIR");
 my $apu_bindir = get_vars("APU_BINDIR");
 
-my $apr_includedir = "-I$prefix/include";
-my $apu_includedir = "-I$prefix/include";
+my $apr_includedir = qq{-I"$prefix/include"};
+my $apu_includedir = qq{-I$"prefix/include"};
 
 if ($opt_c) {
     ##
@@ -403,7 +406,7 @@ if ($opt_c) {
         $la =~ s|\.c$|.la|;
         my $o = $s;
         $o =~ s|\.c$|.o|;
-        push(@cmds, "$CFG_CC $cflags -I$CFG_INCLUDEDIR $opt /c /Fo$lo $s");
+        push(@cmds, qq{$CFG_CC $cflags -I"$CFG_INCLUDEDIR" $opt /c /Fo$lo $s});
         unshift(@objs, $lo);
     }
 
@@ -431,9 +434,7 @@ if ($opt_c) {
     }
 
     if ($opt_p == 1) {
-        my $apr_libs = qq{$prefix/lib/libapr.lib};
-        my $apu_libs = qq{$prefix/lib/libaprutil.lib};
-        $opt .= " ".$apu_libs." ".$apr_libs;
+        $opt .= " ".$aprutil_libname." ".$apr_libname;
     }
     else {
         my $apr_ldflags;
@@ -483,14 +484,14 @@ if ($opt_i or $opt_e) {
 
         if ($opt_i) {
             push(@cmds, "$CP $f $CFG_LIBEXECDIR");
-            push(@cmds, "$CHMOD 755 $CFG_LIBEXECDIR/$t");
+            push(@cmds, "$CHMOD 755 $CFG_LIBEXECDIR\\$t");
             if (-f $libf) {
                 push(@cmds, "$CP $libf $CFG_LIBDIR");
-                push(@cmds, "$CHMOD 755 $CFG_LIBDIR/$libt");
+                push(@cmds, "$CHMOD 755 $CFG_LIBDIR\\$libt");
             }
             if ($opt_d and -f $pdbf) {
                 push(@cmds, "$CP $pdbf $CFG_LIBEXECDIR");
-                push(@cmds, "$CHMOD 755 $CFG_LIBEXECDIR/$pdbt");
+                push(@cmds, "$CHMOD 755 $CFG_LIBEXECDIR\\$pdbt");
             }
         }
 
@@ -529,8 +530,10 @@ if ($opt_i or $opt_e) {
         my $dir = $CFG_LIBEXECDIR;
         $dir =~ s|^$CFG_PREFIX/?||;
         $dir =~ s|(.)$|$1/|;
+        $dir =~ s|\\|/|g;
         $t =~ s|\.la$|.so|;
-        push(@lmd, sprintf("LoadModule %-18s %s", "${name}_module", "$dir$t"));
+        push(@lmd, 
+             sprintf("LoadModule %-18s %s", "${name}_module", qq{"$dir$t"}));
         push(@amd, sprintf("AddModule %s", $filename));
     }
 
@@ -630,7 +633,7 @@ if ($opt_i or $opt_e) {
                 $content =~ s|^(.*\n)\#?\s*$lmd[^\n]*\n|$1$c$lmd\n|s;
             }
             $lmd =~ m|LoadModule\s+(.+?)_module.*|;
-            notice("[$what module `$1' in $CFG_SYSCONFDIR/$CFG_SYSCONF]");
+            notice("[$what module `$1' in $CFG_SYSCONFDIR\\$CFG_SYSCONF]");
         } 
         my $amd;
         foreach $amd (@amd) {
@@ -643,20 +646,21 @@ if ($opt_i or $opt_e) {
         }
 
         if (@lmd or @amd) {
-            if (open(FP, ">$CFG_SYSCONFDIR/$CFG_SYSCONF.new")) {
+            my $conf = catfile $CFG_SYSCONFDIR, $CFG_SYSCONF;
+            my $conf_new = $conf . '.new';
+            my $conf_bak = $conf . '.bak';
+            if (open(FP, '>', $conf_new)) {
                 print FP $content;
                 close(FP);
-                copy("$CFG_SYSCONFDIR/$CFG_SYSCONF", 
-                     "$CFG_SYSCONFDIR/$CFG_SYSCONF.bak") or
-                         die "Backup of $CFG_SYSCONFDIR/$CFG_SYSCONF failed: $!";
-                copy("$CFG_SYSCONFDIR/$CFG_SYSCONF.new",
-                     "$CFG_SYSCONFDIR/$CFG_SYSCONF") or
-                         die "Copying $CFG_SYSCONFDIR/$CFG_SYSCONF.new to $CFG_SYSCONFDIR/$CFG_SYSCONF
failed: $!";
-                unlink "$CFG_SYSCONFDIR/$CFG_SYSCONF.new" or
-                    die "Removing $CFG_SYSCONFDIR/$CFG_SYSCONF.new failed: $!";
+                copy($conf, $conf_bak) or
+                         die "Backup of $conf failed: $!";
+                copy($conf_new, $conf) or
+                         die "Copying $conf_new to $conf failed: $!";
+                unlink $conf_new or
+                    die "Removing $conf_new failed: $!";
             } 
             else {
-                notice("unable to open configuration file");
+                notice("unable to open configuration file $conf_new");
             }
         }
     }

Modified: perl/apxs/trunk/apxs_win32.pl
URL: http://svn.apache.org/viewvc/perl/apxs/trunk/apxs_win32.pl?rev=1543387&r1=1543386&r2=1543387&view=diff
==============================================================================
--- perl/apxs/trunk/apxs_win32.pl (original)
+++ perl/apxs/trunk/apxs_win32.pl Tue Nov 19 11:26:42 2013
@@ -5,6 +5,7 @@ use Getopt::Long;
 require Win32;
 use Config;
 use ExtUtils::MakeMaker;
+use File::Spec::Functions;
 require 'util.pl';
 my ($apache, $help);
 GetOptions( 'with-apache2=s' => \$apache,
@@ -20,9 +21,8 @@ die "Can't find a suitable Apache2 insta
     unless (-d $apache and check($apache));
 
 $apache = Win32::GetShortPathName($apache);
-$apache =~ s!\\!/!g;
 
-(my $perl = which('perl')) =~ s!\\!/!g;
+my $perl = which('perl');
 my %subs_cfg = (
                 '%APACHE2%' => $apache,
                 '%AWK%' => which('awk') || which('gawk') || '',
@@ -33,17 +33,79 @@ my %subs_cfg = (
                );
 
 my $pat = join '|', keys %subs_cfg;
-my $build_dir = $apache . '/build';
-my $cfg_mk = $build_dir . '/config_vars.mk';
+my $build_dir = catdir $apache, 'build';
+my $cfg_mk = catfile $build_dir, 'config_vars.mk';
 unless (-d $build_dir) {
     mkdir $build_dir or die "Cannot mkdir $build_dir: $!";
 }
+
+my $prefix = $apache;
+my $exec_prefix = $prefix;
+my $datadir = ${prefix};
+my $localstatedir = ${prefix};
+
+my ($aprutil_libname, $apr_libname);
+my $libdir = catdir $exec_prefix, 'lib';
+opendir(my $apr_dir, $libdir) or die "Cannot opendir $libdir: $!";
+my @libs = readdir $apr_dir;
+closedir $apr_dir;
+foreach (@libs) {
+    if (/^libaprutil\b\S+lib$/) {
+        $aprutil_libname = $_;
+        next;
+    }
+    if (/^libapr\b\S+lib$/) {
+        $apr_libname = $_;
+        next;
+    }
+}
+die "Cannot determine apr lib names" 
+    unless ($aprutil_libname and $apr_libname);
+
+my %dirs = (prefix => $prefix,
+            exec_prefix => $exec_prefix,
+            datadir => $datadir,
+            localstatedir => $localstatedir,
+            bindir => catdir($exec_prefix, 'bin'),
+            sbindir => catdir($exec_prefix, 'bin'),
+            cgidir => catdir($datadir, 'cgi-bin'),
+            logfiledir => catdir($localstatedir, 'logs'),
+            mandir => catdir($prefix, 'man'),
+            libdir => $libdir,
+            libexecdir => catdir($exec_prefix, 'modules'),
+            htdocsdir => catdir($datadir, 'htdocs'),
+            manualdir => catdir($datadir, 'manual'),
+            includedir => catdir($prefix, 'include'),
+            errordir => catdir($datadir, 'error'),
+            iconsdir => catdir($datadir, 'icons'),
+            sysconfdir => catdir($prefix, 'conf'),
+            installbuilddir => catdir($datadir, 'build'),
+            runtimedir => catdir($localstatedir, 'logs'),
+            proxycachedir => catdir($localstatedir, 'proxy'),
+            APR_BINDIR => catdir($apache, 'bin'),
+            APU_BINDIR => catdir($apache, 'bin'),
+            APR_INCLUDEDIR => catdir($apache, 'include'),
+            APU_INCLUDEDIR => catdir($apache, 'include'),
+            APRUTIL_LIBNAME => catfile($libdir, $aprutil_libname),
+            APR_LIBNAME => catfile($libdir, $apr_libname),
+          );
+
 open(my $cfg, ">$cfg_mk")
     or die qq{Cannot open $cfg_mk: $!};
 while (<DATA>) {
+    if (/^rel_(\S+) = (\S+)/) {
+        my $dir = $1; next unless $dir;
+        my $val = $2;
+        print $cfg $_;
+        print $cfg "exp_$dir = ", catdir($apache, $val), $/;
+        next;
+    }
     s/($pat)/$subs_cfg{$1}/;
     print $cfg $_;
 }
+foreach (keys %dirs) {
+    print $cfg "$_ = $dirs{$_}\n";
+}
 close $cfg;
 
 my %subs_apxs = (
@@ -55,7 +117,7 @@ my %subs_apxs = (
                  '%TOUCH%' => qq{$perl -MExtUtils::Command -e touch},
                  );
 $pat = join '|', keys %subs_apxs;
-my $apxs_out = $apache . '/bin/apxs.pl';
+my $apxs_out = catfile $apache, 'bin', 'apxs.pl';
 my $apxs_in = 'apxs_win32';
 open(my $out, ">$apxs_out")
     or die "Cannot open $apxs_out: $!";
@@ -75,39 +137,22 @@ print qq{\napxs.bat has been created und
 __DATA__
 exp_exec_prefix = %APACHE2%
 rel_exec_prefix =
-exp_bindir = %APACHE2%/bin
 rel_bindir = bin
-exp_sbindir = %APACHE2%/bin
 rel_sbindir = bin
-exp_libdir = %APACHE2%/lib
 rel_libdir = lib
-exp_libexecdir = %APACHE2%/modules
 rel_libexecdir = modules
-exp_sysconfdir = %APACHE2%/conf
 rel_sysconfdir = conf
-exp_datadir = %APACHE2%
 rel_datadir =
-exp_installbuilddir = %APACHE2%/build
 rel_installbuilddir = build
-exp_errordir = %APACHE2%/error
 rel_errordir = error
-exp_iconsdir = %APACHE2%/icons
 rel_iconsdir = icons
-exp_htdocsdir = %APACHE2%/htdocs
 rel_htdocsdir = htdocs
-exp_manualdir = %APACHE2%/manual
 rel_manualdir = manual
-exp_cgidir = %APACHE2%/cgi-bin
 rel_cgidir = cgi-bin
-exp_includedir = %APACHE2%/include
 rel_includedir = include
-exp_localstatedir = %APACHE2%
 rel_localstatedir =
-exp_runtimedir = %APACHE2%/logs
 rel_runtimedir = logs
-exp_logfiledir = %APACHE2%/logs
 rel_logfiledir = logs
-exp_proxycachedir = %APACHE2%/proxy
 rel_proxycachedir = proxy
 SHLTCFLAGS = 
 LTCFLAGS =
@@ -135,26 +180,7 @@ AP_LIBS =
 AP_BUILD_SRCLIB_DIRS = apr apr-util
 AP_CLEAN_SRCLIB_DIRS = apr-util apr
 abs_srcdir = 
-bindir = ${exec_prefix}/bin
-sbindir = ${exec_prefix}/bin
-cgidir = ${datadir}/cgi-bin
-logfiledir = ${localstatedir}/logs
-exec_prefix = ${prefix}
-datadir = ${prefix}
-localstatedir = ${prefix}
-mandir = ${prefix}/man
-libdir = ${exec_prefix}/lib
-libexecdir = ${exec_prefix}/modules
-htdocsdir = ${datadir}/htdocs
-manualdir = ${datadir}/manual
-includedir = ${prefix}/include
-errordir = ${datadir}/error
-iconsdir = ${datadir}/icons
-sysconfdir = ${prefix}/conf
 sysconf = httpd.conf
-installbuilddir = ${datadir}/build
-runtimedir = ${localstatedir}/logs
-proxycachedir = ${localstatedir}/proxy
 other_targets =
 unix_progname = httpd
 prefix = %APACHE2%
@@ -164,10 +190,10 @@ LD = %LD%
 CPP = %CPP%
 CXX =
 CPPFLAGS =
-CFLAGS = /nologo /MD /W3 /O2 /D "WIN32" /D "_WINDOWS" /D "NDEBUG"
+CFLAGS = /nologo /MD /W3 /O2 /D WIN32 /D _WINDOWS /D NDEBUG
 CXXFLAGS =
 LTFLAGS =
-LDFLAGS = kernel32.lib /nologo /subsystem:windows /dll /machine:I386 /libpath:"${prefix}/lib"
+LDFLAGS = kernel32.lib /nologo /subsystem:windows /dll /machine:I386 /libpath:"%APACHE2%\lib"
 LT_LDFLAGS = 
 SH_LDFLAGS =
 HTTPD_LDFLAGS =
@@ -200,7 +226,3 @@ SH_LIBTOOL =
 MK_IMPLIB =
 INSTALL_PROG_FLAGS =
 DSO_MODULES =
-APR_BINDIR = %APACHE2%/bin
-APR_INCLUDEDIR = 
-APU_BINDIR = %APACHE2%/bin
-APU_INCLUDEDIR = 



Mime
View raw message