X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=configure.ac;h=5feff66927a5cb4a7af579134eda982fcdd467b7;hb=db9b81eb6b0fcb69b2f2819db6e301dd6492bef9;hp=35edb08afc81d30a26fac4631921c41f9e376e23;hpb=cbc51277aa4de1f41434ba073f2e4546ead63005;p=chaz%2Ftar

diff --git a/configure.ac b/configure.ac
index 35edb08..5feff66 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,23 +1,21 @@
 # Configure template for GNU tar.  -*- autoconf -*-
 
-# Copyright (C) 1991, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
-# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free
-# Software Foundation, Inc.
+# Copyright 1991, 1994-2010, 2013 Free Software Foundation, Inc.
 
-# This program is free software; you can redistribute it and/or modify
+# This file is part of GNU tar.
+
+# GNU tar is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3, or (at your option)
-# any later version.
+# the Free Software Foundation; either version 3 of the License, or
+# (at your option) any later version.
 
-# This program is distributed in the hope that it will be useful,
+# GNU tar is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-# 02110-1301, USA.
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 AC_INIT([GNU tar], [1.26.90], [bug-tar@gnu.org])
 AC_CONFIG_SRCDIR([src/tar.c])
@@ -78,13 +76,12 @@ AC_ARG_WITH([posix-acls],
                    [do not use POSIX.1e access control lists]),
     [with_posix_acls=no])
 if test "x$with_posix_acls" != "xno"; then
-  AC_CHECK_HEADERS(sys/acl.h,, [with_posix_acl=no])
-  AC_SEARCH_LIBS([acl_get_file],  [acl pacl],, [with_posix_acl=no])
-  AC_SEARCH_LIBS([acl_get_fd],    [acl pacl],, [with_posix_acl=no])
-  AC_SEARCH_LIBS([acl_set_file],  [acl pacl],, [with_posix_acl=no])
-  AC_SEARCH_LIBS([acl_set_fd],    [acl pacl],, [with_posix_acl=no])
-  AC_SEARCH_LIBS([acl_to_text],   [acl pacl],, [with_posix_acl=no])
-  AC_SEARCH_LIBS([acl_from_text], [acl pacl],, [with_posix_acl=no])
+  AC_CHECK_HEADERS(sys/acl.h,, [with_posix_acls=no])
+  for tar_acl_func in acl_get_file acl_get_fd acl_set_file acl_set_fd \
+		      acl_to_text acl_from_text; do \
+    test "x$with_posix_acls" = xno && break
+    AC_SEARCH_LIBS([$tar_acl_func], [acl pacl], [], [with_posix_acls=no])
+  done
   if test "x$with_posix_acls" != xno; then
     AC_DEFINE(HAVE_POSIX_ACLS,,[Define when we have working POSIX acls])
   fi
@@ -113,6 +110,24 @@ gl_INIT
 # paxutils modules
 tar_PAXUTILS
 
+# gl_GCC_VERSION_IFELSE([major], [minor], [run-if-found], [run-if-not-found])
+# ------------------------------------------------
+# If $CPP is gcc-MAJOR.MINOR or newer, then run RUN-IF-FOUND.
+# Otherwise, run RUN-IF-NOT-FOUND.
+AC_DEFUN([gl_GCC_VERSION_IFELSE],
+  [AC_PREPROC_IFELSE(
+    [AC_LANG_PROGRAM(
+      [[
+#if ($1) < __GNUC__ || (($1) == __GNUC__ && ($2) <= __GNUC_MINOR__)
+/* ok */
+#else
+# error "your version of gcc is older than $1.$2"
+#endif
+      ]]),
+    ], [$3], [$4])
+  ]
+)
+
 AC_ARG_ENABLE([gcc-warnings],
   [AS_HELP_STRING([--enable-gcc-warnings],
      [turn on many GCC warnings (for developers; best with GNU make)])],
@@ -121,10 +136,9 @@ AC_ARG_ENABLE([gcc-warnings],
      *)      AC_MSG_ERROR([bad value $enableval for gcc-warnings option]) ;;
    esac
    gl_gcc_warnings=$enableval],
-  [if test -d "$srcdir"/.git; then
-     gl_gcc_warnings=yes
-   else
-     gl_gcc_warnings=no
+  [gl_gcc_warnings=no
+   if test -d "$srcdir"/.git; then
+     gl_GCC_VERSION_IFELSE([4], [6], [gl_gcc_warnings=yes])
    fi]
 )
 
@@ -203,6 +217,7 @@ AC_CHECK_DECLS([time],,, [#include <time.h>])
 
 AC_REPLACE_FUNCS(waitpid)
 
+AC_ARG_VAR([RSH], [Configure absolute path to default remote shell binary])
 AC_CACHE_CHECK(for remote shell, tar_cv_path_RSH,
   [if test -n "$RSH"; then
     tar_cv_path_RSH=$RSH