Author: randyk Date: Mon Jan 10 20:54:19 2005 New Revision: 124882 URL: http://svn.apache.org/viewcvs?view=rev&rev=124882 Log: on Win32, ensure that the c-modules are linked against the just-built libapreq2.lib, as opposed to a possible version from a previous install under $APACHE2.
Modified: httpd/apreq/trunk/env/t/TEST.PL Modified: httpd/apreq/trunk/env/t/TEST.PL Url: http://svn.apache.org/viewcvs/httpd/apreq/trunk/env/t/TEST.PL?view=diff&rev=124882&p1=httpd/apreq/trunk/env/t/TEST.PL&r1=124881&p2=httpd/apreq/trunk/env/t/TEST.PL&r2=124882 ============================================================================== --- httpd/apreq/trunk/env/t/TEST.PL (original) +++ httpd/apreq/trunk/env/t/TEST.PL Mon Jan 10 20:54:19 2005 @@ -63,13 +63,17 @@ open $fh, ">$makefile" or die "open $makefile: $!"; if (WIN32) { + require File::Spec; my @goners = map {$name . '.' . $_} qw(exp ilk lib pdb so lo); + my $libs = join ' ', + (map {'-l' . File::Spec->catfile($env_dir_libs, $_)} + qw(libapreq2.lib)); print $fh <<EOF; APXS=$self->{APXS} all: $lib $lib: $name.c - \$(APXS) -L../../../win32/libs -I../../../src -llibapreq2 -llibhttpd $dversion -p -I$self->{cmodules_dir} -c $name.c + \$(APXS) -I../../../src $libs -llibhttpd $dversion -p -I$self->{cmodules_dir} -c $name.c clean: -erase @goners vc60.pdb
