X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=bootstrap;h=d7d603cfbb5610822d3b512efa23d2b80f661959;hb=16b2dec13b17f1b22a793836c75782fc5b847519;hp=bb92ee09983c54d30426f4b6335e1e2e0362bbe1;hpb=5b369300e5f7093ac99f2f626533e7f9bc9b66fb;p=vlc

diff --git a/bootstrap b/bootstrap
index bb92ee0998..d7d603cfbb 100755
--- a/bootstrap
+++ b/bootstrap
@@ -52,7 +52,7 @@ fi
 
 # Check for automake
 amvers="no"
-for v in "-1.9" "19" "-1.8" "18" "-1.7" "17" "-1.6" "16" "-1.5" "15"; do
+for v in "-1.9" "19" "-1.8" "18" "-1.7" "17"; do
   if automake${v} --version >/dev/null 2>&1; then
     amsuff="${v}"
     amvers="${v}"
@@ -66,15 +66,9 @@ if test "${amvers}" = "no" && automake --version > /dev/null 2>&1; then
 fi
 
 case "${amvers}" in
-  -1.6|16|1.6|1.6.0*|1.6.1*)
-    AUTOMAKESUCKS=yes
-    ;;
-  -1.5|15|1.5|1.5.*)
-    INSTALLSUCKS=yes
-    ;;
-  no|1.[01234]|1.[01234].*|1[01234])
+  no|1.[0123456]|1.[0123456].*|1[0123456])
     set +x
-    echo "$0: you need automake version 1.5 or later"
+    echo "$0: you need automake version 1.7 or later"
     exit 1
     ;;
 esac
@@ -222,12 +216,15 @@ include Modules.am
 LTLIBVLC = \$(top_builddir)/src/libvlc.la
 
 if BUILD_SHARED
-LIBVLC = \$(top_builddir)/src/libvlc\$(LIBEXT)
+LIBVLC = -L\$(top_builddir)/src -lvlc
 LIBADD = \$(LIBVLC)
 endif
 
 all: all-modules
 
+nice:
+	\$(top_builddir)/compile
+
 # Find out which modules were enabled and tell make to build them
 all-modules:
 if USE_LIBTOOL
@@ -383,7 +380,7 @@ lib${mod}_plugin_la_CFLAGS = \`\$(VLC_CONFIG) --cflags plugin ${mod}\`
 lib${mod}_plugin_la_CXXFLAGS = \`\$(VLC_CONFIG) --cxxflags plugin ${mod}\`
 lib${mod}_plugin_la_OBJCFLAGS = \`\$(VLC_CONFIG) --objcflags plugin ${mod}\`
 lib${mod}_plugin_la_LDFLAGS = \`\$(VLC_CONFIG) --libs plugin ${mod}\` \\
-	-rpath '\$(libvlcdir)' -module -shrext \$(LIBEXT)
+	-rpath '\$(libvlcdir)' -avoid-version -module -shrext \$(LIBEXT)
 lib${mod}_plugin_la_LIBADD = \$(LTLIBVLC)
 
 lib${mod}_a_SOURCES = \$(SOURCES_${mod})
@@ -467,7 +464,7 @@ ${autopoint} -f
 ${aclocal} ${ACLOCAL_ARGS}
 ${autoconf}
 ${autoheader}
-${automake} --add-missing --copy
+${automake} --add-missing --copy -Wall
 
 ##
 ##  files which need to be regenerated
@@ -503,25 +500,3 @@ reliable.
 EOF
 fi
 
-if [ "$AUTOMAKESUCKS" = "yes" ]; then
-  cat << EOF
-
-=============================================================
-IMPORTANT NOTE: your version of automake has a bug which will
-prevent proper plugin compilation. Either compile VLC with
-the --disable-plugins flag, or use a version of automake newer
-than 1.6.1 (1.6.2 is OK, and so are the 1.5 series).
-EOF
-fi
-
-if [ "$INSTALLSUCKS" = "yes" ]; then
-  cat << EOF
-
-=============================================================
-IMPORTANT NOTE: your version of automake has a bug which will
-prevent proper installation. Do not use "make install" with this
-version of automake, or use a version of automake newer than 1.5
-(such as 1.6 or 1.7).
-EOF
-fi
-