[81175] branches/release_2_0/base

afb at macports.org afb at macports.org
Tue Jul 26 04:46:08 PDT 2011 

Revision: 81175
          http://trac.macports.org/changeset/81175
Author:   afb at macports.org
Date:     2011-07-26 04:46:06 -0700 (Tue, 26 Jul 2011)
Log Message:
-----------
merge r81171 from trunk:
 add lzma_path and xz_path

Revision Links:
--------------
    http://trac.macports.org/changeset/81171

Modified Paths:
--------------
    branches/release_2_0/base/configure
    branches/release_2_0/base/configure.ac
    branches/release_2_0/base/src/port1.0/port_autoconf.tcl.in

Property Changed:
----------------
    branches/release_2_0/base/


Property changes on: branches/release_2_0/base
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/gsoc08-privileges/base:37343-46937
/branches/gsoc09-logging/base:51231-60371
/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:79584,79586,79590-79594,79599-79600,79649,79686,79689,79692,79750,79762,79771-79774,79782,79787,79864,79943,80069,80088,80178,80220,80222,80224,80226,80229,80335,80443,80581,80583,80586,80779,80797-80798,80894,80928,80932,80934,80969,80971
/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/universal-sanity/base:51872-52323
/branches/variant-descs-14482/base:34469-34855,34900-37508,37511-37512,41040-41463,42575-42626,42640-42659
/trunk/base:79584,79586,79590-79594,79599-79600,79649,79686,79689,79692,79750,79762,79771-79774,79782,79787,79864,79943,80069,80088,80178,80220,80222,80224,80226,80229,80335,80443,80581,80583,80586,80779,80797-80798,80894,80928,80932,80934,80969,80971,81171
/users/perry/base-bugs_and_notes:45682-46060
/users/perry/base-select:44044-44692

Modified: branches/release_2_0/base/configure
===================================================================
--- branches/release_2_0/base/configure	2011-07-26 11:04:02 UTC (rev 81174)
+++ branches/release_2_0/base/configure	2011-07-26 11:46:06 UTC (rev 81175)
@@ -683,6 +683,8 @@
 PAX
 MKBOM
 LSBOM
+XZ
+LZMA
 BZIP2
 GNUPATCH
 GNUMAKE
@@ -837,6 +839,8 @@
 BSDMAKE
 GNUMAKE
 BZIP2
+LZMA
+XZ
 XAR
 OPEN
 OBJCPP
@@ -1521,6 +1525,8 @@
   BSDMAKE     path to bsdmake/pmake command
   GNUMAKE     path to gnumake command
   BZIP2       path to bzip2 command
+  LZMA        path to lzma command
+  XZ          path to xz command
   XAR         path to xar command
   OPEN        path to open command
   OBJCPP      Objective C preprocessor
@@ -5497,6 +5503,86 @@
 fi
 
 
+# Extract the first word of "lzma", so it can be a program name with args.
+set dummy lzma; 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_LZMA+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  case $LZMA in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_LZMA="$LZMA" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_path_LZMA="$as_dir/$ac_word$ac_exec_ext"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+  ;;
+esac
+fi
+LZMA=$ac_cv_path_LZMA
+if test -n "$LZMA"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LZMA" >&5
+$as_echo "$LZMA" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+# Extract the first word of "xz", so it can be a program name with args.
+set dummy xz; 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_XZ+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  case $XZ in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_XZ="$XZ" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_path_XZ="$as_dir/$ac_word$ac_exec_ext"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+  ;;
+esac
+fi
+XZ=$ac_cv_path_XZ
+if test -n "$XZ"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $XZ" >&5
+$as_echo "$XZ" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
 # Extract the first word of "lsbom", so it can be a program name with args.
 set dummy lsbom; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
@@ -5715,6 +5801,8 @@
 
 
 
+
+
 	# Extract the first word of "sed", so it can be a program name with args.
 set dummy sed; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5

Modified: branches/release_2_0/base/configure.ac
===================================================================
--- branches/release_2_0/base/configure.ac	2011-07-26 11:04:02 UTC (rev 81174)
+++ branches/release_2_0/base/configure.ac	2011-07-26 11:46:06 UTC (rev 81175)
@@ -119,6 +119,8 @@
 AC_PATH_PROGS(GNUMAKE, [gnumake gmake], [], [$PATH:/usr/local/bin])
 AC_PATH_PROGS(GNUPATCH, [gnupatch gpatch], [], [$PATH:/usr/local/bin])
 AC_PATH_PROG(BZIP2, [bzip2], [])
+AC_PATH_PROG(LZMA, [lzma], [])
+AC_PATH_PROG(XZ, [xz], [])
 AC_PATH_PROG(LSBOM, [lsbom], [])
 AC_PATH_PROG(MKBOM, [mkbom], [])
 AC_PATH_PROG(PAX, [pax], [])
@@ -138,6 +140,8 @@
 AC_ARG_VAR(BSDMAKE, [path to bsdmake/pmake command])
 AC_ARG_VAR(GNUMAKE, [path to gnumake command])
 AC_ARG_VAR(BZIP2, [path to bzip2 command])
+AC_ARG_VAR(LZMA, [path to lzma command])
+AC_ARG_VAR(XZ, [path to xz command])
 AC_ARG_VAR(XAR, [path to xar command])
 AC_ARG_VAR(OPEN, [path to open command])
 

Modified: branches/release_2_0/base/src/port1.0/port_autoconf.tcl.in
===================================================================
--- branches/release_2_0/base/src/port1.0/port_autoconf.tcl.in	2011-07-26 11:04:02 UTC (rev 81174)
+++ branches/release_2_0/base/src/port1.0/port_autoconf.tcl.in	2011-07-26 11:46:06 UTC (rev 81175)
@@ -33,6 +33,8 @@
 
 namespace eval portutil::autoconf {
 	variable bzip2_path "@BZIP2@"
+	variable lzma_path "@LZMA@"
+	variable xz_path "@XZ@"
 	variable cp_path "@CP@"
 	variable cpio_path "@CPIO@"
 	variable diff_path "@DIFF@"
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20110726/01783130/attachment-0001.html>

More information about the macports-changes mailing list