Use var_Inherit* instead of var_CreateGet*.

[vlc] / bootstrap

diff --git a/bootstrap b/bootstrap
index f6e67db5e39c91d9479c5ad8d6d4a9f7622f2927..0334f46bc91ba217136f022966d679fd9a700f50 100755 (executable)
--- a/bootstrap
+++ b/bootstrap
@@ -22,6 +22,8 @@ export CYGWIN
 set -e
 set -x
 
+cd "$(dirname "$0")"
+
 ##
 ## Check for various tools
 ##
@@ -29,19 +31,19 @@ set -x
 ACLOCAL_ARGS="-I m4 ${ACLOCAL_ARGS}"
 
 # Check for contrib directory
-if test -d extras/contrib/bin; then
-  PATH="`pwd`/extras/contrib/bin:$PATH"
-  if test -d extras/contrib/share/aclocal; then
-    ACLOCAL_ARGS="${ACLOCAL_ARGS} -I extras/contrib/share/aclocal"
+if test -d extras/contrib/build/bin; then
+  PATH="`pwd`/extras/contrib/build/bin:$PATH"
+  if test -d extras/contrib/build/share/aclocal; then
+    ACLOCAL_ARGS="${ACLOCAL_ARGS} -I extras/contrib/build/share/aclocal"
   fi
   if test ".`uname -s`" = ".Darwin"; then
-    LD_LIBRARY_PATH=./extras/contrib/lib:$LD_LIBRARY_PATH
-    DYLD_LIBRARY_PATH=./extras/contrib/lib:$DYLD_LIBRARY_PATH
+    LD_LIBRARY_PATH=./extras/contrib/build/lib:$LD_LIBRARY_PATH
+    DYLD_LIBRARY_PATH=./extras/contrib/build/lib:$DYLD_LIBRARY_PATH
     export LD_LIBRARY_PATH
     export DYLD_LIBRARY_PATH
   elif test ".`uname -s`" = ".BeOS"; then
-    LIBRARY_PATH=./extras/contrib/lib:$LIBRARY_PATH
-    BELIBRARIES=./extras/contrib/lib:$BELIBRARIES
+    LIBRARY_PATH=./extras/contrib/build/lib:$LIBRARY_PATH
+    BELIBRARIES=./extras/contrib/build/lib:$BELIBRARIES
     export LIBRARY_PATH
     export BELIBRARIES
   fi
@@ -80,7 +82,7 @@ fi
 ##
 
 set +x
-echo "generating modules/**/Makefile.am and m4/private.m4"
+echo "generating modules/**/Makefile.am"
 
 # Prepare m4/private.m4
 rm -f m4/private.m4 && cat > m4/private.m4 << EOF
@@ -95,20 +97,7 @@ AC_DEFUN([PKG_CHECK_MODULES],[ifelse([\$4], , :, [\$4])])
 EOF
 fi
 
-cat >> m4/private.m4 << EOF
-dnl  Helper macro for vlc-config generation
-AC_DEFUN([VLC_CONFIG_HELPER], [
-  cat >> vlc-config.in << BLAH
-EOF
-
-modules=""
-
-modules/genmf `sed -ne 's,modules/\(.*\)/Makefile,\1,p' configure.ac`
-
-cat >> m4/private.m4 << EOF
-BLAH
-])
-EOF
+sh modules/genmf `sed -ne 's,modules/\(.*\)/Makefile,\1,p' configure.ac`
 
 ###
 ###  classic bootstrap stuff
@@ -144,6 +133,7 @@ if [ "$AUTOPOINT" = "true" ]; then
 ==============================================================
 NOTE: GNU gettext appears to be missing or out-of-date.
 Please install or update GNU gettext.
+Also check if you have cvs, a dependency of autopoint.
 Otherwise, you will not be able to build a source tarball.
 EOF
 fi