* ./m4/*: updated m4 macros.

[vlc] / bootstrap

diff --git a/bootstrap b/bootstrap
index 856b1844d6fb0f33d1d8aa4d562cb5c2a106a530..7f251936047d2d567d1d63b32656afb44f198eb4 100755 (executable)
--- a/bootstrap
+++ b/bootstrap
@@ -1,7 +1,7 @@
 #! /bin/sh
 
-##  bootstrap file for vlc, the VideoLAN Client
-##  $Id: bootstrap,v 1.41 2003/02/01 18:41:09 sam Exp $
+##  bootstrap file for the VLC media player
+##  $Id: bootstrap,v 1.46 2003/03/20 10:27:35 sam Exp $
 ##
 ##  Authors: Samuel Hocevar <sam@zoy.org>
 
@@ -45,6 +45,8 @@ if test x`uname -s` = xDarwin; then ulimit -s 20000; fi
 
 printf "generating Modules.am and configure.ac"
 
+rm -f Modules.am configure.ac
+
 echo > Modules.am
 echo > configure.ac
 
@@ -171,8 +173,20 @@ echo "done."
 ###  classic bootstrap stuff
 ###
 set -x
-rm -f aclocal.m4 m4/oldgettext.m4 configure config.guess config.log config.sub ltmain.sh libtool ltconfig missing mkinstalldirs depcomp install-sh
+
+# remove autotools cruft
+rm -f aclocal.m4 configure config.log
+# remove old autotools extra cruft
+rm -f config.guess config.sub missing mkinstalldirs compile depcomp install-sh
+# remove new autotools extra cruft
+(cd autotools && rm -f config.guess config.sub missing mkinstalldirs compile depcomp install-sh)
+# remove libtool cruft
+rm -f ltmain.sh libtool ltconfig
+# remove gettext cruft
+rm -f m4/oldgettext.m4 ABOUT-NLS
 rm -Rf intl
+# update m4 local macros
+rm -f m4/vlc.m4 && echo "Private VLC macros" > m4/vlc.m4
 
 # Check for gettext
 if gettextize --version >/dev/null 2>&1
@@ -185,18 +199,31 @@ then
   GETTEXT=yes
 else
   # User's gettext is too old. try to continue anyway.
+  echo > ABOUT-NLS
   mkdir -p intl
   echo > intl/Makefile.am
-  echo 'AC_DEFUN([AM_GNU_GETTEXT_VERSION], [])' > m4/oldgettext.m4
+  echo 'AC_DEFUN([AM_GNU_GETTEXT_VERSION], [])' >> m4/vlc.m4
   GETTEXT=old
 fi;else
   # we don't have gettext. grmbl. try to continue anyway.
+  echo > ABOUT-NLS
   mkdir -p intl
   echo > intl/Makefile.am
-  echo 'AC_DEFUN([AM_GNU_GETTEXT_VERSION], [])' > m4/oldgettext.m4
+  echo 'AC_DEFUN([AM_GNU_GETTEXT_VERSION], [])' >> m4/vlc.m4
   GETTEXT=no
 fi
 
+# Check for pkg-config
+if pkg-config --version >/dev/null 2>&1
+then
+  # We have pkg-config, everything is cool.
+  PKGCONFIG=yes
+else
+  # Not present, use a workaround.
+  echo 'AC_DEFUN([PKG_CHECK_MODULES], [])' > m4/vlc.m4
+  PKGCONFIG=no
+fi
+
 # Check for automake
 amvers="none"
 if automake-1.7 --version >/dev/null 2>&1
@@ -284,7 +311,7 @@ rm -f mozilla/vlcintf.h
 set +x
 
 ##
-##  Tell the user about gettext and sed
+##  Tell the user about gettext, pkg-config and sed
 ##
 case "$GETTEXT" in
   yes)
@@ -310,6 +337,20 @@ EOF
   ;;
 esac
 
+case "$PKGCONFIG" in
+  yes)
+  ;;
+  no)
+    cat << EOF
+
+==============================================================
+NOTE: you do not have the "pkg-config" utility on your system;
+detection of the Gtk-2.0 and GNOME 2.0 libraries will not be
+reliable.
+EOF
+  ;;
+esac
+
 case "$AUTOMAKESUCKS" in
   no)
   ;;