[CalendarServer-changes] [12298] twext/trunk/bin/_build.sh

[source_changes at macosforge.org]

Revision: 12298
          http://trac.calendarserver.org//changeset/12298
Author:   wsanchez at apple.com
Date:     2014-01-10 17:48:06 -0800 (Fri, 10 Jan 2014)
Log Message:
-----------
make vars local

Modified Paths:
--------------
    twext/trunk/bin/_build.sh

Modified: twext/trunk/bin/_build.sh
===================================================================
--- twext/trunk/bin/_build.sh	2014-01-11 01:32:12 UTC (rev 12297)
+++ twext/trunk/bin/_build.sh	2014-01-11 01:48:06 UTC (rev 12298)
@@ -52,10 +52,10 @@
 #   Assert that ldap.h is present with a version >= 20344
 #     find_header "ldap.h" 20344 "LDAP_VENDOR_VERSION"
 find_header () {
-  sys_header="$1"; shift;
+  local sys_header="$1"; shift;
   if [ $# -ge 1 ]; then
-        min_version="$1"; shift;
-      version_macro="$1"; shift;
+      local   min_version="$1"; shift;
+      local version_macro="$1"; shift;
   fi;
 
   # No min_version given:
@@ -67,7 +67,7 @@
   fi;
 
   # Check for presence of a header of specified version
-  found_version="$(printf "#include <${sys_header}>\n${version_macro}\n" | cc -x c -E - | tail -1)";
+  local found_version="$(printf "#include <${sys_header}>\n${version_macro}\n" | cc -x c -E - | tail -1)";
 
   if [ "${found_version}" == "${version_macro}" ]; then
     # Macro was not replaced
@@ -452,7 +452,7 @@
       --disable-bdb --disable-hdb;
   fi;
 
-  if find_header sasl/sasl.h; then
+  if find_header sasl.h; then
     using_system "SASL";
   else
     local v="2.1.26";
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20140312/6786f83e/attachment.html>