X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=bootstrap;h=78dd8affaa5d4bd35e315a2c4a71816d4dd18fe0;hb=a1379c76e47baf2e789cef28f8e1fbedf3d52c14;hp=204ec056c23acb9cdf23bc7c36f930fba9cda43f;hpb=b1e57e2a4e258dca9a274c9593773737983767da;p=vlc

diff --git a/bootstrap b/bootstrap
index 204ec056c2..78dd8affaa 100755
--- a/bootstrap
+++ b/bootstrap
@@ -36,7 +36,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
@@ -127,8 +129,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
@@ -212,13 +214,13 @@ all-modules:
 	@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)" ;; \
@@ -441,7 +443,7 @@ set +x
 ##
 ##  Tell the user about gettext, pkg-config and sed
 ##
-if [ "${GETTEXT}" == "old" ]; then
+if [ "${GETTEXT}" = "old" ]; then
   cat << EOF
 
 ==========================================================
@@ -452,7 +454,7 @@ We suggest upgrading to gettext 0.11.5 or later.
 EOF
 fi
 
-if [ "$PKGCONFIG" == "no" ]; then
+if [ "$PKGCONFIG" = "no" ]; then
   cat << EOF
 
 ==============================================================
@@ -462,7 +464,7 @@ reliable.
 EOF
 fi
 
-if [ "$AUTOMAKESUCKS" == "yes" ]; then
+if [ "$AUTOMAKESUCKS" = "yes" ]; then
   cat << EOF
 
 =============================================================
@@ -473,7 +475,7 @@ 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
 
 =============================================================