# 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
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
@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"
# Build a plugin with the adequate linker and linker's flags
_plugin.a_plugin\$(LIBEXT):
- @mod="\$*" ; mod=\$\${mod:3} ; \
+ @mod="\$*" ; mod=\$\${mod#lib} ; \
ldfl="\`\$(VLC_CONFIG) --libs plugin \$\$mod\` -u \$(SYMPREF)\$(VLC_ENTRY)" ; \
case \`\$(VLC_CONFIG) --linkage \$\$mod\` in \\
c++) ld="\$(CXXLINK)" ;; \
echo \$\$ld \$< \$\$ldfl ; \
\$\$ld \$< \$\$ldfl
+if MAINTAINER_MODE
\$(srcdir)/Makefile.am: \$(srcdir)/Modules.am \$(top_srcdir)/bootstrap
cd \$(top_srcdir) && \$(SHELL) ./bootstrap
+endif
mostlyclean-local:
-rm -f *.a *\$(LIBEXT)
##
## Tell the user about gettext, pkg-config and sed
##
-if [ "${GETTEXT}" == "old" ]; then
+if [ "${GETTEXT}" = "old" ]; then
cat << EOF
==========================================================
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
==============================================================
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
=============================================================
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
=============================================================
version of automake, or use a version of automake newer than 1.5
(such as 1.6 or 1.7).
EOF
- ;;
fi