Changeset 81175

Timestamp:

07/26/11 04:46:06 (4 years ago)

Author:

afb@…

Message:

merge r81171 from trunk:

add lzma_path and xz_path

Location:

branches/release_2_0/base

Files:

• . (modified) (1 prop)
• configure (modified) (5 diffs)
• configure.ac (modified) (2 diffs)
• src/port1.0/port_autoconf.tcl.in (modified) (1 diff)

branches/release_2_0/base/configure

@@ -684 +684 @@
 MKBOM
 LSBOM
+XZ
+LZMA
 BZIP2
 GNUPATCH
@@ -838 +840 @@
 GNUMAKE
 BZIP2
+LZMA
+XZ
 XAR
 OPEN
@@ -1522 +1526 @@
   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
@@ -5498 +5504 @@
 
 
+# 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
@@ -5700 +5786 @@
 
 # Define some precious variables allowing user to override PATH for some programs
+
+
 
 

branches/release_2_0/base/configure.ac

@@ -120 +120 @@
 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], [])
@@ -139 +141 @@
 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])

branches/release_2_0/base/src/port1.0/port_autoconf.tcl.in

@@ -34 +34 @@
 namespace eval portutil::autoconf {
         variable bzip2_path "@BZIP2@"
+        variable lzma_path "@LZMA@"
+        variable xz_path "@XZ@"
         variable cp_path "@CP@"
         variable cpio_path "@CPIO@"