[120073] branches/release_2_3/base

[cal at macports.org]

Revision: 120073
          https://trac.macports.org/changeset/120073
Author:   cal at macports.org
Date:     2014-05-14 15:30:42 -0700 (Wed, 14 May 2014)
Log Message:
-----------
Merge r120060 from trunk, regenerate configure

 base: Search for BSD mtree as fmtree (which is what it's called on some Linux distros)

Revision Links:
--------------
    https://trac.macports.org/changeset/120060

Modified Paths:
--------------
    branches/release_2_3/base/configure
    branches/release_2_3/base/configure.ac

Property Changed:
----------------
    branches/release_2_3/base/


Property changes on: branches/release_2_3/base
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/gsoc08-privileges/base:37343-46937
/branches/gsoc09-logging/base:51231-60371
/branches/gsoc11-rev-upgrade/base:78828-88375
/branches/gsoc11-statistics/base:79520,79666
/branches/gsoc13-tests:106692-111324
/branches/universal-sanity/base:51872-52323
/branches/variant-descs-14482/base:34469-34855,34900-37508,37511-37512,41040-41463,42575-42626,42640-42659
/trunk/base:118038-118039,118056,118161,118559,118562-118569,118598-118599,118602-118603,118606-118607,118640,119169,119171,119175,119204,119297,119987,119992,120036,120038,120059,120064,120067-120069
/users/perry/base-bugs_and_notes:45682-46060
/users/perry/base-select:44044-44692
   + /branches/gsoc08-privileges/base:37343-46937
/branches/gsoc09-logging/base:51231-60371
/branches/gsoc11-rev-upgrade/base:78828-88375
/branches/gsoc11-statistics/base:79520,79666
/branches/gsoc13-tests:106692-111324
/branches/universal-sanity/base:51872-52323
/branches/variant-descs-14482/base:34469-34855,34900-37508,37511-37512,41040-41463,42575-42626,42640-42659
/trunk/base:118038-118039,118056,118161,118559,118562-118569,118598-118599,118602-118603,118606-118607,118640,119169,119171,119175,119204,119297,119987,119992,120036,120038,120059-120060,120064,120067-120069
/users/perry/base-bugs_and_notes:45682-46060
/users/perry/base-select:44044-44692

Modified: branches/release_2_3/base/configure
===================================================================
--- branches/release_2_3/base/configure	2014-05-14 22:29:40 UTC (rev 120072)
+++ branches/release_2_3/base/configure	2014-05-14 22:30:42 UTC (rev 120073)
@@ -5191,8 +5191,10 @@
 fi
 
 
-# Extract the first word of "mtree", so it can be a program name with args.
-set dummy mtree; ac_word=$2
+for ac_prog in mtree fmtree
+do
+  # Extract the first word of "$ac_prog", so it can be a program name with args.
+set dummy $ac_prog; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
 if ${ac_cv_path_MTREE+:} false; then :
@@ -5232,6 +5234,9 @@
 fi
 
 
+  test -n "$MTREE" && break
+done
+
 # Extract the first word of "open", so it can be a program name with args.
 set dummy open; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5

Modified: branches/release_2_3/base/configure.ac
===================================================================
--- branches/release_2_3/base/configure.ac	2014-05-14 22:29:40 UTC (rev 120072)
+++ branches/release_2_3/base/configure.ac	2014-05-14 22:30:42 UTC (rev 120073)
@@ -128,7 +128,7 @@
 AC_PATH_PROG(MDFIND, [mdfind], [])
 AC_PATH_PROG(MDLS, [mdls], [])
 AC_PATH_PROG(MKBOM, [mkbom], [])
-AC_PATH_PROG(MTREE, [mtree], [], [$PATH:/usr/sbin])
+AC_PATH_PROGS(MTREE, [mtree fmtree], [], [$PATH:/usr/sbin])
 AC_PATH_PROG(OPEN, [open], [])
 AC_PATH_PROG(OPENSSL, [openssl], [])
 AC_PATH_PROG(PATCH, [patch], [])
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20140514/541efaba/attachment.html>