pic libraries are now correctly installed when needed:

[vlc] / bootstrap

diff --git a/bootstrap b/bootstrap
index e518371be0457aec41dc6519a731cfa7a4ac018e..84806c4c688a348358df4372e4d7038a79e2215e 100755 (executable)
--- a/bootstrap
+++ b/bootstrap
@@ -1,11 +1,13 @@
 #! /bin/sh
 
 ##  bootstrap file for the VLC media player
-##  $Id$
 ##
 ## Copyright (C) 2005-2006 the VideoLAN team
 ##
-##  Initial author: Sam Hocevar <sam@zoy.org>
+##  Authors: Sam Hocevar <sam@zoy.org>
+##           Rémi Denis-Courmont <rem # videolan # org>
+##
+## Muahaha! no annoying dollar I dee dollar that causes rebuild at commit
 
 if test "$#" != "0"; then
   echo "Usage: $0"
@@ -49,41 +51,34 @@ if test -d extras/contrib/bin; then
 fi
 
 # Check for automake
-amvers="none"
-if automake-1.9 --version >/dev/null 2>&1; then
-  amvers="-1.9"
-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"
-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
-    AUTOMAKESUCKS=yes
+amvers="no"
+for v in "-1.9" "19" "-1.8" "18" "-1.7" "17" "-1.6" "16" "-1.5" "15"; do
+  if automake${v} --version >/dev/null 2>&1; then
+    amsuff="${v}"
+    amvers="${v}"
+    break
   fi
-elif automake-1.5 --version >/dev/null 2>&1; then
-  INSTALLSUCKS=yes
-  amvers="-1.5"
-elif automake --version > /dev/null 2>&1; then
-  amvers=""
-  case "`automake --version | sed -e '1s/[^0-9]*//' -e q`" in
-    0|0.*|1|1.[01234]|1.[01234][-.]*)
-      amvers="none" ;;
-    1.5|1.5.*)
-      INSTALLSUCKS=yes ;;
-    1.6|1.6.0|1.6.1)
-      AUTOMAKESUCKS=yes ;;
-    1.9|1.9.2)
-      ;;
-  esac
-fi
+done
 
-if test "${amvers}" = "none"; then
-  set +x
-  echo "$0: you need automake version 1.5 or later"
-  exit 1
+if test "${amvers}" = "no" && automake --version > /dev/null 2>&1; then
+  amvers="`automake --version | sed -e '1s/[^0-9]*//' -e q`"
+  amsuff=""
 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])
+    set +x
+    echo "$0: you need automake version 1.5 or later"
+    exit 1
+    ;;
+esac
+
 # Check for libtool
 libtoolize="no"
 if glibtoolize --version >/dev/null 2>&1; then
@@ -288,7 +283,7 @@ if USE_LIBTOOL
          z=\$\$(\$(VLC_CONFIG) --list plugin); \
          m=\`for mod in \$(mods); do case "\$\$z " in *\ \$\${mod}\ *) echo -n " lib\$\${mod}_plugin.la" ;; esac; done\` ; \
          test -z "\$\$m" || \
-           \$(MAKE) \$(AM_MAKEFLAGS) libvlc_LTLIBRARIES="\$\$m" install ; \
+           \$(MAKE) \$(AM_MAKEFLAGS) libvlc_LTLIBRARIES="\$\$m" install-libvlcLTLIBRARIES || exit \$\$? ; \
        fi
 else
        mkdir -p -- "\$(DESTDIR)\$(libvlcdir)"
@@ -310,7 +305,7 @@ else
              ;; \
          esac; \
        done
-if BUILD_MOZILLA
+if BUILD_PIC
        @z=\$\$(\$(VLC_CONFIG) --list builtin); \
        for mod in \$(mods); do \
          case "\$\$z " \
@@ -329,7 +324,7 @@ if USE_LIBTOOL
          z=\$\$(\$(VLC_CONFIG) --list plugin); \
          m=\`for mod in \$(mods); do case "\$\$z " in *\ \$\${mod}\ *) echo -n " lib\$\${mod}_plugin.la" ;; esac; done\` ; \
          test -z "\$\$m" || \
-           \$(MAKE) \$(AM_MAKEFLAGS) libvlc_LTLIBRARIES="\$\$m" uninstall ; \
+           \$(MAKE) \$(AM_MAKEFLAGS) libvlc_LTLIBRARIES="\$\$m" uninstall-libvlcLTLIBRARIES || exit \$\$?; \
        fi
 else
        @z=\$\$(\$(VLC_CONFIG) --list plugin); \
@@ -350,7 +345,7 @@ else
              ;; \
          esac; \
        done
-if BUILD_MOZILLA
+if BUILD_PIC
        @z=\$\$(\$(VLC_CONFIG) --list builtin); \
        for mod in \$(mods); do \
          case "\$\$z " \
@@ -413,7 +408,6 @@ 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)
 lib${mod}_plugin_la_LIBADD = \$(LTLIBVLC)
-lib${mod}_plugin_la_DEPENDENCIES = \$(LTLIBVLC)
 
 lib${mod}_pic_a_SOURCES = \$(SOURCES_${mod})
 EOF
@@ -438,10 +432,9 @@ EOF
 lib${mod}_a_CFLAGS = \`\$(VLC_CONFIG) --cflags builtin ${mod}\`
 lib${mod}_a_CXXFLAGS = \`\$(VLC_CONFIG) --cxxflags builtin ${mod}\`
 lib${mod}_a_OBJCFLAGS = \`\$(VLC_CONFIG) --objcflags builtin ${mod}\`
-lib${mod}_builtin_la_CFLAGS = \`\$(VLC_CONFIG) --cflags builtin ${mod}\` -static
-lib${mod}_builtin_la_CXXFLAGS = \`\$(VLC_CONFIG) --cxxflags builtin ${mod}\` -static
-lib${mod}_builtin_la_OBJCFLAGS = \`\$(VLC_CONFIG) --objcflags builtin ${mod}\` -static
-lib${mod}_builtin_la_LDFLAGS = \`\$(VLC_CONFIG) --libs ${mod}\` -static
+lib${mod}_builtin_la_CFLAGS = \`\$(VLC_CONFIG) --cflags builtin ${mod}\`
+lib${mod}_builtin_la_CXXFLAGS = \`\$(VLC_CONFIG) --cxxflags builtin ${mod}\`
+lib${mod}_builtin_la_OBJCFLAGS = \`\$(VLC_CONFIG) --objcflags builtin ${mod}\`
 
 EOF
   done