# Check for contrib directory
if test -d extras/contrib/bin; then
- export PATH=./extras/contrib/bin:$PATH
+ export PATH="`pwd`/extras/contrib/bin:$PATH"
if test -d extras/contrib/share/aclocal; then
ACLOCAL_ARGS="${ACLOCAL_ARGS} -I extras/contrib/share/aclocal"
fi
fi
fi
+# Check for autoconf
+rm -f m4/autoconf260.m4
+case "$(autoconf --version|head -1)" in
+ *2.5[012345678]*)
+ echo "Hey, your autoconf is quite old. Update it." >&2
+ exit 1
+ ;;
+
+ *2.59*)
+ echo "Enabling provisional autoconf 2.59 work-around. Update autoconf ASAP."
+ 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" "-1.8" "18" "-1.7" "17"; do
if automake${v} --version >/dev/null 2>&1; then
amsuff="${v}"
- amvers="${v}"
+ amvers="`echo ${v} | sed -e 's/^-//'`"
break
fi
done
fi
case "${amvers}" in
- no|1.[0123456]|1.[0123456].*|1[0123456])
+ no|1.[0123456]|1.[0123456].*|1[0123456]|1.[0123456]-*)
set +x
echo "$0: you need automake version 1.7 or later"
exit 1
PKGCONFIG=no
fi
-aclocal=aclocal${amvers}
-automake=automake${amvers}
+aclocal=aclocal${amsuff}
+automake=automake${amsuff}
autoconf=autoconf
autoheader=autoheader
for mod in $mods
do
extra_libs="${extra_libs} lib${mod}_plugin.a lib${mod}.a"
- extra_ltlibs="${extra_ltlibs} lib${mod}_plugin.la lib${mod}_builtin.la"
+ extra_ltlibs="${extra_ltlibs} lib${mod}_plugin.la"
done
rm -f "${makf}" && cat > "${makf}" << EOF
LTLIBVLC = \$(top_builddir)/src/libvlc.la
-if BUILD_SHARED
+if HAVE_WIN32
LIBVLC = -L\$(top_builddir)/src -lvlc
LIBADD = \$(LIBVLC)
endif
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; \\
+ 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=\`\\
- 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; \\
+ 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
;; \
esac; \
done
- @z=\$\$(\$(VLC_CONFIG) --list builtin); \
- for mod in \$(mods); do \
- case "\$\$z " \
- in *\ \$\${mod}\ *) \
- echo \$(INSTALL_DATA) "lib\$\${mod}.a" "\$(DESTDIR)\$(libdir)/vlc/" ; \
- \$(INSTALL_DATA) "lib\$\${mod}.a" "\$(DESTDIR)\$(libdir)/vlc/" || exit \$\$?; \
- ;; \
- esac; \
- done
endif
uninstall-local:
;; \
esac; \
done
- @z=\$\$(\$(VLC_CONFIG) --list builtin); \
- for mod in \$(mods); do \
- case "\$\$z " \
- in *\ \$\${mod}\ *) \
- echo rm -f "\$(DESTDIR)\$(libdir)/vlc/lib\$\${mod}.a" ; \
- rm -f "\$(DESTDIR)\$(libdir)/vlc/lib\$\${mod}.a" || true; \
- ;; \
- esac; \
- done
endif
EOF
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)\$\$
+ -export-symbol-regex ^\$(VLC_ENTRY)\$\$ -no-undefined
lib${mod}_plugin_la_LIBADD = \$(LTLIBVLC)
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 = \$(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 pic ${mod}\`
lib${mod}_a_CXXFLAGS = \`\$(VLC_CONFIG) --cxxflags builtin pic ${mod}\`
lib${mod}_a_OBJCFLAGS = \`\$(VLC_CONFIG) --objcflags builtin pic ${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
mv ltmain.sh autotools/
fi
+# patch for DLL link for libtool on cygwin (remove when fixed)
+if test ".`uname -s|sed -n '/^CYGWIN/p'`" != "."; then
+patch -s -p0 << 'EOF'
+--- autotools/ltmain.orig 2006-12-05 15:15:42.064607000 +0000
++++ autotools/ltmain.sh 2006-12-05 15:16:24.705777800 +0000
+@@ -4360,7 +4360,7 @@
+
+ prog)
+ case $host in
+- *cygwin*) output=`$echo $output | ${SED} -e 's,.exe$,,;s,$,.exe,'` ;;
++ *cygwin*) output=`$echo $output | ${SED} -e 's,.exe$,,;s,$,.exe,;s,.dll.exe$,.dll,'` ;;
+ esac
+ if test -n "$vinfo"; then
+ $echo "$modename: warning: \`-version-info' is ignored for programs" 1>&2
+EOF
+fi
+
# Do the rest
${autopoint} -f
${aclocal} ${ACLOCAL_ARGS}