X-Git-Url: https://git.proxmox.com/?a=blobdiff_plain;f=autogen.sh;h=151e0944cad2f9337f97229ff6d9aab338aea7c9;hb=HEAD;hp=e22ca8f6ee65b23750ecec807e9a15dda433a768;hpb=17d0b8d95e81ea878103bf6b245be408eab9da85;p=mirror_smartmontools-debian.git

diff --git a/autogen.sh b/autogen.sh
index e22ca8f..151e094 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -1,9 +1,5 @@
 #!/bin/sh
-<<<<<<< HEAD
-# $Id: autogen.sh 4115 2015-07-15 20:52:26Z chrfranke $
-=======
-# $Id: autogen.sh 4053 2015-04-14 20:18:50Z chrfranke $
->>>>>>> 3d8ad6fa4529eb02ae1391a1e937bf57aad3fb74
+# $Id: autogen.sh 4838 2018-11-27 17:27:02Z chrfranke $
 #
 # Generate ./configure from configure.ac and Makefile.in from Makefile.am.
 # This also adds files like missing,depcomp,install-sh to the source
@@ -32,7 +28,7 @@ if [ -n "$AUTOMAKE" ]; then
   ver=$("$AUTOMAKE" --version) || exit 1
 else
   maxver=
-  for v in 1.15 1.14 1.13 1.12 1.11 1.10; do
+  for v in 1.16 1.15 1.14 1.13 1.12 1.11 1.10; do
     minver=$v; test -n "$maxver" || maxver=$v
     ver=$(automake-$v --version 2>/dev/null) || continue
     AUTOMAKE="automake-$v"
@@ -44,33 +40,11 @@ else
   fi
 fi
 
-<<<<<<< HEAD
 ver=$(echo "$ver" | sed -n '1s,^.*[^.0-9]\([12]\.[0-9][-.0-9pl]*\).*$,\1,p')
 if [ -z "$ver" ]; then
   echo "$AUTOMAKE: Unable to determine automake version."
   exit 1
 fi
-=======
-test -x "$AUTOMAKE" ||
-    AUTOMAKE=`typep automake-1.15` || AUTOMAKE=`typep automake-1.14` ||
-    AUTOMAKE=`typep automake-1.13` || AUTOMAKE=`typep automake-1.12` ||
-    AUTOMAKE=`typep automake-1.11` || AUTOMAKE=`typep automake-1.10` ||
-    AUTOMAKE=`typep automake-1.9` || AUTOMAKE=`typep automake-1.8` ||
-    AUTOMAKE=`typep automake-1.7` || AUTOMAKE=`typep automake17` ||
-{
-echo
-echo "You must have at least GNU Automake 1.7 (up to 1.15) installed"
-echo "in order to bootstrap smartmontools from SVN. Download the"
-echo "appropriate package for your distribution, or the source tarball"
-echo "from ftp://ftp.gnu.org/gnu/automake/ ."
-echo
-echo "Also note that support for new Automake series (anything newer"
-echo "than 1.15) is only added after extensive tests. If you live in"
-echo "the bleeding edge, you should know what you're doing, mainly how"
-echo "to test it before the developers. Be patient."
-exit 1;
-}
->>>>>>> 3d8ad6fa4529eb02ae1391a1e937bf57aad3fb74
 
 # Check aclocal
 if [ -z "$ACLOCAL" ]; then
@@ -86,7 +60,7 @@ case "$ver" in
     # OK
     ;;
 
-  1.14|1.14.1|1.15)
+  1.14|1.14.1|1.15|1.15.1|1.16|1.16.1)
     # TODO: Enable 'subdir-objects' in configure.ac
     # For now, suppress 'subdir-objects' forward-incompatibility warning
     test -n "$warnings" || amwarnings="--warnings=no-unsupported"
@@ -97,20 +71,7 @@ case "$ver" in
     echo "Please report success/failure to the smartmontools-support mailing list."
 esac
 
-<<<<<<< HEAD
 # required for aclocal-1.10 --install
-=======
-# Warn if Automake version is too old
-case "$ver" in
-  1.[789]|1.[789].*)
-    echo "WARNING:"
-    echo "The use of GNU Automake version $ver is deprecated.  Support for Automake"
-    echo "versions 1.7 - 1.9.x will be removed in a future release of smartmontools."
-esac
-
-# Install pkg-config macros
-# (Don't use 'aclocal -I m4 --install' to keep support for automake < 1.10)
->>>>>>> 3d8ad6fa4529eb02ae1391a1e937bf57aad3fb74
 test -d m4 || mkdir m4 || exit 1
 
 set -e	# stops on error status