Changeset 1830 for toilet


Ignore:
Timestamp:
Sep 30, 2007, 5:44:21 PM (12 years ago)
Author:
Sam Hocevar
Message:
  • New version of the bootstrap script.
File:
1 edited

Legend:

Unmodified
Added
Removed
  • toilet/trunk/bootstrap

    r1084 r1830  
    22
    33# bootstrap: the ultimate bootstrap/autogen.sh script for autotools projects
    4 # Copyright (c) 2002, 2003, 2004, 2005, 2006 Sam Hocevar <sam@zoy.org>
     4# Copyright (c) 2002-2007 Sam Hocevar <sam@zoy.org>
    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#    This program is free software. It comes without any warranty, to
     7#    the extent permitted by applicable law. You can redistribute it
     8#    and/or modify it under the terms of the Do What The Fuck You Want
     9#    To Public License, Version 2, as published by Sam Hocevar. See
    910#    http://sam.zoy.org/wtfpl/COPYING for more details.
    1011#
     
    2627
    2728# Check for needed features
    28 auxdir="`sed -ne 's/^[ \t]*A._CONFIG_AUX_DIR *( *\([^ )]*\).*/\1/p' $conffile`"
     29auxdir="`sed -ne 's/^[ \t]*A._CONFIG_AUX_DIR *([[ ]*\([^] )]*\).*/\1/p' $conffile`"
    2930libtool="`grep -q '^[ \t]*A._PROG_LIBTOOL' $conffile && echo yes || echo no`"
    3031header="`grep -q '^[ \t]*A._CONFIG_HEADER' $conffile && echo yes || echo no`"
     
    3334# Check for automake
    3435amvers="no"
    35 for v in "-1.9" "19" "-1.8" "18" "-1.7" "17" "-1.6" "16" "-1.5" "15"; do
    36   if automake${v} --version >/dev/null 2>&1; then
    37     amvers="${v}"
    38     break
    39   fi
     36for n in 10 9 8 7 6 5; do
     37  for v in "-1.${n}" "1${n}"; do
     38    if automake${v} --version >/dev/null 2>&1; then
     39      amvers="${v}"
     40      break
     41    fi
     42  done
    4043done
    4144
     
    9598    mkdir "$auxdir"
    9699  fi
    97   aclocalflags="${aclocalflags} -I $auxdir"
     100  aclocalflags="${aclocalflags} -I $auxdir -I ."
    98101fi
    99102
Note: See TracChangeset for help on using the changeset viewer.