X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=bootstrap;h=0334f46bc91ba217136f022966d679fd9a700f50;hb=c60652e38ac6afd74bd8225e9dae5406f13aaa4f;hp=b83d506c86491a71b65f86e05c360c54c90135ef;hpb=c2a934c0ffe3b39060ea28bce715d2dff426ca39;p=vlc

diff --git a/bootstrap b/bootstrap
index b83d506c86..0334f46bc9 100755
--- a/bootstrap
+++ b/bootstrap
@@ -1,357 +1,150 @@
 #! /bin/sh
 
 ##  bootstrap file for the VLC media player
-##  $Id: bootstrap,v 1.42 2003/02/02 04:01:29 sam Exp $
 ##
-##  Authors: Samuel Hocevar <sam@zoy.org>
+## Copyright (C) 2005-2008 the VideoLAN team
+##
+##  Authors: Sam Hocevar <sam@zoy.org>
+##           Rémi Denis-Courmont <rem # videolan # org>
 
-if test x$# != x0; then
-  echo "Usage: ./bootstrap"
-  echo "  Calls automake, autoconf, autoheader, autopoint and other auto* to build"
-  echo "  Makefiles."
+if test "$#" != "0"; then
+  echo "Usage: $0"
+  echo "  Calls autoreconf to generate m4 macros and prepare Makefiles."
   exit 1
 fi
 
 ###
 ###  Get a sane environment, just in case
 ###
-LANG=C
-export LANG
 CYGWIN=binmode
 export CYGWIN
 
-##
-## Naively assume our system doesn't suck. Unfortunately it seldom doesn't.
-##
-SEDSUCKS=no
-PERLSUCKS=no
-AUTOMAKESUCKS=no
-INSTALLSUCKS=no
-
-##
-## Check that our tools don't suck
-##
-if test ! 20000 -eq `perl -e 'printf "%s\n","a"x20000' | sed -e 's/.//' 2>/dev/null | wc -c`
-then
-  SEDSUCKS=yes
-fi
+set -e
+set -x
 
-# Mac OS X stacksize sucks
-if test x`uname -s` = xDarwin; then ulimit -s 20000; fi
+cd "$(dirname "$0")"
 
 ##
-## Generate the modules makefile, by parsing modules/**/Modules.am
+## Check for various tools
 ##
 
-printf "generating Modules.am and configure.ac"
+ACLOCAL_ARGS="-I m4 ${ACLOCAL_ARGS}"
 
-echo > Modules.am
-echo > configure.ac
+# 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
+  elif test ".`uname -s`" = ".BeOS"; then
+    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
+  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
 
-ALL_FLAGS="`sed -n -e '/^[^=A-Z]*[A-Z]*FLAGS_[^=]*=/s/[^=A-Z]*\([A-Z]*FLAGS_[^=]*=\).*/\1/p' < configure.ac.in | sort | uniq`"
+# 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
+fi
 
-cat >> configure.ac << EOF
-dnl ################################################################
-dnl # Do not edit this file, it was generated from configure.ac.in #
-dnl ################################################################
+# 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
 
-EOF
-sed -n -e '/dnl do not touch this line/q;p' < configure.ac.in >> configure.ac
+##
+## Generate the modules makefile, by parsing modules/**/Modules.am
+##
 
-modules=""
-for mf in `sed -ne 's@[^a-z]*\([^ ]*\)am.*@modules/\1am@p' < modules/Makefile.am`
-do
-  printf "."
-  dir=`echo ${mf} | sed -e 's@\(.*\)/.*@\1@'`
-  topdir=`echo ${dir} | cut -f2 -d/`
-  sym=`echo ${dir} | sed -e 'y@/@_@'`
-  cat >> Modules.am << EOF
-# Directory ${dir}
+set +x
+echo "generating modules/**/Makefile.am"
 
-include ${dir}/Modules.am
+# Prepare m4/private.m4
+rm -f m4/private.m4 && cat > m4/private.m4 << EOF
+dnl  Private VLC macros - generated by bootstrap
 
 EOF
