cvs commit: apr/build jlibtool.c

[je...@apache.org]

jerenkrantz    2004/11/12 08:34:10

  Modified:    .        CHANGES
               build    jlibtool.c
  Log:
  Get jlibtool to build httpd-2.1 successfully as mod_ssl now require
  -export-symbols-regexp option to be handled...
  
  Revision  Changes    Path
  1.493     +3 -0      apr/CHANGES
  
  Index: CHANGES
  ===================================================================
  RCS file: /home/cvs/apr/CHANGES,v
  retrieving revision 1.492
  retrieving revision 1.493
  diff -u -u -r1.492 -r1.493
  --- CHANGES	24 Sep 2004 23:18:06 -0000	1.492
  +++ CHANGES	12 Nov 2004 16:34:10 -0000	1.493
  @@ -1,5 +1,8 @@
   Changes for APR 1.1 [Deferring these features when 1.0 is rolled out.]
   
  +  *) jlibtool: Ignore '-export-symbols-regexp' option.
  +     [Justin Erenkrantz]
  +
     *) fix apr_file_dup and apr_file_dup2 win32 implementations
        to create a mutex [Steve Hay <steve.hay uk.radan.com>]
   
  
  
  
  1.15      +5 -1      apr/build/jlibtool.c
  
  Index: jlibtool.c
  ===================================================================
  RCS file: /home/cvs/apr/build/jlibtool.c,v
  retrieving revision 1.14
  retrieving revision 1.15
  diff -u -u -r1.14 -r1.15
  --- jlibtool.c	1 Oct 2004 10:23:31 -0000	1.14
  +++ jlibtool.c	12 Nov 2004 16:34:10 -0000	1.15
  @@ -1095,7 +1095,7 @@
       char *arg;
       int argused;
   
  -    for (a=1; a < argc; a++) {
  +    for (a = 1; a < argc; a++) {
           arg = argv[a];
           argused = 1;
   
  @@ -1120,6 +1120,10 @@
                   } else if (strcmp(arg+1, "version-info") == 0) {
                       /* Store for later deciphering */
                       cmd_data->version_info = argv[++a];
  +                    argused = 1;
  +                } else if (strcmp(arg+1, "export-symbols-regex") == 0) {
  +                    /* Skip the argument. */
  +                    ++a;
                       argused = 1;
                   }
               }