[88377] trunk/base

[cal at macports.org]

Revision: 88377
          http://trac.macports.org/changeset/88377
Author:   cal at macports.org
Date:     2011-12-29 16:38:54 -0800 (Thu, 29 Dec 2011)
Log Message:
-----------
rev-upgrade: Fix build issue when no SWIG is found during configure

Modified Paths:
--------------
    trunk/base/configure
    trunk/base/configure.ac

Modified: trunk/base/configure
===================================================================
--- trunk/base/configure	2011-12-30 00:17:49 UTC (rev 88376)
+++ trunk/base/configure	2011-12-30 00:38:54 UTC (rev 88377)
@@ -5800,7 +5800,8 @@
   ;;
   *)
   as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
+as_dummy="$PATH:/usr/local/bin"
+for as_dir in $as_dummy
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
@@ -5814,7 +5815,6 @@
   done
 IFS=$as_save_IFS
 
-  test -z "$ac_cv_path_SWIG" && ac_cv_path_SWIG="$PATH:/usr/local/bin"
   ;;
 esac
 fi

Modified: trunk/base/configure.ac
===================================================================
--- trunk/base/configure.ac	2011-12-30 00:17:49 UTC (rev 88376)
+++ trunk/base/configure.ac	2011-12-30 00:38:54 UTC (rev 88377)
@@ -126,7 +126,7 @@
 AC_PATH_PROG(PAX, [pax], [])
 AC_PATH_PROG(XAR, [xar], [])
 AC_PATH_PROG(OPEN, [open], [])
-AC_PATH_PROG(SWIG, [swig], [$PATH:/usr/local/bin])
+AC_PATH_PROG(SWIG, [swig], [], [$PATH:/usr/local/bin])
 
 # Define some precious variables allowing user to override PATH for some programs
 AC_ARG_VAR(MTREE, [path to mtree command])
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20111229/2a8feb13/attachment.html>