-  sed -n -e 's/^ *SOURCES_\([^ ]*\).*/\1/p' < ${mf} | while read mod
-  do
-    LINKER="LINK"
-    if echo "$ALL_FLAGS" | grep '^CPPFLAGS_'${mod}'=$' >/dev/null 2>&1; then
-        echo "AC_SUBST(CPPFLAGS_${mod})" >> configure.ac; fi
-    if echo "$ALL_FLAGS" | grep '^CFLAGS_'${mod}'=$' >/dev/null 2>&1; then
-        echo "AC_SUBST(CFLAGS_${mod})" >> configure.ac; fi
-    if echo "$ALL_FLAGS" | grep '^CXXFLAGS_'${mod}'=$' >/dev/null 2>&1; then
-        LINKER="CXXLINK"
-        echo "AC_SUBST(CXXFLAGS_${mod})" >> configure.ac; fi
-    if echo "$ALL_FLAGS" | grep '^OBJCFLAGS_'${mod}'=$' >/dev/null 2>&1; then
-        LINKER="OBJCLINK"
-        echo "AC_SUBST(OBJCFLAGS_${mod})" >> configure.ac; fi
-    if echo "$ALL_FLAGS" | grep '^LDFLAGS_'${mod}'=$' >/dev/null 2>&1; then
-        echo "AC_SUBST(LDFLAGS_${mod})" >> configure.ac; fi
-    if grep '^SOURCES_'${mod}'.*=.*PRIVATE' < ${mf} >/dev/null 2>&1; then
-        PRIVATE='#'; else
-        PRIVATE=''; fi
-    if grep '^nodist_SOURCES_'${mod}'' < ${mf} >/dev/null 2>&1; then
-        NODIST=''; else
-        NODIST='#'; fi
-    cat >> configure.ac << EOF
-AM_CONDITIONAL(${mod}_plugin, test x\$${mod}_plugin = xyes)
-AM_CONDITIONAL(${mod}_builtin, test x\$${mod}_builtin = xyes)
-EOF
-# Generation of Modules.am
-# ~~~~~~~~~~~~~~~~~~~~~~~~
-# - L_ is for LIBRARIES_, D_ for DATA_, B_ for BUILT_SOURCES_, F_ for LDFLAGS_,
-#   S_ for SOURCES_, _p is for _plugin, _b is for _builtin. This is to reduce
-#   the resulting file size.
-# - *_CFLAGS, *_CXXFLAGS etc. include *_CPPFLAGS because per-object CPPFLAGS
-#   does not seem to work properly with any automake version I tested.
-    cat >> Modules.am << EOF
-# The ${mod} plugin
-
-if ${mod}_plugin
-if UNTRUE
-L_${mod}_p = ${dir}/lib${mod}_plugin.a
-endif
-D_${mod}_p = ${dir}/lib${mod}_plugin\$(LIBEXT)
-${NODIST}B_${mod}_p = \$(nodist_SOURCES_${mod})
-endif
-if ${mod}_builtin
-L_${mod}_b = ${dir}/lib${mod}.a
-F_${mod}_b = \$(LDFLAGS_${mod})
-if BUILD_MOZILLA
-L_${mod}_pic = ${dir}/lib${mod}_pic.a
-endif
-${NODIST}B_${mod}_b = \$(nodist_SOURCES_${mod})
-endif
-
-L_builtin += \$(L_${mod}_b)
-L_builtin_pic += \$(L_${mod}_pic)
-LDFLAGS_builtin += \$(F_${mod}_b)
-${PRIVATE}BUILT_SOURCES += \$(B_${mod}_p) \$(B_${mod}_b)
-PLUGIN_FILES += \$(D_${mod}_p)
-
-${PRIVATE}${sym}_lib${mod}_plugin_a_SOURCES = \$(SOURCES_${mod})
-${NODIST}${PRIVATE}nodist_${sym}_lib${mod}_plugin_a_SOURCES = \$(nodist_SOURCES_${mod})
-${sym}_lib${mod}_plugin_a_CPPFLAGS = \$(CPPFLAGS_plugin) \$(CPPFLAGS_${mod}) -DMODULE_NAME=${mod} -DMODULE_NAME_IS_${mod}
-${sym}_lib${mod}_plugin_a_CFLAGS = \$(CFLAGS_plugin) \$(CFLAGS_${mod}) \$(${sym}_lib${mod}_plugin_a_CPPFLAGS)
-${sym}_lib${mod}_plugin_a_CXXFLAGS = \$(CXXFLAGS_plugin) \$(CXXFLAGS_${mod}) \$(${sym}_lib${mod}_plugin_a_CPPFLAGS)
-${sym}_lib${mod}_plugin_a_OBJCFLAGS = \$(OBJCFLAGS_plugin) \$(OBJCFLAGS_${mod}) \$(${sym}_lib${mod}_plugin_a_CPPFLAGS)
-
-${sym}_lib${mod}_pic_a_SOURCES = ${PRIVATE}\$(SOURCES_${mod})
-${NODIST}nodist_${sym}_lib${mod}_pic_a_SOURCES = ${PRIVATE}\$(nodist_SOURCES_${mod})
-${sym}_lib${mod}_pic_a_CPPFLAGS = \$(CPPFLAGS_builtin_pic) \$(CPPFLAGS_${mod}) -DMODULE_NAME=${mod} -DMODULE_NAME_IS_${mod}
-${sym}_lib${mod}_pic_a_CFLAGS = \$(CFLAGS_builtin_pic) \$(CFLAGS_${mod}) \$(${sym}_lib${mod}_pic_a_CPPFLAGS)
-${sym}_lib${mod}_pic_a_CXXFLAGS = \$(CXXFLAGS_builtin_pic) \$(CXXFLAGS_${mod}) \$(${sym}_lib${mod}_pic_a_CPPFLAGS)
-${sym}_lib${mod}_pic_a_OBJCFLAGS = \$(OBJCFLAGS_builtin_pic) \$(OBJCFLAGS_${mod}) \$(${sym}_lib${mod}_pic_a_CPPFLAGS)
-
-${sym}_lib${mod}_a_SOURCES = ${PRIVATE}\$(SOURCES_${mod})
-${NODIST}nodist_${sym}_lib${mod}_a_SOURCES = ${PRIVATE}\$(nodist_SOURCES_${mod})
-${sym}_lib${mod}_a_CPPFLAGS = \$(CPPFLAGS_builtin) \$(CPPFLAGS_${mod}) -DMODULE_NAME=${mod} -DMODULE_NAME_IS_${mod}
-${sym}_lib${mod}_a_CFLAGS = \$(CFLAGS_builtin) \$(CFLAGS_${mod}) \$(${sym}_lib${mod}_a_CPPFLAGS)
-${sym}_lib${mod}_a_CXXFLAGS = \$(CXXFLAGS_builtin) \$(CXXFLAGS_${mod}) \$(${sym}_lib${mod}_a_CPPFLAGS)
-${sym}_lib${mod}_a_OBJCFLAGS = \$(OBJCFLAGS_builtin) \$(OBJCFLAGS_${mod}) \$(${sym}_lib${mod}_a_CPPFLAGS)
-
-libvlc_LIBRARIES += \$(L_${mod}_b) \$(L_${mod}_pic)
-lib${mod}_DATA = \$(D_${mod}_p)
-
-lib${mod}dir = \$(libdir)/vlc/${topdir}
-${PRIVATE}noinst_LIBRARIES += \$(L_${mod}_p)
-${PRIVATE}${dir}/lib${mod}_plugin\$(LIBEXT): \$(${sym}_lib${mod}_plugin_a_OBJECTS)
-${PRIVATE}	\$(${LINKER}) \$(${sym}_lib${mod}_plugin_a_OBJECTS) -shared \$(LDFLAGS_plugins) \$(LDFLAGS_${mod})
 
