Commit 2ead0773 authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont

bootstrap reorder stuff to simplify

parent 27ba1dbc
......@@ -7,28 +7,58 @@
## Authors: Sam Hocevar <sam@zoy.org>
## Rémi Denis-Courmont <rem # videolan # org>
set -e
cd "$(dirname "$0")"
if test "$#" != "0"; then
echo "Usage: $0"
echo " Calls autoreconf to generate m4 macros and prepare Makefiles."
exit 1
fi
ACLOCAL_ARGS="-I m4 ${ACLOCAL_ARGS}"
###
### Get a sane environment, just in case
###
CYGWIN=binmode
export CYGWIN
set -e
set -x
# Prepare m4/private.m4
rm -f m4/private.m4 && cat > m4/private.m4 << EOF
dnl Private VLC macros - generated by bootstrap
EOF
cd "$(dirname "$0")"
# Check for pkg-config
if ! pkg-config --version >/dev/null 2>&1; then
cat << EOF
NOTE: "pkg-config" is missing from your system.
Many underlying libraries will not be detected.
==============================================================
##
## Check for various tools
##
EOF
cat >> m4/private.m4 << EOF
dnl User does not have pkg-config, so assume package was not found
AC_DEFUN([PKG_CHECK_MODULES],[ifelse([\$4], , :, [\$4])])
ACLOCAL_ARGS="-I m4 ${ACLOCAL_ARGS}"
EOF
fi
# Check for autopoint (GNU gettext)
export AUTOPOINT
test "$AUTOPOINT" || AUTOPOINT=autopoint
if ! "$AUTOPOINT" --dry-run --force >/dev/null 2>&1; then
AUTOPOINT=true
cat << EOF
NOTE: GNU gettext appears to be missing or out-of-date.
Please install or update GNU gettext.
Also check if you have cvs, a dependency of autopoint.
Otherwise, you will not be able to build a source tarball.
==============================================================
EOF
fi
# Check for contrib directory
if test -d extras/contrib/build/bin; then
......@@ -42,55 +72,13 @@ if test -d extras/contrib/build/bin; then
export LD_LIBRARY_PATH
export DYLD_LIBRARY_PATH
fi
elif test ".`uname -s`" = ".Darwin"; then
set +x
echo ""
echo "ERR: Contribs haven't been built"
echo "ERR: Please run:"
echo "ERR: "
echo "ERR: 'cd extras/contrib && ./bootstrap && make && cd ../..'"
echo "ERR: "
echo "ERR: Make sure fink has been disabled too."
echo ""
set -x
exit 1
fi
# Check for pkg-config
if pkg-config --version >/dev/null 2>&1; then
# We have pkg-config, everything is cool.
PKGCONFIG=yes
else
PKGCONFIG=no
fi
# Check for autopoint (GNU gettext)
export AUTOPOINT
test "$AUTOPOINT" || AUTOPOINT=autopoint
if ! "$AUTOPOINT" --dry-run --force >/dev/null 2>&1; then
AUTOPOINT=true
fi
##
## Generate the modules makefile, by parsing modules/**/Modules.am
##
###
### Generate the modules makefile, by parsing modules/**/Modules.am
###
set +x
echo "generating modules/**/Makefile.am"
# Prepare m4/private.m4
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 assume package was not found
AC_DEFUN([PKG_CHECK_MODULES],[ifelse([\$4], , :, [\$4])])
EOF
fi
find modules/ -name Modules.am | \
sed -ne 's,modules/\(.*\)/Modules.am,\1,p' | \
while read d; do
......@@ -99,10 +87,11 @@ while read d; do
done
printf "\n"
set -x
###
### classic bootstrap stuff
###
set -x
# Automake complains if these are not present
echo > ABOUT-NLS
......@@ -120,28 +109,4 @@ rm -f stamp-h*
# Shut up
set +x
##
## Tell the user about gettext, pkg-config and sed
##
if [ "$AUTOPOINT" = "true" ]; then
cat << EOF
==============================================================
NOTE: GNU gettext appears to be missing or out-of-date.
Please install or update GNU gettext.
Also check if you have cvs, a dependency of autopoint.
Otherwise, you will not be able to build a source tarball.
EOF
fi
if [ "$PKGCONFIG" = "no" ]; then
cat << EOF
==============================================================
NOTE: "pkg-config" is missing from your system. Certain
libraries may not be detected properly.
EOF
fi
echo "Successfully bootstrapped"
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment