Get rid of some uninitialized value errors with apxs -q.

Submitted by:	Stas Bekman <stas@stason.org>
Reviewed by:	Heinrich G�tzger <goetzger@gmx.net>, Cliff Woolley

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

diff --git a/CHANGES b/CHANGES
index f1861ea27206f821fe861a6ab0b0fa2ef0b8d362..2f2349fe45e71002e15bc327dd61cb7cbca8be2c 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,5 +1,8 @@
 Changes with Apache 2.0.37
 
+  *) Get rid of uninitialized value errors with "apxs -q" on certain
+     variables.  [Stas Bekman <stas@stason.org>]
+
   *) Fix apxs to allow it to work when the build directory is somewhere
      besides server-root/build.  PR 8453  
      [Jeff Trawick and a host of others]

diff --git a/support/apxs.in b/support/apxs.in
index e57d5ed6d8983860a4986e78c752d1541ad2d6cb..f6f1e38f8461a835f06352692bb465a4f5623d57 100644 (file)
--- a/support/apxs.in
+++ b/support/apxs.in
@@ -269,7 +269,7 @@ sub get_vars {
                 ? $config_vars{$arg}
                 : $config_vars{lc $arg};
             $val =~ s/[()]//g;
-            $result .= eval "qq($val)";
+            $result .= eval "qq($val)" if defined $val;
             $result .= ";;";
             $ok = 1;
         }
@@ -277,7 +277,7 @@ sub get_vars {
             if (exists $internal_vars{$arg} or exists $internal_vars{lc $arg}) {
                 my $val = exists $internal_vars{$arg} ? $arg : lc $arg;
                 $val = eval "\$CFG_$val";
-                $result .= eval "qq($val)";
+                $result .= eval "qq($val)" if defined $val;
                 $result .= ";;";
                 $ok = 1;
             }