+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])])
 
 EOF
-  done
-done
-
-echo "AM_CONDITIONAL(UNTRUE, false)" >> configure.ac
-sed -n -e '/dnl do not touch this line/,//p' < configure.ac.in >> configure.ac
+fi
 
-echo "done."
+sh modules/genmf `sed -ne 's,modules/\(.*\)/Makefile,\1,p' configure.ac`
 
 ###
 ###  classic bootstrap stuff
 ###
 set -x
-rm -f aclocal.m4 m4/oldgettext.m4 configure config.guess config.log config.sub ltmain.sh libtool ltconfig missing mkinstalldirs depcomp install-sh
-rm -Rf intl
-
-# Check for gettext
-if gettextize --version >/dev/null 2>&1
-then
-if expr `gettextize --version | sed -e '1s/[^0-9]*//' -e q` \
-        '>' 0.11.2 >/dev/null 2>&1
-then
-  # We have gettext, and a recent version! Everything is cool.
-  autopoint || exit 1
-  GETTEXT=yes
-else
-  # User's gettext is too old. try to continue anyway.
-  mkdir -p intl
-  echo > intl/Makefile.am
-  echo 'AC_DEFUN([AM_GNU_GETTEXT_VERSION], [])' > m4/oldgettext.m4
-  GETTEXT=old
-fi;else
-  # we don't have gettext. grmbl. try to continue anyway.
-  mkdir -p intl
-  echo > intl/Makefile.am
-  echo 'AC_DEFUN([AM_GNU_GETTEXT_VERSION], [])' > m4/oldgettext.m4
-  GETTEXT=no
-fi
-
-# Check for automake
-amvers="none"
-if automake-1.7 --version >/dev/null 2>&1
-then
-  amvers="-1.7"
-else
-  if 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
-    fi
-  else
-    if automake-1.5 --version >/dev/null 2>&1
-    then
-      INSTALLSUCKS=yes
-      amvers="-1.5"
-    else
-      if automake --version > /dev/null 2>&1
-      then
-        amvers=`automake --version | sed -e '1s/[^0-9]*//' -e q`
-        case $amvers in
-        1.6|1.6.0|1.6.1)
-          AUTOMAKESUCKS=yes ;;
-        1.5|1.5.*)
-          INSTALLSUCKS=yes ;;
-        esac
-
-        if expr "$amvers" "<" "1.5" > /dev/null 2>&1
-        then amvers="none"
-        else amvers=""
-        fi
-      fi
-    fi
-  fi
-fi
-
-if test x$amvers = xnone
-then
-  set +x
-  echo "you need automake version 1.5 or later"
-  exit 1
-fi
-
-# Do the rest
-aclocal${amvers} -I m4 || exit 1
-autoheader || exit 1
 
