X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=bootstrap;h=84806c4c688a348358df4372e4d7038a79e2215e;hb=7cc72564f95e39aa619884fecb04558db63bd6c9;hp=cff3fa98b2646f5b60c849f28cfb3eb6fffd144e;hpb=9621628b651981745a03eae33d01de34baead027;p=vlc diff --git a/bootstrap b/bootstrap index cff3fa98b2..84806c4c68 100755 --- a/bootstrap +++ b/bootstrap @@ -1,11 +1,13 @@ #! /bin/sh ## bootstrap file for the VLC media player -## $Id$ ## -## Copyright (C) 2005 the VideoLAN team +## Copyright (C) 2005-2006 the VideoLAN team ## -## Initial author: Sam Hocevar +## Authors: Sam Hocevar +## Rémi Denis-Courmont +## +## Muahaha! no annoying dollar I dee dollar that causes rebuild at commit if test "$#" != "0"; then echo "Usage: $0" @@ -36,7 +38,9 @@ ACLOCAL_ARGS="-I m4" # Check for contrib directory if test -d extras/contrib/bin; then export PATH=./extras/contrib/bin:$PATH - ACLOCAL_ARGS="${ACLOCAL_ARGS} -I extras/contrib/share/aclocal" + if test -d extras/contrib/share/aclocal; then + ACLOCAL_ARGS="${ACLOCAL_ARGS} -I extras/contrib/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 @@ -47,38 +51,45 @@ if test -d extras/contrib/bin; then fi # Check for automake -amvers="none" -if automake-1.9 --version >/dev/null 2>&1; then - amvers="-1.9" -elif automake-1.8 --version >/dev/null 2>&1; then - amvers="-1.8" -elif automake-1.7 --version >/dev/null 2>&1; then - amvers="-1.7" -elif 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 +amvers="no" +for v in "-1.9" "19" "-1.8" "18" "-1.7" "17" "-1.6" "16" "-1.5" "15"; do + if automake${v} --version >/dev/null 2>&1; then + amsuff="${v}" + amvers="${v}" + break fi -elif automake-1.5 --version >/dev/null 2>&1; then - INSTALLSUCKS=yes - amvers="-1.5" -elif automake --version > /dev/null 2>&1; then - amvers="" - case "`automake --version | sed -e '1s/[^0-9]*//' -e q`" in - 0|0.*|1|1.[01234]|1.[01234][-.]*) - amvers="none" ;; - 1.5|1.5.*) - INSTALLSUCKS=yes ;; - 1.6|1.6.0|1.6.1) - AUTOMAKESUCKS=yes ;; - 1.9|1.9.2) - ;; - esac +done + +if test "${amvers}" = "no" && automake --version > /dev/null 2>&1; then + amvers="`automake --version | sed -e '1s/[^0-9]*//' -e q`" + amsuff="" +fi + +case "${amvers}" in + -1.6|16|1.6|1.6.0*|1.6.1*) + AUTOMAKESUCKS=yes + ;; + -1.5|15|1.5|1.5.*) + INSTALLSUCKS=yes + ;; + no|1.[01234]|1.[01234].*|1[01234]) + set +x + echo "$0: you need automake version 1.5 or later" + exit 1 + ;; +esac + +# Check for libtool +libtoolize="no" +if glibtoolize --version >/dev/null 2>&1; then + libtoolize="glibtoolize" +elif libtoolize --version >/dev/null 2>&1; then + libtoolize="libtoolize" fi -if test "${amvers}" = "none"; then +if test "$libtoolize" = "no"; then set +x - echo "you need automake version 1.5 or later" + echo "$0: you need libtool" exit 1 fi @@ -127,8 +138,8 @@ 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 this is a no-op -AC_DEFUN([PKG_CHECK_MODULES], [:], [], [], []) +dnl User does not have pkg-config, so assume package was not found +AC_DEFUN([PKG_CHECK_MODULES],[ifelse([\$4], , :, [\$4])]) EOF fi @@ -178,10 +189,11 @@ do 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" - extra_libs="${extra_libs} lib${mod}.a lib${mod}_pic.a" + extra_libs="${extra_libs} lib${mod}_plugin.a lib${mod}.a lib${mod}_pic.a" + extra_ltlibs="${extra_ltlibs} lib${mod}_plugin.la lib${mod}_builtin.la" done rm -f "${makf}" && cat > "${makf}" << EOF @@ -192,34 +204,51 @@ basedir = ${basedir} mods = ${mods} NULL = -libvlc_LIBRARIES = -noinst_LIBRARIES = -noinst_HEADERS = +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 = \$(top_builddir)/src/libvlc\$(LIBEXT) +LIBADD = \$(LIBVLC) +endif + all: all-modules # Find out which modules were enabled and tell make to build them all-modules: +if USE_LIBTOOL + @set fnord \$\$MAKEFLAGS; amf=\$\$2; targets=\`\\ + if test "\$(plugin)" != "no"; then z=\$\$(\$(VLC_CONFIG) --list plugin); for mod in \$(mods); do case "\$\$z " in *\ \$\${mod}\ *) echo lib\$\${mod}_plugin.la;; esac; done; fi; \\ + if test "\$(builtin)" != "no"; then z=\$\$(\$(VLC_CONFIG) --list builtin); for mod in \$(mods); do case "\$\$z " in *\ \$\${mod}\ *) echo lib\$\${mod}_builtin.la;; esac; done; fi; \\ + \`; 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=\`\\ if test "\$(plugin)" != "no"; then z=\$\$(\$(VLC_CONFIG) --list plugin); for mod in \$(mods); do case "\$\$z " in *\ \$\${mod}\ *) echo lib\$\${mod}_plugin\$(LIBEXT);; esac; done; fi; \\ if test "\$(builtin)" != "no"; then z=\$\$(\$(VLC_CONFIG) --list builtin); for mod in \$(mods); do case "\$\$z " in *\ \$\${mod}\ *) echo lib\$\${mod}.a;; esac; done; fi; \\ - if test "\$(pic)" == "pic"; then z=\$\$(\$(VLC_CONFIG) --list builtin); for mod in \$(mods); do case "\$\$z " in *\ \$\${mod}\ *) echo lib\$\${mod}_pic.a;; esac; done; fi; \\ + if test "\$(pic)" = "pic"; then z=\$\$(\$(VLC_CONFIG) --list builtin); for mod in \$(mods); do case "\$\$z " in *\ \$\${mod}\ *) echo lib\$\${mod}_pic.a;; esac; done; fi; \\ \`; 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:3} ; \ - ldfl="\`\$(VLC_CONFIG) --libs plugin \$\$mod\` -u \$(SYMPREF)\$(VLC_ENTRY)" ; \ + @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)" ;; \ @@ -227,16 +256,36 @@ _plugin.a_plugin\$(LIBEXT): 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 \ @@ -256,7 +305,7 @@ install-exec-local: all-modules ;; \ esac; \ done -if BUILD_MOZILLA +if BUILD_PIC @z=\$\$(\$(VLC_CONFIG) --list builtin); \ for mod in \$(mods); do \ case "\$\$z " \ @@ -267,8 +316,17 @@ if BUILD_MOZILLA esac; \ done endif +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 " \ @@ -287,7 +345,7 @@ uninstall-local: ;; \ esac; \ done -if BUILD_MOZILLA +if BUILD_PIC @z=\$\$(\$(VLC_CONFIG) --list builtin); \ for mod in \$(mods); do \ case "\$\$z " \ @@ -298,6 +356,7 @@ if BUILD_MOZILLA esac; \ done endif +endif EOF for mod in $mods @@ -320,7 +379,7 @@ EOF EOF if [ "${NODIST}" != "#" ]; then cat >> "${makf}" << EOF -clean-local: clean-${mod} +clean_modules += clean-${mod} clean-${mod}: -test -z "\$(nodist_SOURCES_${mod})" || rm -f \$(nodist_SOURCES_${mod}) @@ -332,15 +391,23 @@ 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)' -module -shrext \$(LIBEXT) +lib${mod}_plugin_la_LIBADD = \$(LTLIBVLC) lib${mod}_pic_a_SOURCES = \$(SOURCES_${mod}) EOF @@ -353,16 +420,21 @@ lib${mod}_pic_a_CFLAGS = \`\$(VLC_CONFIG) --cflags builtin pic ${mod}\` lib${mod}_pic_a_CXXFLAGS = \`\$(VLC_CONFIG) --cxxflags builtin pic ${mod}\` lib${mod}_pic_a_OBJCFLAGS = \`\$(VLC_CONFIG) --objcflags builtin pic ${mod}\` -lib${mod}_a_SOURCES = ${PRIVATE}\$(SOURCES_${mod}) +lib${mod}_a_SOURCES = \$(SOURCES_${mod}) +lib${mod}_builtin_la_SOURCES = \$(SOURCES_${mod}) EOF if [ "${NODIST}" != "#" ]; then cat >> "${makf}" << EOF -nodist_lib${mod}_a_SOURCES = ${PRIVATE}\$(nodist_SOURCES_${mod}) +nodist_lib${mod}_a_SOURCES = \$(nodist_SOURCES_${mod}) +nodist_lib${mod}_builtin_la_SOURCES = \$(nodist_SOURCES_${mod}) EOF fi cat >> "${makf}" << EOF lib${mod}_a_CFLAGS = \`\$(VLC_CONFIG) --cflags builtin ${mod}\` lib${mod}_a_CXXFLAGS = \`\$(VLC_CONFIG) --cxxflags builtin ${mod}\` lib${mod}_a_OBJCFLAGS = \`\$(VLC_CONFIG) --objcflags builtin ${mod}\` +lib${mod}_builtin_la_CFLAGS = \`\$(VLC_CONFIG) --cflags builtin ${mod}\` +lib${mod}_builtin_la_CXXFLAGS = \`\$(VLC_CONFIG) --cxxflags builtin ${mod}\` +lib${mod}_builtin_la_OBJCFLAGS = \`\$(VLC_CONFIG) --objcflags builtin ${mod}\` EOF done @@ -419,6 +491,13 @@ if [ "$GETTEXT" != "yes" ]; then printf "" > ABOUT-NLS fi +# Libtoolize directory +${libtoolize} --copy --force +if test -f "ltmain.sh"; then + echo "$0: working around a minor libtool issue" + mv ltmain.sh autotools/ +fi + # Do the rest ${autopoint} -f ${aclocal} ${ACLOCAL_ARGS} @@ -439,7 +518,7 @@ set +x ## ## Tell the user about gettext, pkg-config and sed ## -if [ "${GETTEXT}" == "old" ]; then +if [ "${GETTEXT}" = "old" ]; then cat << EOF ========================================================== @@ -448,10 +527,9 @@ 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.5 or later. EOF - ;; fi -if [ "$PKGCONFIG" == "no" ]; then +if [ "$PKGCONFIG" = "no" ]; then cat << EOF ============================================================== @@ -459,10 +537,9 @@ 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. EOF - ;; fi -if [ "$AUTOMAKESUCKS" == "yes" ]; then +if [ "$AUTOMAKESUCKS" = "yes" ]; then cat << EOF ============================================================= @@ -471,10 +548,9 @@ 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 - ;; fi -if [ "$INSTALLSUCKS" == "yes" ]; then +if [ "$INSTALLSUCKS" = "yes" ]; then cat << EOF ============================================================= @@ -483,6 +559,5 @@ 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 - ;; fi