X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=bootstrap;h=0334f46bc91ba217136f022966d679fd9a700f50;hb=12ade3e3bc975d5426ba4af155b7372c31093b31;hp=785481638723074a16421ae0d3667fdbc0361d75;hpb=974a399a24723d1ee6ac4ee5b69b186cd47c0e31;p=vlc

diff --git a/bootstrap b/bootstrap
index 7854816387..0334f46bc9 100755
--- a/bootstrap
+++ b/bootstrap
@@ -2,15 +2,14 @@
 
 ##  bootstrap file for the VLC media player
 ##
-## Copyright (C) 2005-2006 the VideoLAN team
+## Copyright (C) 2005-2008 the VideoLAN team
 ##
 ##  Authors: Sam Hocevar <sam@zoy.org>
 ##           Rémi Denis-Courmont <rem # videolan # org>
 
 if test "$#" != "0"; then
   echo "Usage: $0"
-  echo "  Calls automake, autoconf, autoheader, autopoint and other auto* to generate"
-  echo "  m4 macros and prepare Makefiles."
+  echo "  Calls autoreconf to generate m4 macros and prepare Makefiles."
   exit 1
 fi
 
@@ -23,6 +22,8 @@ export CYGWIN
 set -e
 set -x
 
+cd "$(dirname "$0")"
+
 ##
 ## Check for various tools
 ##
@@ -30,17 +31,21 @@ set -x
 ACLOCAL_ARGS="-I m4 ${ACLOCAL_ARGS}"
 
 # Check for contrib directory
-if test -d extras/contrib/bin; then
-  export 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
-    export LD_LIBRARY_PATH=./extras/contrib/lib:$LD_LIBRARY_PATH
-    export 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
-    export LIBRARY_PATH=./extras/contrib/lib:$LIBRARY_PATH
-    export 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
 elif test ".`uname -s`" = ".Darwin"; then
   set +x
@@ -64,12 +69,20 @@ else
   PKGCONFIG=no
 fi
 
+# Check for autopoint (GNU gettext)
+export AUTOPOINT
+test "$AUTOPOINT" || AUTOPOINT=autopoint
+if ! "$AUTOPOINT" --dry-run --force >/dev/null 2>&1; then
+  AUTOPOINT=true
+  echo > ABOUT-NLS
+fi
+
 ##
 ## Generate the modules makefile, by parsing modules/**/Modules.am
 ##
 
 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
@@ -84,28 +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=""
-
-rm -f modules/Makefile.am && cat > modules/Makefile.am << EOF
-# Autogenerated by bootstrap - DO NOT EDIT
-EXTRA_DIST = LIST
-dist_noinst_SCRIPTS = genmf
-SUBDIRS = `sed -ne 's,modules/\([^/]*\)/Makefile,\1,p' configure.ac | xargs`
-
-EOF
-
-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
@@ -114,12 +106,13 @@ set -x
 
 # Automake complains if these are not present
 echo > vlc-config.in
-cp -f INSTALL INSTALL.svn
+echo > ABOUT-NLS
+cp -f INSTALL INSTALL.git
 
 autoreconf --install --force --verbose ${ACLOCAL_ARGS}
-rm -f po/Makevars.template
+rm -f po/Makevars.template ABOUT-NLS
 echo > ABOUT-NLS
-mv -f INSTALL.svn INSTALL
+mv -f INSTALL.git INSTALL
 
 ##
 ##  files which need to be regenerated
@@ -134,13 +127,23 @@ set +x
 ##
 ##  Tell the user about gettext, pkg-config and sed
 ##
+if [ "$AUTOPOINT" = "true" ]; then
+  cat << EOF
+
+==============================================================
+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
+
 if [ "$PKGCONFIG" = "no" ]; then
   cat << EOF
 
 ==============================================================
-NOTE: you do not have the "pkg-config" utility on your system;
-detection of the Gtk-2.0 and GNOME 2.0 libraries will not be
-reliable.
+NOTE: "pkg-config" is missing from your system. Certain
+libraries may not be detected properly.
 EOF
 fi