Changeset 1868 for libcaca


Ignore:
Timestamp:
Nov 3, 2007, 1:58:05 PM (13 years ago)
Author:
Sam Hocevar
Message:
  • Updated bootstrap script.
File:
1 edited

Legend:

Unmodified
Added
Removed
  • libcaca/trunk/bootstrap

    r1829 r1868  
    11#! /bin/sh
     2# $Id$
    23
    3 # bootstrap: the ultimate bootstrap/autogen.sh script for autotools projects
    4 # Copyright (c) 2002, 2003, 2004, 2005, 2006 Sam Hocevar <sam@zoy.org>
     4# bootstrap: generic bootstrap/autogen.sh script for autotools projects
    55#
    6 #    This program is free software; you can redistribute it and/or
    7 #    modify it under the terms of the Do What The Fuck You Want To
    8 #    Public License, Version 2, as published by Sam Hocevar. See
     6# Copyright (c) 2002-2007 Sam Hocevar <sam@zoy.org>
     7#
     8#    This program is free software. It comes without any warranty, to
     9#    the extent permitted by applicable law. You can redistribute it
     10#    and/or modify it under the terms of the Do What The Fuck You Want
     11#    To Public License, Version 2, as published by Sam Hocevar. See
    912#    http://sam.zoy.org/wtfpl/COPYING for more details.
    1013#
     
    2629
    2730# Check for needed features
    28 auxdir="`sed -ne 's/^[ \t]*A._CONFIG_AUX_DIR *( *\([^ )]*\).*/\1/p' $conffile`"
     31auxdir="`sed -ne 's/^[ \t]*A._CONFIG_AUX_DIR *([[ ]*\([^] )]*\).*/\1/p' $conffile`"
    2932libtool="`grep -q '^[ \t]*A._PROG_LIBTOOL' $conffile && echo yes || echo no`"
    3033header="`grep -q '^[ \t]*A._CONFIG_HEADER' $conffile && echo yes || echo no`"
     34aclocalflags="`sed -ne 's/^[ \t]*ACLOCAL_AMFLAGS[ \t]*=//p' Makefile.am`"
    3135
    3236# Check for automake
    3337amvers="no"
    3438for n in 10 9 8 7 6 5; do
    35   for v in "-1.${n}" "1${n}"; do
    36     if automake${v} --version >/dev/null 2>&1; then
    37       amvers="${v}"
    38       break
    39     fi
    40   done
     39  if automake-1.${v} --version >/dev/null 2>&1; then
     40    amvers="-1.${v}"
     41    break
     42  elif automake1.${v} --version >/dev/null 2>&1; then
     43    amvers="1.${v}"
     44    break
     45  fi
    4146done
    4247
     
    9297for x in aclocal.m4 configure config.guess config.log config.sub config.cache config.h.in config.h compile libtool.m4 ltoptions.m4 ltsugar.m4 ltversion.m4 ltmain.sh libtool ltconfig missing mkinstalldirs depcomp install-sh; do rm -f $x autotools/$x; if test -n "$auxdir"; then rm -f "$auxdir/$x"; fi; done
    9398rm -Rf autom4te.cache
    94 if test -n "$auxdir" -a ! -d "$auxdir"; then mkdir "$auxdir"; fi
     99if test -n "$auxdir"; then
     100  if test ! -d "$auxdir"; then
     101    mkdir "$auxdir"
     102  fi
     103  aclocalflags="${aclocalflags} -I $auxdir -I ."
     104fi
    95105
    96106# Explain what we are doing from now
     
    100110if test "$libtool" = "yes"; then
    101111  ${libtoolize} --copy --force
    102   if test -n "$auxdir" -a -f "ltmain.sh"; then
     112  if test -n "$auxdir" -a ! "$auxdir" = "." -a -f "ltmain.sh"; then
    103113    echo "$0: working around a minor libtool issue"
    104114    mv ltmain.sh "$auxdir/"
     
    106116fi
    107117
    108 if test -n "$auxdir"; then
    109   aclocal${amvers} -I autotools
    110 else
    111   aclocal${amvers}
    112 fi
     118aclocal${amvers} ${aclocalflags}
    113119autoconf${acvers}
    114120if test "$header" = "yes"; then
Note: See TracChangeset for help on using the changeset viewer.