* bootstrap: Fixed a shell syntax error when pkg-config is not present.

diff --git a/bootstrap b/bootstrap
index a5f3dcd5896b869d1f215bd344709eee339c7618..d820e27a836803b17e64728c62184bf43bdb21ad 100755 (executable)
--- a/bootstrap
+++ b/bootstrap
@@ -1,7 +1,7 @@
 #! /bin/sh
 
 ##  bootstrap file for the VLC media player
-##  $Id: bootstrap,v 1.71 2003/07/24 20:34:47 sam Exp $
+##  $Id: bootstrap,v 1.72 2003/10/07 21:13:01 sam Exp $
 ##
 ##  Authors: Sam Hocevar <sam@zoy.org>
 
@@ -312,7 +312,7 @@ 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], [])
+AC_DEFUN([PKG_CHECK_MODULES], [:])
 
 EOF
   PKGCONFIG=no

diff --git a/configure.ac b/configure.ac
index df3930fbec0203e100601a59bcd1114ac97f7dd6..6adba331c446372d0a3c3da9e4fcf6112083e1ac 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 dnl Autoconf settings for vlc
-dnl $Id: configure.ac,v 1.86 2003/10/07 18:53:01 sam Exp $
+dnl $Id: configure.ac,v 1.87 2003/10/07 21:13:01 sam Exp $
 
 AC_INIT(vlc,0.6.3-cvs)
 
@@ -1453,18 +1453,18 @@ AC_ARG_ENABLE(vcdx,
 if test "${enable_vcdx}" != "no"
 then
   PKG_CHECK_MODULES(LIBCDIO, libcdio >= 0.63,
-    enable_cdda="no"
+   [enable_cdda="no"
     AX_ADD_LDFLAGS([cddax],[$LIBCDIO_LIBS])
     AX_ADD_CFLAGS([cddax],[$LIBCDIO_CFLAGS])
-    AX_ADD_PLUGINS([cddax]), 
-    [AC_MSG_WARN(libcdio library not found)])
+    AX_ADD_PLUGINS([cddax])], 
+   [AC_MSG_WARN(libcdio library not found)])
 
   PKG_CHECK_MODULES(VCDINFO, libvcdinfo >= 0.7.18-cdio,
-    enable_vcd="no"
+   [enable_vcd="no"
     AX_ADD_LDFLAGS([vcdx],[$VCDINFO_LIBS])
     AX_ADD_CFLAGS([vcdx],[$VCDINFO_CFLAGS])
-    AX_ADD_PLUGINS([vcdx]), 
-[AC_MSG_WARN(vcdinfo library not found)])
+    AX_ADD_PLUGINS([vcdx])], 
+   [AC_MSG_WARN(vcdinfo library not found)])
 fi
 
 dnl
@@ -2650,7 +2650,7 @@ then
 fi
 
 dnl
-dnl  Gtk+2 module ! Disabled for know as it is unuseable and confuses users
+dnl  Gtk+2 module ! Disabled for now as it is unusable and confuses users
 dnl
 dnl AC_ARG_ENABLE(gtk2,
 dnl   [  --enable-gtk2           Gtk2 support (default disabled)])