-automake${amvers} --add-missing --copy || PERLSUCKS=yes
+# Automake complains if these are not present
+echo > vlc-config.in
+echo > ABOUT-NLS
+cp -f INSTALL INSTALL.git
 
-case "$PERLSUCKS" in
-  no)
-  ;;
-  yes)
-    set +x
-    cat << EOF
-
-=======================================================================
-IMPORTANT NOTE: automake failed, please check the error messages. If it
-actually segfaulted, it might be because of insufficient stack size; set
-the stack size to something bigger or unlimited (\`unlimit stacksize')
-and try again.
-EOF
-    exit 1
-  ;;
-esac
-
-# Wrap automake's long lines, because the Solaris sed doesn't support lines
-# longer than 3999 characters, and ./configure calls sed. We use Perl instead
-# of sed for obvious reasons :)
-perl -ne 'if(/^.{500}/) {s/(.{200}[^ ]* )/$1\\\n\t/g} print $_' < Makefile.in > Makefile.in.tmp && mv Makefile.in.tmp Makefile.in
-
-autoconf || exit 1
+autoreconf --install --force --verbose ${ACLOCAL_ARGS}
+rm -f po/Makevars.template ABOUT-NLS
+echo > ABOUT-NLS
+mv -f INSTALL.git INSTALL
 
 ##
-##  headers which need to be regenerated
+##  files which need to be regenerated
 ##
-rm -f src/misc/modules_builtin.h src/misc/modules_plugin.h
-rm -f include/vlc_symbols.h
-rm -f mozilla/vlcintf.h
+rm -f vlc-config.in vlc-config
+rm -f src/misc/modules_builtin.h
+rm -f stamp-builtin stamp-h* mozilla/stamp-pic
 
-##
-##  Shut up
-##
+# Shut up
 set +x
 
 ##
-##  Tell the user about gettext and sed
+##  Tell the user about gettext, pkg-config and sed
 ##
-case "$GETTEXT" in
-  yes)
-  ;;
-  no)
-    cat << EOF
-
-===========================================================
-IMPORTANT NOTE: you do not have gettext installed on your
-system. The vlc build will work, but you will not have
-internationalization support. We suggest installing gettext.
-EOF
-  ;;
-  old)
-    cat << EOF
-
-==========================================================
-NOTE: you have an old version of gettext installed on your
-system. The vlc build will work, but if your system does not
-have libintl you will not have internationalization support.
-We suggest upgrading to gettext 0.11.3 or later.
+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
-  ;;
-esac
-
-case "$AUTOMAKESUCKS" in
-  no)
-  ;;
-  yes)
-    cat << EOF
-
-=============================================================
-IMPORTANT NOTE: your version of automake has a bug which will
-prevent proper plugin compilation. Either compile VLC with
-the --disable-plugins flag, or use a version of automake newer
-than 1.6.1 (1.6.2 is OK, and so are the 1.5 series).
-EOF
-  ;;
-esac
-
-case "$INSTALLSUCKS" in
-  no)
-  ;;
-  yes)
-    cat << EOF
-
-=============================================================
-IMPORTANT NOTE: your version of automake has a bug which will
-prevent proper installation. Do not use "make install" with this
-version of automake, or use a version of automake newer than 1.5
-(such as 1.6 or 1.7).
-EOF
-  ;;
-esac
+fi
 
-case "$SEDSUCKS" in
-  no)
-  ;;
-  yes)
-    cat << EOF
+if [ "$PKGCONFIG" = "no" ]; then
+  cat << EOF
 
-=============================================================
-IMPORTANT NOTE: the version of 'sed' on your system is unable
-to handle long lines. bootstrap will try its best to generate
-a correct Makefile, but you should expect problems. We highly
-recommend installing GNU sed.
+==============================================================
+NOTE: "pkg-config" is missing from your system. Certain
+libraries may not be detected properly.
 EOF
-  ;;
-esac
+fi
 
+echo "Successfully bootstrapped"