- Improve DIST_SUBDIR

[vlc] / bootstrap

diff --git a/bootstrap b/bootstrap
index 7fd6835a55c0d8e451dff41e15e114056fdde31d..915dc63f7c45fc3050b4aef81328262c2f38ea8e 100755 (executable)
--- a/bootstrap
+++ b/bootstrap
@@ -35,7 +35,7 @@ ACLOCAL_ARGS="-I m4"
 
 # Check for contrib directory
 if test -d extras/contrib/bin; then
-  export PATH=./extras/contrib/bin:$PATH
+  export PATH="`pwd`/extras/contrib/bin:$PATH"
   if test -d extras/contrib/share/aclocal; then
     ACLOCAL_ARGS="${ACLOCAL_ARGS} -I extras/contrib/share/aclocal"
   fi
@@ -64,10 +64,10 @@ esac
 
 # Check for automake
 amvers="no"
-for v in "-1.9" "19" "-1.8" "18" "-1.7" "17"; do
+for v in "-1.10" "110" "-1.9" "19"; do
   if automake${v} --version >/dev/null 2>&1; then
     amsuff="${v}"
-    amvers="${v}"
+    amvers="`echo ${v} | sed -e 's/^-//'`"
     break
   fi
 done
@@ -78,9 +78,9 @@ if test "${amvers}" = "no" && automake --version > /dev/null 2>&1; then
 fi
 
 case "${amvers}" in
-  no|1.[0123456]|1.[0123456].*|1[0123456])
+  no|1.[012345678]|1.[0123456].*|1[0123456]|1.[0123456]-*)
     set +x
-    echo "$0: you need automake version 1.7 or later"
+    echo "$0: you need automake version 1.9 or later"
     exit 1
     ;;
 esac
@@ -125,8 +125,8 @@ else
   PKGCONFIG=no
 fi
 
-aclocal=aclocal${amvers}
-automake=automake${amvers}
+aclocal=aclocal${amsuff}
+automake=automake${amsuff}
 autoconf=autoconf
 autoheader=autoheader
 
@@ -227,7 +227,7 @@ include Modules.am
 
 LTLIBVLC = \$(top_builddir)/src/libvlc.la
 
-if BUILD_SHARED
+if HAVE_WIN32
 LIBVLC = -L\$(top_builddir)/src -lvlc
 LIBADD = \$(LIBVLC)
 endif
@@ -448,6 +448,23 @@ if test -f "ltmain.sh"; then
   mv ltmain.sh autotools/
 fi
 
+# patch for DLL link for libtool on cygwin (remove when fixed)
+if test ".`uname -s|sed -n '/^CYGWIN/p'`" != "."; then
+patch -s -p0 << 'EOF'
+--- autotools/ltmain.orig      2006-12-05 15:15:42.064607000 +0000
++++ autotools/ltmain.sh        2006-12-05 15:16:24.705777800 +0000
+@@ -4360,7 +4360,7 @@
+ 
+     prog)
+       case $host in
+-      *cygwin*) output=`$echo $output | ${SED} -e 's,.exe$,,;s,$,.exe,'` ;;
++      *cygwin*) output=`$echo $output | ${SED} -e 's,.exe$,,;s,$,.exe,;s,.dll.exe$,.dll,'` ;;
+       esac
+       if test -n "$vinfo"; then
+       $echo "$modename: warning: \`-version-info' is ignored for programs" 1>&2
+EOF
+fi
+
 # Do the rest
 ${autopoint} -f
 ${aclocal} ${ACLOCAL_ARGS}