Fix a couple of bugs with the script that generates the apr.exports file.

This script is really not extensible as it is currently written, but at
least it works for APR.


git-svn-id: https://svn.apache.org/repos/asf/apr/apr/trunk@60824 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 6 insertions, 6 deletions

diff --git a/helpers/make_export.pl b/helpers/make_export.pl
index d9ef5500d..659d549a0 100755
--- a/helpers/make_export.pl
+++ b/helpers/make_export.pl
@@ -31,10 +31,10 @@ while ($srcfile = shift(@ARGV)) {
     
         s/^\s*//;
         
-        if (/\#if (APR_HAS.*)/) {
+        if (/\#if(def)? (APR_.*)/) {
             $count++;
             $found++;
-            $macro = $1;
+            $macro = $2;
             $line = "$macro\n";
             next;
         }
@@ -53,14 +53,14 @@ while ($srcfile = shift(@ARGV)) {
         elsif (/\#endif/) {
             if ($count > 0) {
                 $count--;
-                $line .= "\\$macro\n";
+                $line .= "\/$macro\n";
             }
-            if ($found == 1) {
-                $found = 0;
+            if ($found == $count + 1) {
+                $found--;
                 $line = "";
                 next;
             }
-            elsif ($found > 1) {
+            elsif ($found > $count + 1) {
                 $found = 0;
             }
         }