* bootstrap: fix for the AC_MSG_WARN() problem when pkg-config is not installed (hopefully).

bootstrap

 #! /bin/sh
 
 ##  bootstrap file for the VLC media player
-##  $Id: bootstrap,v 1.77 2003/10/25 04:48:55 sam Exp $
+##  $Id: bootstrap,v 1.78 2003/10/25 17:48:05 gbazin Exp $
 ##
 ##  Authors: Sam Hocevar <sam@zoy.org>
 
@@ -78,11 +78,6 @@ else
   echo > ABOUT-NLS
   mkdir -p intl
   echo > intl/Makefile.am
-  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
   autopoint=:
   GETTEXT=old
 fi;else
@@ -90,11 +85,6 @@ fi;else
   echo > ABOUT-NLS
   mkdir -p intl
   echo > intl/Makefile.am
-  cat >> m4/private.m4 << EOF
-dnl  User does not have gettext, so this is a no-op
-AC_DEFUN([AM_GNU_GETTEXT_VERSION], [])
-
-EOF
   autopoint=:
   GETTEXT=no
 fi
@@ -104,12 +94,6 @@ 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
 
@@ -130,6 +114,21 @@ rm -f m4/private.m4 && cat > m4/private.m4 << EOF
 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], [:], [], [], [])
+
+EOF
+fi
+
+if [ "${GETTEXT}" != "yes" ]; then cat >> m4/private.m4 << EOF
+dnl  User does not have gettext, so this is a no-op
+AC_DEFUN([AM_GNU_GETTEXT_VERSION], [])
+
+EOF
+fi
+
 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