X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=bootstrap;h=856de25f5757187decfc7b7aa1ad2866775f44d9;hb=1f4f2234474ef96706c1b2495c1301f1984596de;hp=5093507c8d16391881f3e213f0e09c4fd044ce0f;hpb=16cf721d7a40194c0c7c95ebd8ecf700323bfa46;p=vlc diff --git a/bootstrap b/bootstrap index 5093507c8d..856de25f57 100755 --- a/bootstrap +++ b/bootstrap @@ -1,9 +1,16 @@ #! /bin/sh -## bootstrap file for vlc, the VideoLAN Client -## $Id: bootstrap,v 1.35 2002/12/25 21:02:35 massiot Exp $ +## bootstrap file for the VLC media player +## $Id: bootstrap,v 1.53 2003/06/27 23:31:24 sam Exp $ ## -## Authors: Samuel Hocevar +## Authors: Sam Hocevar + +if test "$#" != "0"; then + echo "Usage: $0" + echo " Calls automake, autoconf, autoheader, autopoint and other auto* to generate" + echo " m4 macros and prepare Makefiles." + exit 1 +fi ### ### Get a sane environment, just in case @@ -14,414 +21,205 @@ CYGWIN=binmode export CYGWIN ## -## Give help -## -help() -{ - if test "$do_help" = "yes" - then - cat << EOF -recognized flags are: - --config create Makefile and configure scripts (read HACKING) - --update-vc update Microsoft Visual Studio files - --update-po update translation files -EOF - exit 1 - fi -} - -### -### argument check -### -test "$EMAIL" = "sam@zoy.org" && do_help=yes || do_help=no -do_po=no -do_vc=no -while test $# -gt 0; do - case "$1" in - --config) - do_help=no - ;; - --update-vc) - do_help=no - do_vc=yes - ;; - --update-po) - do_help=no - do_po=yes - ;; - *) - echo "$0: unknown option $1" - do_help=yes - help - ;; - esac - shift -done - -## -## Give help if needed -## -help - -## -## Update the MSVC project files -## -if test "$do_vc" = "yes" -then - if test ! -f Makefile - then - echo "no Makefile found, did you run ./configure?" - exit 1 - fi - - echo "generating Visual Studio files..." - - # The evil ^M - M=' ' - - # Sources that get built under Win32 - FIXME: anyone wanna deuglify this? :) - LIBVLC_SOURCES=`awk 'BEGIN{a=0}{if(!a&&/^'SOURCES_libvlc_common'[^-_a-zA-Z0-9]*=/){a=1;print$0;next;}if(a){if(/^[a-zA-Z]/){exit;}print $0}}' < Makefile.am | tr '\\ ' '\n\n' | sed -ne 's/[^$-_a-zA-Z0-9][^$-_a-zA-Z0-9]*\([a-zA-Z]\)/\1/p'; awk 'BEGIN{a=0}{if(!a&&/^'SOURCES_libvlc_win32'[^-_a-zA-Z0-9]*=/){a=1;print$0;next;}if(a){if(/^[a-zA-Z]/){exit;}print $0}}' < Makefile.am | tr '\\ ' '\n\n' | sed -ne 's/[^$-_a-zA-Z0-9][^$-_a-zA-Z0-9]*\([a-zA-Z]\)/\1/p'; awk 'BEGIN{a=0}{if(!a&&/^'SOURCES_libvlc_dirent'[^-_a-zA-Z0-9]*=/){a=1;print$0;next;}if(a){if(/^[a-zA-Z]/){exit;}print $0}}' < Makefile.am | tr '\\ ' '\n\n' | sed -ne 's/[^$-_a-zA-Z0-9][^$-_a-zA-Z0-9]*\([a-zA-Z]\)/\1/p'; awk 'BEGIN{a=0}{if(!a&&/^'SOURCES_libvlc_getopt'[^-_a-zA-Z0-9]*=/){a=1;print$0;next;}if(a){if(/^[a-zA-Z]/){exit;}print $0}}' < Makefile.am | tr '\\ ' '\n\n' | sed -ne 's/[^$-_a-zA-Z0-9][^$-_a-zA-Z0-9]*\([a-zA-Z]\)/\1/p'; awk 'BEGIN{a=0}{if(!a&&/^'SOURCES_libvlc_libc'[^-_a-zA-Z0-9]*=/){a=1;print$0;next;}if(a){if(/^[a-zA-Z]/){exit;}print $0}}' < Makefile.am | tr '\\ ' '\n\n' | sed -ne 's/[^$-_a-zA-Z0-9][^$-_a-zA-Z0-9]*\([a-zA-Z]\)/\1/p'` - - LIBVLC_HEADERS=`awk 'BEGIN{a=0}{if(!a&&/^'HEADERS_include'[^-_a-zA-Z0-9]*=/){a=1;print$0;next;}if(a){if(/^[a-zA-Z]/){exit;}print $0}}' < Makefile.am | tr '\\ ' '\n\n' | sed -ne 's/[^$-_a-zA-Z0-9][^$-_a-zA-Z0-9]*\([a-zA-Z]\)/\1/p'; awk 'BEGIN{a=0}{if(!a&&/^'HEADERS_include_built'[^-_a-zA-Z0-9]*=/){a=1;print$0;next;}if(a){if(/^[a-zA-Z]/){exit;}print $0}}' < Makefile.am | tr '\\ ' '\n\n' | sed -ne 's/[^$-_a-zA-Z0-9][^$-_a-zA-Z0-9]*\([a-zA-Z]\)/\1/p'` - - LIBVLC_PKG_HEADERS=`awk 'BEGIN{a=0}{if(!a&&/^'dist_pkginclude_HEADERS'[^-_a-zA-Z0-9]*=/){a=1;print$0;next;}if(a){if(/^[a-zA-Z]/){exit;}print $0}}' < Makefile.am | tr '\\ ' '\n\n' | sed -ne 's/[^$-_a-zA-Z0-9][^$-_a-zA-Z0-9]*\([a-zA-Z]\)/\1/p'` - - # Clean up - rm -f evc/*.vcp msvc/*.dsp - - # libvlc files - for target in evc/libvlc.vcp msvc/libvlc.dsp - do - echo "${target}" - # Top of the project file - perl -pe 'if(/§SOURCES§/){last;}' < ${target}.in > ${target} - # The source files - for file in `for i in ${LIBVLC_SOURCES} ; do echo $i ; done | grep -v "/.*/"` - do - cat >> ${target} << EOF -# Begin Source File${M} -SOURCE="..\\`echo $file | sed -e 's%/%\\\\%g'`"${M} -# ADD CPP /D "__VLC__" /D PLUGIN_PATH=\\"plugins\\" /D DATA_PATH=\\"share\\"${M} -# End Source File${M} -EOF - done - for subdir in `for i in ${LIBVLC_SOURCES} ; do echo $i ; done | grep "/.*/" | cut -f2 -d/ | sort | uniq` - do - cat >> ${target} << EOF -# Begin Group "${subdir}"${M} -EOF - for file in `for i in ${LIBVLC_SOURCES} ; do echo $i ; done | grep "/${subdir}/"` - do - if test "${target}" = "evc/libvlc.vcp" - then - cat >> ${target} << EOF -# Begin Source File${M} -SOURCE="..\\`echo $file | sed -e 's%/%\\\\%g'`"${M} -# ADD CPP /D "__VLC__" /D PLUGIN_PATH=\\"plugins\\" /D DATA_PATH=\\"share\\"${M} -!IF "\$(CFG)" == "libvlc - Win32 (WCE MIPS) Release"${M} -# PROP Output_Dir "MIPSRel\\${subdir}"${M} -# PROP Intermediate_Dir "MIPSRel\\${subdir}"${M} -!ELSEIF "\$(CFG)" == "libvlc - Win32 (WCE MIPS) Debug"${M} -# PROP Output_Dir "MIPSDbg\\${subdir}"${M} -# PROP Intermediate_Dir "MIPSDbg\\${subdir}"${M} -!ELSEIF "\$(CFG)" == "libvlc - Win32 (WCE SH4) Release"${M} -# PROP Output_Dir "SH4Rel\\${subdir}"${M} -# PROP Intermediate_Dir "SH4Rel\\${subdir}"${M} -!ELSEIF "\$(CFG)" == "libvlc - Win32 (WCE SH4) Debug"${M} -# PROP Output_Dir "SH4Dbg\\${subdir}"${M} -# PROP Intermediate_Dir "SH4Dbg\\${subdir}"${M} -!ELSEIF "\$(CFG)" == "libvlc - Win32 (WCE SH3) Release"${M} -# PROP Output_Dir "SH3Rel\\${subdir}"${M} -# PROP Intermediate_Dir "SH3Rel\\${subdir}"${M} -!ELSEIF "\$(CFG)" == "libvlc - Win32 (WCE SH3) Debug"${M} -# PROP Output_Dir "SH3Dbg\\${subdir}"${M} -# PROP Intermediate_Dir "SH3Dbg\\${subdir}"${M} -!ELSEIF "\$(CFG)" == "libvlc - Win32 (WCE ARM) Release"${M} -# PROP Output_Dir "ARMRel\\${subdir}"${M} -# PROP Intermediate_Dir "ARMRel\\${subdir}"${M} -!ELSEIF "\$(CFG)" == "libvlc - Win32 (WCE ARM) Debug"${M} -# PROP Output_Dir "ARMDbg\\${subdir}"${M} -# PROP Intermediate_Dir "ARMDbg\\${subdir}"${M} -!ELSEIF "\$(CFG)" == "libvlc - Win32 (WCE x86em) Release"${M} -# PROP Output_Dir "X86EMRel\\${subdir}"${M} -# PROP Intermediate_Dir "X86EMRel\\${subdir}"${M} -!ELSEIF "\$(CFG)" == "libvlc - Win32 (WCE x86em) Debug"${M} -# PROP Output_Dir "X86EMDbg\\${subdir}"${M} -# PROP Intermediate_Dir "X86EMDbg\\${subdir}"${M} -!ENDIF${M} -# End Source File${M} -EOF - else - cat >> ${target} << EOF -# Begin Source File${M} -SOURCE="..\\`echo $file | sed -e 's%/%\\\\%g'`"${M} -# ADD CPP /D "__VLC__" /D PLUGIN_PATH=\\"plugins\\" /D DATA_PATH=\\"share\\"${M} -!IF "\$(CFG)" == "libvlc - Win32 Release"${M} -# PROP Output_Dir "Release\\${subdir}"${M} -# PROP Intermediate_Dir "Release\\${subdir}"${M} -!ELSEIF "\$(CFG)" == "libvlc - Win32 Debug"${M} -# PROP Output_Dir "Debug\\${subdir}"${M} -# PROP Intermediate_Dir "Debug\\${subdir}"${M} -!ENDIF${M} -# End Source File${M} -EOF - fi - done - cat >> ${target} << EOF -# End Group${M} -EOF - done - # The headers - perl -e 'while(<>){if(/§SOURCES§/){last;}}while(<>){if(/§HEADERS§/){last;}print $_}' < ${target}.in >> ${target} - for file in ${LIBVLC_HEADERS} - do - cat >> ${target} << EOF -# Begin Source File${M} -SOURCE="..\\`echo $file | sed -e 's%/%\\\\%g'`"${M} -# End Source File${M} -EOF - done - cat >> ${target} << EOF -# Begin Group "vlc"${M} -EOF - for file in ${LIBVLC_PKG_HEADERS} - do - cat >> ${target} << EOF -# Begin Source File${M} -SOURCE="..\\`echo $file | sed -e 's%/%\\\\%g'`"${M} -# End Source File${M} -EOF - done - cat >> ${target} << EOF -# End Group${M} -EOF - perl -e 'while(<>){if(/§HEADERS§/){last;}}while(<>){print $_}' < ${target}.in >> ${target} - done - - # plugins files - grep '^L_[^ ]*_pic =' Modules.am | while read a b c - do - makefile="`echo $c | sed -e 's@/[^/]*$@/Modules.am@'`" - plugin="`echo $a | sed 's/L_\(.*\)_pic/\1/'`" - # this is an attempt at getting a list of plugin sources... we take the - # production and remove everything that does not contain "module", which - # means you miss $(NULL), but other variables too. - cfiles=`grep -v '[^-_a-zA-Z0-9]*#' ${makefile} | awk 'BEGIN{a=0}{if(!a&&/^SOURCES_'${plugin}'[^-_a-zA-Z0-9]*=/){a=1;print$0;next;}if(a){if(/^[a-zA-Z]/){exit;}print $0}}' | tr '\\ ' '\n\n' | sed -ne 's,/,\\\\,g; s/.*modules/modules/p'` - hfiles=`for i in ${cfiles} ; do echo $i ; done | grep '\.h$'` - cfiles=`for i in ${cfiles} ; do echo $i ; done | grep -v '\.h$'` - for dir in evc msvc - do - test "${dir}" = "evc" && suf="vcp" || suf="dsp" - source="${dir}/plugins.${suf}.in" - target="${dir}/plugin_${plugin}.${suf}" - echo "${target}" - perl -pe 'if(/§SOURCES§/){last;} s/§PLUGIN§/'${plugin}'/g' < ${source} > ${target} - for cfile in ${cfiles} - do - cat >> ${target} << EOF -# Begin Source File${M} -SOURCE="..\\${cfile}"${M} -# End Source File${M} -EOF - done - # sed is really nicer for this... unfortunately it's broken under cygwin - # sed -ne '1,/§SOURCES§/d; /§HEADERS§/,$d; p' < ${source} >> ${target} - perl -e 'while(<>){if(/§SOURCES§/){last;}}while(<>){if(/§HEADERS§/){last;}print $_}' < ${source} >> ${target} - for hfile in ${hfiles} - do - cat >> ${target} << EOF -# Begin Source File${M} -SOURCE="..\\${hfile}"${M} -# End Source File${M} -EOF - done - # sed -ne '1,/§HEADERS§/d; p' < ${source} >> ${target} - perl -e 'while(<>){if(/§HEADERS§/){last;}}while(<>){print $_}' < ${source} >> ${target} - done - done - - # vlc files - for target in evc/vlc.vcp msvc/vlc.dsp - do - echo "${target}" - # Top of the project file - perl -pe 'if(/§SOURCES§/){last;}' < ${target}.in > ${target} - # The source files - if test "${target}" = "evc/vlc.vcp" - then - cat >> ${target} << EOF -# Begin Source File${M} -SOURCE="..\\evc\\vlc.c"${M} -# End Source File${M} -EOF - else - cat >> ${target} << EOF -# Begin Source File${M} -SOURCE="..\\src\\vlc.c"${M} -# End Source File${M} -EOF - fi - # Bottom of the project file - handles resource files too - perl -e 'while(<>){if(/§SOURCES§/){last;}}while(<>){print $_}' < ${target}.in >> ${target} - done - - echo "done." - exit 0 -fi - -## -## Update the potfiles because no one ever does it +## Naively assume our system doesn't suck. Unfortunately it seldom doesn't. ## -if test "$do_po" = "yes" -then - cd po - make update-po #2>&1 | grep '^[^:]*:$' | cut -f1 -d: | tr '\n' ' ' | sed 's/ $//' - cd .. - - exit 0 -fi +AUTOMAKESUCKS=no +INSTALLSUCKS=no ## ## Check that our tools don't suck ## -SEDSUCKS=no -if test ! 20000 -eq `perl -e 'printf "%s\n","a"x20000' | sed -e 's/.//' 2>/dev/null | wc -c` -then - SEDSUCKS=yes -fi - -PERLSUCKS=no -AUTOMAKESUCKS=no -INSTALLSUCKS=no - -# Mac OS X stacksize sucks -if test x`uname -s` = xDarwin; then ulimit -s 20000; fi ## ## Generate the modules makefile, by parsing modules/**/Modules.am ## -printf "generating Modules.am and configure.ac" +printf "generating modules/**/Makefile.am and m4/private.m4" -echo > Modules.am -echo > configure.ac +# Prepare Modules.am and m4/private.m4 +rm -f Modules.am && echo > Modules.am +rm -f m4/private.m4 && cat > m4/private.m4 << EOF +dnl Private VLC macros - generated by bootstrap -ALL_FLAGS="`sed -n -e '/^[^=A-Z]*[A-Z]*FLAGS_[^=]*=/s/[^=A-Z]*\([A-Z]*FLAGS_[^=]*=\).*/\1/p' < configure.ac.in | sort | uniq`" +EOF +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([AX_VLC_CONDITIONALS], [ +EOF +rm -f m4/private.m4-tmp2 && cat > m4/private.m4-tmp2 << EOF +dnl The required AC_SUBST calls +AC_DEFUN([AX_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([AX_VLC_MAKEFILES], [AC_OUTPUT([ +EOF +rm -f m4/private.m4-tmp4 && cat > m4/private.m4-tmp4 << EOF +dnl Helper macro for vlc-config generation +AC_DEFUN([AX_VLC_CONFIG_HELPER], [ + cat >> vlc-config.in << BLAH +EOF -cat >> configure.ac << EOF -dnl ################################################################ -dnl # Do not edit this file, it was generated from configure.ac.in # -dnl ################################################################ +modules="" +count=0 +rm -f modules/Makefile.am && cat > modules/Makefile.am << EOF +# Autogenerated by bootstrap - DO NOT EDIT +EXTRA_DIST = LIST +SUBDIRS = `sed -ne 's,modules/\([^/]*\)/Makefile,\1,p' configure.ac | xargs` +#DIST_SUBDIRS = \$(SUBDIRS) EOF -sed -n -e '/dnl do not touch this line/q;p' < configure.ac.in >> configure.ac -modules="" -for mf in `sed -ne 's@[^a-z]*\([^ ]*\)am.*@modules/\1am@p' < modules/Makefile.am` +for dir in `sed -ne 's,\(modules/.*\)/Makefile,\1,p' configure.ac` 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} - -include ${dir}/Modules.am - + mf="${dir}/Modules.am" + basedir="`echo ${dir} | cut -f2 -d/`" + # automake will not recurse for make dist if we don't define SUBDIRS = . + subdirs="`sed -ne 's,'${dir}'/\([^/]*\)/Makefile,\1,p' configure.ac | xargs`" + #parent=`echo ${dir} | sed -e 's@[^/]*@..@g'` + #echo " ${dir}/Makefile" >> m4/private.m4-tmp3 + rm -f ${dir}/Makefile.am && cat > ${dir}/Makefile.am << EOF + +# Autogenerated by bootstrap - DO NOT EDIT - edit Modules.am instead + +NULL = +libvlc_LIBRARIES = +noinst_LIBRARIES = +noinst_HEADERS = +EXTRA_DIST = Modules.am +BUILT_SOURCES = +SUBDIRS = ${subdirs} +#DIST_SUBDIRS = \$(SUBDIRS) +libvlcdir = \$(libdir)/vlc/${basedir} +include Modules.am EOF - sed -n -e 's/^ *SOURCES_\([^ ]*\).*/\1/p' < ${mf} | while read mod + for mod in `sed -n -e 's/^ *SOURCES_\([^ ]*\).*/\1/p' < ${mf}` 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 + count="`expr ${count} + 1`" 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) +# cat >> m4/private.m4-tmp1 << EOF +#dnl AM_CONDITIONAL(${mod}_p, test x\$${mod}_p = xyes) +#dnl AM_CONDITIONAL(${mod}_b, test x\$${mod}_b = xyes) +#EOF + cat >> Modules.am << EOF +${dir}/lib${mod}_plugin: ${dir}/lib${mod}_plugin\$(LIBEXT) +${dir}/lib${mod}_plugin\$(LIBEXT): include/vlc_symbols.h FORCE + cd ${dir} && \$(MAKE) lib${mod}_plugin\$(LIBEXT) +${dir}/lib${mod}.a: include/vlc_symbols.h FORCE + cd ${dir} && \$(MAKE) lib${mod}.a +${dir}/lib${mod}_pic.a: include/vlc_symbols.h FORCE + cd ${dir} && \$(MAKE) lib${mod}_pic.a + EOF -# Generation of Modules.am -# ~~~~~~~~~~~~~~~~~~~~~~~~ + 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. include *_CPPFLAGS because per-object CPPFLAGS -# does not seem to work properly with any automake version I tested. - cat >> Modules.am << EOF +# - *_CFLAGS, *_CXXFLAGS etc. because per-object CPPFLAGS does not seem to +# work properly with any automake version I tested. + cat >> ${dir}/Makefile.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}) +L${count}p = lib${mod}_plugin.a +D${count}p = lib${mod}_plugin\$(LIBEXT) +L${count}b = lib${mod}.a +L${count}pic = lib${mod}_pic.a +EOF + if [ "${NODIST}" != "#" ]; then cat >> ${dir}/Makefile.am << EOF +B${count}p = \$(nodist_SOURCES_${mod}) +B${count}b = \$(nodist_SOURCES_${mod}) +EOF + fi + cat >> ${dir}/Makefile.am << EOF 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) +EOF + if [ "${NODIST}" != "#" ]; then cat >> ${dir}/Makefile.am << EOF +${PRIVATE}BUILT_SOURCES += \$(B${count}p) \$(B${count}b) +EOF + fi + cat >> ${dir}/Makefile.am << EOF +${PRIVATE}lib${mod}_plugin_a_SOURCES = \$(SOURCES_${mod}) +EOF + if [ "${NODIST}" != "#" ]; then cat >> ${dir}/Makefile.am << EOF +${PRIVATE}nodist_lib${mod}_plugin_a_SOURCES = \$(nodist_SOURCES_${mod}) +EOF + fi + cat >> ${dir}/Makefile.am << 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}_pic_a_SOURCES = ${PRIVATE}\$(SOURCES_${mod}) +EOF + if [ "${NODIST}" != "#" ]; then cat >> ${dir}/Makefile.am << EOF +nodist_lib${mod}_pic_a_SOURCES = ${PRIVATE}\$(nodist_SOURCES_${mod}) +EOF + fi + cat >> ${dir}/Makefile.am << EOF +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}) +EOF + if [ "${NODIST}" != "#" ]; then cat >> ${dir}/Makefile.am << EOF +nodist_lib${mod}_a_SOURCES = ${PRIVATE}\$(nodist_SOURCES_${mod}) +EOF + fi + cat >> ${dir}/Makefile.am << 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}\` + +libvlc_LIBRARIES += \$(L${count}b) \$(L${count}pic) +lib${mod}_DATA = \$(D${count}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}) \$^ -shared \$(LDFLAGS_plugins) \$(LDFLAGS_${mod}) +${PRIVATE}noinst_LIBRARIES += \$(L${count}p) +${PRIVATE}lib${mod}_plugin\$(LIBEXT): \$(lib${mod}_plugin_a_OBJECTS) +${PRIVATE} case \`\$(VLC_CONFIG) --linkage ${mod}\` in \\ +${PRIVATE} c++) \$(CXXLINK) \$(lib${mod}_plugin_a_OBJECTS) \`\$(VLC_CONFIG) --libs plugin ${mod}\` ;; \\ +${PRIVATE} objc) \$(OBJCLINK) \$(lib${mod}_plugin_a_OBJECTS) \`\$(VLC_CONFIG) --libs plugin ${mod}\` ;; \\ +${PRIVATE} c|*) \$(LINK) \$(lib${mod}_plugin_a_OBJECTS) \`\$(VLC_CONFIG) --libs plugin ${mod}\` ;; \\ +${PRIVATE} esac 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 +cat >> m4/private.m4-tmp1 << EOF + AM_CONDITIONAL(UNTRUE, false) +]) +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 +BLAH +]) +EOF +cat m4/private.m4-tmp4 >> m4/private.m4 && rm -f m4/private.m4-tmp4 echo "done." @@ -429,109 +227,116 @@ echo "done." ### 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 + +# remove autotools cruft +rm -f aclocal.m4 configure configure.ac.in config.log +# remove old autotools extra cruft +rm -f config.guess config.sub missing mkinstalldirs compile depcomp install-sh +# remove new autotools extra cruft +(cd autotools && rm -f config.guess config.sub missing mkinstalldirs compile depcomp install-sh) +# remove libtool cruft +rm -f ltmain.sh libtool ltconfig +# remove gettext cruft +rm -f m4/oldgettext.m4 ABOUT-NLS rm -Rf intl # Check for gettext -if gettextize --version >/dev/null 2>&1 -then +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` \ - '>' 0.11.2 >/dev/null 2>&1 -then + '>=' 0.11.5 >/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. + echo > ABOUT-NLS mkdir -p intl echo > intl/Makefile.am - echo 'AC_DEFUN([AM_GNU_GETTEXT_VERSION], [])' > m4/oldgettext.m4 + cat >> m4/private.m4 << EOF +dnl User's gettext is too old, so this is a no-op +AC_DEFUN([AM_GNU_GETTEXT_VERSION], []) + +EOF GETTEXT=old fi;else # we don't have gettext. grmbl. try to continue anyway. + echo > ABOUT-NLS mkdir -p intl echo > intl/Makefile.am - echo 'AC_DEFUN([AM_GNU_GETTEXT_VERSION], [])' > m4/oldgettext.m4 + cat >> m4/private.m4 << EOF +dnl User does not have gettext, so this is a no-op +AC_DEFUN([AM_GNU_GETTEXT_VERSION], []) + +EOF GETTEXT=no fi +# Check for pkg-config +if pkg-config --version >/dev/null 2>&1; then + # We have pkg-config, everything is cool. + PKGCONFIG=yes +else + # Not present, use a workaround. + cat >> m4/private.m4 << EOF +dnl User does not have pkg-config, so this is a no-op +AC_DEFUN([PKG_CHECK_MODULES], []) + +EOF + PKGCONFIG=no +fi + # Check for automake amvers="none" -if automake-1.7 --version >/dev/null 2>&1 -then +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.*) - INSTALLSUCKS=yes ;; - esac - - if expr "$amvers" "<" "1.5" > /dev/null 2>&1 - then amvers="none" - else amvers="" - fi - fi + # If we also have 1.6, use it instead because it is faster + if automake-1.6 --version >/dev/null 2>&1; then + if expr "`automake-1.6 --version | sed -e '1s/[^0-9]*//' -e q`" ">" "1.6.1" > /dev/null 2>&1 + then amvers="-1.6" fi fi +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 + 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 ;; + esac fi -if test x$amvers = xnone -then +if test "${amvers}" = "none"; then set +x echo "you need automake version 1.5 or later" exit 1 fi +# Automake complains if this is not present +rm -f vlc-config.in && printf "" > vlc-config.in + # Do the rest aclocal${amvers} -I m4 || exit 1 autoheader || exit 1 -automake${amvers} --foreign --add-missing --copy || PERLSUCKS=yes - -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 +automake${amvers} --add-missing --copy autoconf || exit 1 ## -## headers which need to be regenerated +## files which need to be regenerated ## +rm -f vlc-config.in vlc-config rm -f src/misc/modules_builtin.h src/misc/modules_plugin.h rm -f include/vlc_symbols.h rm -f mozilla/vlcintf.h @@ -542,42 +347,9 @@ rm -f mozilla/vlcintf.h set +x ## -## Glade sometimes sucks +## Tell the user about gettext, pkg-config and sed ## -echo "workarounds for annoying glade features" -for file in gnome_interface.c gtk_interface.c -do -if grep "DO NOT EDIT THIS FILE" modules/gui/gtk/$file 2>&1 > /dev/null -then - rm -f /tmp/$$.$file.bak - cat > /tmp/$$.$file.bak << EOF -/* This file was created automatically by glade and fixed by bootstrap */ - -#include -EOF - sed -e 1,7d \ - -e 's#_("-:--:--")#"-:--:--"#' \ - -e 's#_("---")#"---"#' \ - -e 's#_("--")#"--"#' \ - -e 's#_("/dev/dvd")#"/dev/dvd"#' \ - -e 's#_(\("./."\))#\1#' \ - < modules/gui/gtk/$file >> /tmp/$$.$file.bak - mv -f /tmp/$$.$file.bak modules/gui/gtk/$file -fi -done - -file=gtk_support.h -if grep "DO NOT EDIT THIS FILE" modules/gui/gtk/$file 2>&1 > /dev/null -then - rm -f /tmp/$$.$file.bak - sed -e 's/DO NOT EDIT THIS FILE.*/This file was created automatically by glade and fixed by bootstrap/ ; s/#if.*ENABLE_NLS.*/#if defined( ENABLE_NLS ) \&\& defined ( HAVE_GETTEXT )/' < modules/gui/gtk/$file > /tmp/$$.$file.bak - mv -f /tmp/$$.$file.bak modules/gui/gtk/$file -fi - -## -## Tell the user about gettext and sed -## -case "$GETTEXT" in +case "${GETTEXT}" in yes) ;; no) @@ -594,7 +366,23 @@ EOF ========================================================== NOTE: you have an old version of gettext installed on your -system. We suggest upgrading to gettext 0.11.3 or later. +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 + ;; +esac + +case "$PKGCONFIG" in + yes) + ;; + no) + 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. EOF ;; esac @@ -629,18 +417,3 @@ EOF ;; esac -case "$SEDSUCKS" in - no) - ;; - yes) - 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. -EOF - ;; -esac -