cvs commit: httpd-apreq-2/win32 Configure.pl README libapreq2_cgi.mak

[ra...@apache.org]

randyk      2003/10/29 18:22:18

  Modified:    win32    Configure.pl README
  Removed:     win32    libapreq2_cgi.mak
  Log:
  update/cleanup Win32 build:
  - remove libapreq2_cgi.mak, as it's no longer being used
  - install libapreq2.dll into $(APACHE)\bin\
  - update README to reflect new targets and give location of Win32 apxs tarball
  
  Revision  Changes    Path
  1.24      +3 -3      httpd-apreq-2/win32/Configure.pl
  
  Index: Configure.pl
  ===================================================================
  RCS file: /home/cvs/httpd-apreq-2/win32/Configure.pl,v
  retrieving revision 1.23
  retrieving revision 1.24
  diff -u -r1.23 -r1.24
  --- Configure.pl	27 Oct 2003 06:55:24 -0000	1.23
  +++ Configure.pl	30 Oct 2003 02:22:18 -0000	1.24
  @@ -129,7 +129,7 @@
   }
   
   close $make;
  -generate_defs();
  +# generate_defs();
   
   print << "END";
   
  @@ -422,8 +422,8 @@
   !IF EXIST("$(LIBDIR)\$(LIBAPREQ).lib")
   	copy "$(LIBAPREQ).lib" "$(APACHE_LIB)\$(LIBAPREQ).lib"
   !ENDIF
  -!IF EXIST("$(LIBDIR)\$(CGI).lib")
  -	copy "$(CGI).lib" "$(APACHE_LIB)\$(CGI).lib"
  +!IF EXIST("$(LIBDIR)\$(LIBAPREQ).dll")
  +        copy "$(LIBAPREQ).dll" "$(APACHE)\bin\$(LIBAPREQ).dll"
   !ENDIF
           cd $(APREQ_HOME)
   
  
  
  
  1.4       +16 -8     httpd-apreq-2/win32/README
  
  Index: README
  ===================================================================
  RCS file: /home/cvs/httpd-apreq-2/win32/README,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- README	6 Aug 2003 05:26:24 -0000	1.3
  +++ README	30 Oct 2003 02:22:18 -0000	1.4
  @@ -1,6 +1,7 @@
   This directory contains the necessary makefiles to build
  -libapreq and related things on Win32 using VC++ 6. Run
  -   perl Configure.pl
  +libapreq and related things on Win32 using VC++ 6. Run,
  +from the httpd-apreq-2 top-level directory,
  +   perl Makefile.PL
   to generate the top-level Makefile. Available options are:
   
     --with-apache2=C:\Path\to\Apache2 : specify the top-level Apache2 directory
  @@ -14,16 +15,23 @@
   Assuming the configuration is successful, a Makefile will
   be generated. This can be used as:
   
  -  nmake               - builds the libapreq library
  +  nmake               - builds the libapreq2 library
     nmake test          - runs the supplied tests
     nmake mod_apreq     - builds mod_apreq
  -  nmake libapreq_cgi  - builds libapreq_cgi
  +  nmake install       - install the C libraries
     nmake clean         - clean
  +  nmake perl_glue     - build the perl glue
  +  nmake perl_test     - test the perl glue
  +  nmake perl_install  - install the perl glue
     nmake docs          - build documentation
  +  nmake help          - print a usage message
   
   The 'docs' target is only available if a doxygen binary is detected.
   
  -An experimental apxs tool for Win32 is included here, which will be
  -needed to build the env/c-modules tests. To install it, run
  -   perl apxs_win32_PL
  -which will lead you through an installation dialogue.
  +An experimental apxs tool for Win32 is available at
  +   http://perl.apache.org/dist/win32-bin/apxs_win32.tar.gz
  +which will be needed to build the env/c-modules tests. If the
  +apxs bat file isn't found on your system, the configuration
  +script should offer to fetch and install it for you. If this
  +is not done, grab the above archive, unpack it, and run the
  +Configure.pl script within the archive to install.