[77749] trunk/base

[afb at macports.org]

Revision: 77749
          http://trac.macports.org/changeset/77749
Author:   afb at macports.org
Date:     2011-04-11 01:50:59 -0700 (Mon, 11 Apr 2011)
Log Message:
-----------
autoconf: check for tar -q

Modified Paths:
--------------
    trunk/base/aclocal.m4
    trunk/base/configure
    trunk/base/configure.ac
    trunk/base/src/port1.0/port_autoconf.tcl.in

Modified: trunk/base/aclocal.m4
===================================================================
--- trunk/base/aclocal.m4	2011-04-11 04:47:40 UTC (rev 77748)
+++ trunk/base/aclocal.m4	2011-04-11 08:50:59 UTC (rev 77749)
@@ -919,6 +919,21 @@
 	AC_SUBST(SED_EXT)
 ])
 
+dnl This macro tests for tar support of -q (BSD) or not (GNU)
+AC_DEFUN([MP_TAR_FAST_READ],[
+	AC_PATH_PROG(TAR, [tar])
+	
+	AC_MSG_CHECKING([whether tar supports -q])
+	if $TAR -t -q -f - </dev/null 2>/dev/null ; then
+		AC_MSG_RESULT([yes (bsdtar)])
+		TAR_Q='q'
+	else
+		AC_MSG_RESULT([no (gnutar)])
+		TAR_Q=
+	fi
+	AC_SUBST(TAR_Q)
+])
+
 dnl This macro tests for tar support of --no-same-owner
 AC_DEFUN([MP_TAR_NO_SAME_OWNER],[
 	AC_PATH_PROG(TAR, [tar])

Modified: trunk/base/configure
===================================================================
--- trunk/base/configure	2011-04-11 04:47:40 UTC (rev 77748)
+++ trunk/base/configure	2011-04-11 08:50:59 UTC (rev 77749)
@@ -676,6 +676,7 @@
 CFLAGS_WERROR
 CFLAGS_QUICHEEATERS
 TAR_CMD
+TAR_Q
 SED_EXT
 OPEN
 XAR
@@ -5785,6 +5786,61 @@
 fi
 
 
+
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether tar supports -q" >&5
+$as_echo_n "checking whether tar supports -q... " >&6; }
+	if $TAR -t -q </dev/null 2>/dev/null ; then
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes (bsdtar)" >&5
+$as_echo "yes (bsdtar)" >&6; }
+		TAR_Q='q'
+	else
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no (gnutar)" >&5
+$as_echo "no (gnutar)" >&6; }
+		TAR_Q=
+	fi
+
+
+
+	# Extract the first word of "tar", so it can be a program name with args.
+set dummy tar; 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_TAR+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  case $TAR in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_TAR="$TAR" # 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_TAR="$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
+TAR=$ac_cv_path_TAR
+if test -n "$TAR"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $TAR" >&5
+$as_echo "$TAR" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
 	# Extract the first word of "gnutar", so it can be a program name with args.
 set dummy gnutar; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5

Modified: trunk/base/configure.ac
===================================================================
--- trunk/base/configure.ac	2011-04-11 04:47:40 UTC (rev 77748)
+++ trunk/base/configure.ac	2011-04-11 08:50:59 UTC (rev 77749)
@@ -141,6 +141,7 @@
 AC_ARG_VAR(OPEN, [path to open command])
 
 MP_SED_EXTENDED_REGEXP
+MP_TAR_FAST_READ
 MP_TAR_NO_SAME_OWNER
 MP_PATCH_GNU_VERSION
 

Modified: trunk/base/src/port1.0/port_autoconf.tcl.in
===================================================================
--- trunk/base/src/port1.0/port_autoconf.tcl.in	2011-04-11 04:47:40 UTC (rev 77748)
+++ trunk/base/src/port1.0/port_autoconf.tcl.in	2011-04-11 08:50:59 UTC (rev 77749)
@@ -63,6 +63,7 @@
 	variable sed_ext_flag "@SED_EXT@"
 	variable tar_command "@TAR_CMD@"
 	variable tar_path "@TAR@"
+	variable tar_q "@TAR_Q@"
 	variable hdiutil_path "@HDIUTIL@"
 	variable have_launchd "@HAVE_LAUNCHD@"
 	variable launchctl_path "@LAUNCHCTL@"
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20110411/cc3ddfa2/attachment.html>