X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=bootstrap;h=76a93e117a022390b91f733e2fb8fc3596ebd2f1;hb=7a76a7a7c74fa76e06aedbf334957c5603a4295a;hp=ceeb9d9812a084c5323bd23d2b6e1b0d7909fa85;hpb=c3a51903f20e3c11405ae9e99dd11841048ba5ef;p=vlc

diff --git a/bootstrap b/bootstrap
index ceeb9d9812..76a93e117a 100755
--- a/bootstrap
+++ b/bootstrap
@@ -7,138 +7,82 @@
 ##  Authors: Sam Hocevar <sam@zoy.org>
 ##           Rémi Denis-Courmont <rem # videolan # org>
 
+set -e
+
+cd "$(dirname "$0")"
+
 if test "$#" != "0"; then
   echo "Usage: $0"
   echo "  Calls autoreconf to generate m4 macros and prepare Makefiles."
   exit 1
 fi
 
+ACLOCAL_ARGS="-I m4 ${ACLOCAL_ARGS}"
+
+# Check for tools directory
+if test -d extras/tools/build/bin; then
+  PATH="`pwd`/extras/tools/build/bin:$PATH"
+fi
+
 ###
 ###  Get a sane environment, just in case
 ###
 CYGWIN=binmode
 export CYGWIN
 
-set -e
-set -x
-
-cd "$(dirname "$0")"
-
-##
-## Check for various tools
-##
-
-ACLOCAL_ARGS="-I m4 ${ACLOCAL_ARGS}"
-
-# Check for contrib directory
-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/build/lib:$LD_LIBRARY_PATH
-    DYLD_LIBRARY_PATH=./extras/contrib/build/lib:$DYLD_LIBRARY_PATH
-    export LD_LIBRARY_PATH
-    export DYLD_LIBRARY_PATH
-  fi
-elif test ".`uname -s`" = ".Darwin"; then
-  set +x
-  echo ""
-  echo "ERR: Contribs haven't been built"
-  echo "ERR: Please run:"
-  echo "ERR: "
-  echo "ERR:    'cd extras/contrib && ./bootstrap && make && cd ../..'"
-  echo "ERR: "
-  echo "ERR: Make sure fink has been disabled too."
-  echo ""
-  set -x
-  exit 1
-fi
-
 # Check for pkg-config
-if pkg-config --version >/dev/null 2>&1; then
-  # We have pkg-config, everything is cool.
-  PKGCONFIG=yes
-else
-  PKGCONFIG=no
+if ! "${PKG_CONFIG:-pkg-config}" --version >/dev/null 2>&1; then
+	echo 'Error: "pkg-config" is not installed.' >&2
+	exit 1
 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"
-
 # Prepare m4/private.m4
 rm -f m4/private.m4 && cat > m4/private.m4 << EOF
 dnl  Private VLC macros - generated by bootstrap
-
 EOF
 
-if [ "${PKGCONFIG}" = "no" ]; then cat >> m4/private.m4 << EOF
-dnl  User does not have pkg-config, so assume package was not found
-AC_DEFUN([PKG_CHECK_MODULES],[ifelse([\$4], , :, [\$4])])
+# Check for autopoint (GNU gettext)
+export AUTOPOINT
+test "$AUTOPOINT" || AUTOPOINT=autopoint
+if ! "$AUTOPOINT" --dry-run --force >/dev/null 2>&1; then
+	AUTOPOINT=true
+	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
 
-sh modules/genmf `sed -ne 's,modules/\(.*\)/Makefile,\1,p' configure.ac`
-
 ###
-###  classic bootstrap stuff
+### Generate the modules makefile, by parsing modules/**/Modules.am
 ###
+
+echo "generating modules/**/Makefile.am"
+for d in modules/*/*/Modules.am; do
+	d="${d#modules/}"
+	d="${d%/Modules.am}"
+	${CONFIG_SHELL-sh} modules/genmf "$d"
+	printf "."
+done
+printf "\n"
+
 set -x
 
-# Automake complains if these are not present
-echo > vlc-config.in
-echo > ABOUT-NLS
-cp -f INSTALL INSTALL.git
+###
+###  classic bootstrap stuff
+###
 
 autoreconf --install --force --verbose ${ACLOCAL_ARGS}
-rm -f po/Makevars.template ABOUT-NLS
-echo > ABOUT-NLS
-mv -f INSTALL.git INSTALL
+rm -f po/Makevars.template
 
 ##
 ##  files which need to be regenerated
 ##
-rm -f vlc-config.in vlc-config
 rm -f stamp-h*
 
 # Shut up
 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: "pkg-config" is missing from your system. Certain
-libraries may not be detected properly.
-EOF
-fi
-
 echo "Successfully bootstrapped"