From a5f2904ae4897ad91c71948478c7056a41bb2d41 Mon Sep 17 00:00:00 2001
From: =?utf8?q?R=C3=A9mi=20Denis-Courmont?= <rem@videolan.org>
Date: Sat, 20 Aug 2005 08:36:37 +0000
Subject: [PATCH] Don't fallback to automake 1.6

bootstrap might be a little slower,
but that'll ensure more recent build-system in tarballs.
Besides,
---
 bootstrap | 32 ++++++++------------------------
 1 file changed, 8 insertions(+), 24 deletions(-)

diff --git a/bootstrap b/bootstrap
index b0927b9a7a..56e12d0878 100755
--- a/bootstrap
+++ b/bootstrap
@@ -48,30 +48,12 @@ fi
 
 # Check for automake
 amvers="none"
-if automake-1.8 --version >/dev/null 2>&1; then
-  amvers="-1.8"
-  # If we also have 1.6 (>> 1.6.1), use it instead because it is faster
-  if automake-1.6 --version >/dev/null 2>&1; then
-    if expr "`automake-1.6 --version | sed -e '1s/[^0-9]*//' -e q`" ">" "1.6.1" > /dev/null 2>&1; then
-      amvers="-1.6"
-    fi
-  fi
-elif automake-1.9 --version >/dev/null 2>&1; then
+if automake-1.9 --version >/dev/null 2>&1; then
   amvers="-1.9"
-  # If we also have 1.6 (>> 1.6.1), use it instead because it is faster
-  if automake-1.6 --version >/dev/null 2>&1; then
-    if expr "`automake-1.6 --version | sed -e '1s/[^0-9]*//' -e q`" ">" "1.6.1" > /dev/null 2>&1; then
-      amvers="-1.6"
-    fi
-  fi
+elif automake-1.8 --version >/dev/null 2>&1; then
+  amvers="-1.8"
 elif automake-1.7 --version >/dev/null 2>&1; then
   amvers="-1.7"
-  # If we also have 1.6 (>> 1.6.1), use it instead because it is faster
-  if automake-1.6 --version >/dev/null 2>&1; then
-    if expr "`automake-1.6 --version | sed -e '1s/[^0-9]*//' -e q`" ">" "1.6.1" > /dev/null 2>&1; then
-      amvers="-1.6"
-    fi
-  fi
 elif automake-1.6 --version >/dev/null 2>&1; then
   amvers="-1.6"
   if expr "`automake-1.6 --version | sed -e '1s/[^0-9]*//' -e q`" "<=" "1.6.1" > /dev/null 2>&1; then
@@ -224,13 +206,15 @@ libvlcdir = \$(libdir)/vlc/\$(basedir)
 EXTRA_LIBRARIES = ${extra_libs}
 include Modules.am
 
-if !BUILD_MOZILLA
-pic = no
-else
 if HAVE_WIN32
 ### There's no need for pic code on win32 so get rid of this to substantially
 ### reduce the compilation time.
 pic = no
+else
+if BUILD_MOZILLA
+pic = yes
+else
+pic = no
 endif
 endif
 
-- 
2.39.2