X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=bootstrap;h=35147d205eea91e8dac0c7a5a6ef8997ac859920;hb=7bc6040d182732f888a916fd48c8555a4f020f09;hp=b3680144a03f44bdb968b927f6bf8a7a332bf931;hpb=8ea0368184910732fa49a8802abec249736fcc22;p=vlc diff --git a/bootstrap b/bootstrap index b3680144a0..35147d205e 100755 --- a/bootstrap +++ b/bootstrap @@ -28,10 +28,8 @@ set -x ## ## Check for various tools ## -AUTOMAKESUCKS=no -INSTALLSUCKS=no -ACLOCAL_ARGS="-I m4" +ACLOCAL_ARGS="-I m4 ${ACLOCAL_ARGS}" # Check for contrib directory if test -d extras/contrib/bin; then @@ -46,28 +44,42 @@ if test -d extras/contrib/bin; then export LIBRARY_PATH=./extras/contrib/lib:$LIBRARY_PATH export BELIBRARIES=./extras/contrib/lib:$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 # Check for autoconf rm -f m4/autoconf260.m4 -case "$(autoconf --version|head -1)" in +case "$(autoconf --version|head -n 1)" in *2.5[012345678]*) - echo "Hey, your autoconf is quite old. Update it." >&2 + echo "$0: you need autoconf version 2.59 or later (2.60 recommanded)." exit 1 ;; *2.59*) echo "Enabling provisional autoconf 2.59 work-around. Update autoconf ASAP." + echo "Press Enter to continue" + read cp -f extras/m4/autoconf260.m4 m4/ ;; 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,16 +90,18 @@ if test "${amvers}" = "no" && automake --version > /dev/null 2>&1; then fi case "${amvers}" in - no|1.[0123456]|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 # Check for libtool libtoolize="no" -if glibtoolize --version >/dev/null 2>&1; then +if test -x extras/contrib/bin/libtoolize; then + libtoolize="extras/contrib/bin/libtoolize" +elif glibtoolize --version >/dev/null 2>&1; then libtoolize="glibtoolize" elif libtoolize --version >/dev/null 2>&1; then libtoolize="libtoolize" @@ -102,7 +116,7 @@ fi # Check for gettext if gettextize --version >/dev/null 2>&1; then # Autopoint is available from 0.11.3, but we need 0.11.5 -if expr `gettextize --version | sed -e '1s/[^0-9]*//' -e q` \ +if expr `gettextize --version |cut -d' ' -f2- | sed -e '1s/[^0-9]*//' -e q` \ '>=' 0.11.5 >/dev/null 2>&1; then # We have gettext, and a recent version! Everything is cool. autopoint=autopoint @@ -113,7 +127,7 @@ else GETTEXT=old fi;else set +x - echo "you need gettextize (package gettext-devel or gettext)" + echo "$0: you need gettextize (package gettext-devel or gettext)" exit 1 fi @@ -125,8 +139,8 @@ else PKGCONFIG=no fi -aclocal=aclocal${amvers} -automake=automake${amvers} +aclocal=aclocal${amsuff} +automake=automake${amsuff} autoconf=autoconf autoheader=autoheader @@ -157,21 +171,7 @@ AC_DEFUN([AM_GNU_GETTEXT_VERSION], []) EOF fi -rm -f m4/private.m4-tmp1 && cat > m4/private.m4-tmp1 << EOF -dnl The required AM_CONDITIONAL calls -dnl XXX: too many conditionals make the build very slow, disabled them -AC_DEFUN([VLC_CONDITIONALS], [ -EOF -rm -f m4/private.m4-tmp2 && cat > m4/private.m4-tmp2 << EOF -dnl The required AC_SUBST calls -AC_DEFUN([VLC_SUBSTS], [ -EOF -rm -f m4/private.m4-tmp3 && cat > m4/private.m4-tmp3 << EOF -dnl The required AC_OUTPUT calls -dnl XXX: this feature is only supported starting from automake-1.7 -AC_DEFUN([VLC_MAKEFILES], [AC_OUTPUT([ -EOF -rm -f m4/private.m4-tmp4 && cat > m4/private.m4-tmp4 << EOF +cat >> m4/private.m4 << EOF dnl Helper macro for vlc-config generation AC_DEFUN([VLC_CONFIG_HELPER], [ cat >> vlc-config.in << BLAH @@ -182,235 +182,17 @@ 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 - -for dir in `sed -ne 's,modules/\(.*\)/Makefile,\1,p' configure.ac` -do - printf "." - modf="modules/${dir}/Modules.am" - makf="modules/${dir}/Makefile.am" - basedir="`echo "${dir}" | cut -f1 -d/`" - # automake will not recurse for make dist if we don't define SUBDIRS = . - subdirs="`sed -ne 's,'modules/${dir}'/\([^/]*\)/Makefile,\1,p' configure.ac | xargs`" - mods="`sed -n -e 's/^ *SOURCES_\([^ ]*\).*/\1/p' < "${modf}" | xargs`" - extra_libs="" - extra_ltlibs="" - for mod in $mods - do - extra_libs="${extra_libs} lib${mod}_plugin.a lib${mod}.a" - extra_ltlibs="${extra_ltlibs} lib${mod}_plugin.la" - done - rm -f "${makf}" && cat > "${makf}" << EOF - -# ${makf} automatically generated from ${modf} by bootstrap -# DO NOT EDIT - edit Modules.am or \$(top_srcdir)/bootstrap instead - -basedir = ${basedir} -mods = ${mods} - -NULL = -libvlc_LTLIBRARIES = -noinst_LTLIBRARIES = -EXTRA_DIST = Modules.am -BUILT_SOURCES = -clean_modules = -SUBDIRS = ${subdirs} -SUFFIXES = _plugin\$(LIBEXT) _plugin.a - -libvlcdir = \$(libdir)/vlc/\$(basedir) - -EXTRA_LIBRARIES = ${extra_libs} -EXTRA_LTLIBRARIES = ${extra_ltlibs} - -include Modules.am - -LTLIBVLC = \$(top_builddir)/src/libvlc.la - -if BUILD_SHARED -LIBVLC = -L\$(top_builddir)/src -lvlc -LIBADD = \$(LIBVLC) -endif - -all: all-modules - -nice: - \$(top_builddir)/compile - -# Find out which modules were enabled and tell make to build them -all-modules: -if USE_LIBTOOL - @set fnord \$\$MAKEFLAGS; amf=\$\$2; targets=\`\\ - z=\$\$(\$(VLC_CONFIG) --list plugin); for mod in \$(mods); do case "\$\$z " in *\ \$\${mod}\ *) echo lib\$\${mod}_plugin.la;; esac; done; \\ - \`; case "\$\$targets" in *lib*) \$(MAKE) \$(AM_MAKEFLAGS) \$\$targets || case "\$\$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; ;; esac; \\ - test -z "\$\$fail" -else - @set fnord \$\$MAKEFLAGS; amf=\$\$2; targets=\`\\ - z=\$\$(\$(VLC_CONFIG) --list plugin); for mod in \$(mods); do case "\$\$z " in *\ \$\${mod}\ *) echo lib\$\${mod}_plugin\$(LIBEXT);; esac; done; \\ - z=\$\$(\$(VLC_CONFIG) --list builtin); for mod in \$(mods); do case "\$\$z " in *\ \$\${mod}\ *) echo lib\$\${mod}.a;; esac; done; \\ - \`; case "\$\$targets" in *lib*) \$(MAKE) \$(AM_MAKEFLAGS) \$\$targets || case "\$\$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; ;; esac; \\ - test -z "\$\$fail" -endif - -# Build a plugin with the adequate linker and linker's flags -_plugin.a_plugin\$(LIBEXT): - @mod="\$*" ; mod=\$\${mod#lib} ; \ - ldfl="\`\$(VLC_CONFIG) --libs plugin \$\$mod\` \$(LIBADD) -u \$(SYMPREF)\$(VLC_ENTRY)" ; \ - case \`\$(VLC_CONFIG) --linkage \$\$mod\` in \\ - c++) ld="\$(CXXLINK)" ;; \ - objc) ld="\$(OBJCLINK)" ;; \ - c|*) ld="\$(LINK)" ;; \ - esac ; \ - echo \$\$ld \$< \$\$ldfl ; \ - \$\$ld \$< \$\$ldfl -#ifneq (,\$(findstring cygwin,\$(host))) -# mv -f "\$@.exe" "\$@" -#endif - @if test -f "\$@.exe"; then mv -f "\$@.exe" "\$@"; fi - -if MAINTAINER_MODE -\$(srcdir)/Makefile.am: \$(srcdir)/Modules.am \$(top_srcdir)/bootstrap - cd \$(top_srcdir) && \$(SHELL) ./bootstrap -endif - -mostlyclean-local: -if USE_LIBTOOL - -rm -f *.la -else - -rm -f *.a *\$(LIBEXT) -endif - -clean-local: \$(clean_modules) - -### automake creates libvlcdir after running install-*-local -### so we have to create it ourselves first -install-exec-local: all-modules -if USE_LIBTOOL - @if test -z "\$(libvlc_LTLIBRARIES)"; then \ - z=\$\$(\$(VLC_CONFIG) --list plugin); \ - m=\`for mod in \$(mods); do case "\$\$z " in *\ \$\${mod}\ *) echo -n " lib\$\${mod}_plugin.la" ;; esac; done\` ; \ - test -z "\$\$m" || \ - \$(MAKE) \$(AM_MAKEFLAGS) libvlc_LTLIBRARIES="\$\$m" install-libvlcLTLIBRARIES || exit \$\$? ; \ - fi -else - mkdir -p -- "\$(DESTDIR)\$(libvlcdir)" - @z=\$\$(\$(VLC_CONFIG) --list plugin); \ - for mod in \$(mods); do \ - case "\$\$z " \ - in *\ \$\${mod}\ *) \ - echo \$(INSTALL_PROGRAM) "lib\$\${mod}_plugin\$(LIBEXT)" "\$(DESTDIR)\$(libvlcdir)/" ; \ - \$(INSTALL_PROGRAM) "lib\$\${mod}_plugin\$(LIBEXT)" "\$(DESTDIR)\$(libvlcdir)/" || exit \$\$?; \ - ;; \ - esac; \ - done -endif - -uninstall-local: -if USE_LIBTOOL - @if test -z "\$(libvlc_LTLIBRARIES)"; then \ - z=\$\$(\$(VLC_CONFIG) --list plugin); \ - m=\`for mod in \$(mods); do case "\$\$z " in *\ \$\${mod}\ *) echo -n " lib\$\${mod}_plugin.la" ;; esac; done\` ; \ - test -z "\$\$m" || \ - \$(MAKE) \$(AM_MAKEFLAGS) libvlc_LTLIBRARIES="\$\$m" uninstall-libvlcLTLIBRARIES || exit \$\$?; \ - fi -else - @z=\$\$(\$(VLC_CONFIG) --list plugin); \ - for mod in \$(mods); do \ - case "\$\$z " \ - in *\ \$\${mod}\ *) \ - echo rm -f "\$(DESTDIR)\$(libvlcdir)/lib\$\${mod}_plugin\$(LIBEXT)" ; \ - rm -f "\$(DESTDIR)\$(libvlcdir)/lib\$\${mod}_plugin\$(LIBEXT)" || true; \ - ;; \ - esac; \ - done -endif - -EOF - for mod in $mods - do - if grep '^nodist_SOURCES_'${mod}'' < "${modf}" >/dev/null 2>&1; then - NODIST=''; else - NODIST='#'; fi - cat >> m4/private.m4-tmp4 << EOF - ${mod}) list="\\\${list} ${dir}/lib${mod}" ;; -EOF -# Generation of modules/**/Makefile.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. because per-object CPPFLAGS does not seem to -# work properly with any automake version I tested. - cat >> "${makf}" << EOF -# The ${mod} plugin - -EOF - if [ "${NODIST}" != "#" ]; then cat >> "${makf}" << EOF -clean_modules += clean-${mod} -clean-${mod}: - -test -z "\$(nodist_SOURCES_${mod})" || rm -f \$(nodist_SOURCES_${mod}) EOF - fi - if [ "${NODIST}" != "#" ]; then cat >> "${makf}" << EOF -BUILT_SOURCES += \$(B${mod}) -EOF - fi - cat >> "${makf}" << EOF -lib${mod}_plugin_a_SOURCES = \$(SOURCES_${mod}) -lib${mod}_plugin_la_SOURCES = \$(SOURCES_${mod}) -EOF - if [ "${NODIST}" != "#" ]; then cat >> "${makf}" << EOF -nodist_lib${mod}_plugin_a_SOURCES = \$(nodist_SOURCES_${mod}) -nodist_lib${mod}_plugin_la_SOURCES = \$(nodist_SOURCES_${mod}) -EOF - fi - cat >> "${makf}" << EOF -lib${mod}_plugin_a_CFLAGS = \`\$(VLC_CONFIG) --cflags plugin ${mod}\` -lib${mod}_plugin_a_CXXFLAGS = \`\$(VLC_CONFIG) --cxxflags plugin ${mod}\` -lib${mod}_plugin_a_OBJCFLAGS = \`\$(VLC_CONFIG) --objcflags plugin ${mod}\` -lib${mod}_plugin_la_CFLAGS = \`\$(VLC_CONFIG) --cflags plugin ${mod}\` -lib${mod}_plugin_la_CXXFLAGS = \`\$(VLC_CONFIG) --cxxflags plugin ${mod}\` -lib${mod}_plugin_la_OBJCFLAGS = \`\$(VLC_CONFIG) --objcflags plugin ${mod}\` -lib${mod}_plugin_la_LDFLAGS = \`\$(VLC_CONFIG) --libs plugin ${mod}\` \\ - -rpath '\$(libvlcdir)' -avoid-version -module -shrext \$(LIBEXT) \\ - -export-symbol-regex ^\$(VLC_ENTRY)\$\$ -no-undefined -lib${mod}_plugin_la_LIBADD = \$(LTLIBVLC) - -lib${mod}_a_SOURCES = \$(SOURCES_${mod}) -EOF - if [ "${NODIST}" != "#" ]; then cat >> "${makf}" << EOF -nodist_lib${mod}_a_SOURCES = \$(nodist_SOURCES_${mod}) -EOF - fi - cat >> "${makf}" << EOF -lib${mod}_a_CFLAGS = \`\$(VLC_CONFIG) --cflags builtin pic ${mod}\` -lib${mod}_a_CXXFLAGS = \`\$(VLC_CONFIG) --cxxflags builtin pic ${mod}\` -lib${mod}_a_OBJCFLAGS = \`\$(VLC_CONFIG) --objcflags builtin pic ${mod}\` -EOF - done -done +modules/genmf `sed -ne 's,modules/\(.*\)/Makefile,\1,p' configure.ac` -cat >> m4/private.m4-tmp1 << EOF -]) -EOF -cat m4/private.m4-tmp1 >> m4/private.m4 && rm -f m4/private.m4-tmp1 -cat >> m4/private.m4-tmp2 << EOF -]) -EOF -cat m4/private.m4-tmp2 >> m4/private.m4 && rm -f m4/private.m4-tmp2 -cat >> m4/private.m4-tmp3 << EOF -])]) -EOF -cat m4/private.m4-tmp3 >> m4/private.m4 && rm -f m4/private.m4-tmp3 -cat >> m4/private.m4-tmp4 << EOF +cat >> m4/private.m4 << EOF BLAH ]) EOF -cat m4/private.m4-tmp4 >> m4/private.m4 && rm -f m4/private.m4-tmp4 - -echo " done." ### ### classic bootstrap stuff @@ -421,7 +203,7 @@ set -x rm -f aclocal.m4 configure config.log config.h config.h.in rm -Rf autom4te*.cache # remove old autotools extra cruft -rm -f config.guess config.sub missing mkinstalldirs compile depcomp install-sh +rm -f config.guess config.sub missing mkinstalldirs depcomp install-sh # remove new autotools extra cruft rm -Rf autotools mkdir autotools @@ -449,7 +231,12 @@ if test -f "ltmain.sh"; then fi # Do the rest +echo $PATH +which autopoint +autopoint --version + ${autopoint} -f +rm -f po/Makevars.template ${aclocal} ${ACLOCAL_ARGS} ${autoconf} ${autoheader} @@ -488,3 +275,4 @@ reliable. EOF fi +echo "Successfully bootstrapped"