Changeset 1756 for cacatris/trunk


Ignore:
Timestamp:
Feb 23, 2007, 1:55:38 PM (14 years ago)
Author:
Sam Hocevar
Message:
  • Support automake 1.10.
File:
1 edited

Legend:

Unmodified
Added
Removed
  • cacatris/trunk/bootstrap

    r1083 r1756  
    44# Copyright (c) 2002, 2003, 2004, 2005, 2006 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
     36for v in "-1.10" "110" "-1.9" "19" "-1.8" "18" "-1.7" "17" "-1.6" "16" "-1.5" "15"; do
    3637  if automake${v} --version >/dev/null 2>&1; then
    3738    amvers="${v}"
     
    9596    mkdir "$auxdir"
    9697  fi
    97   aclocalflags="${aclocalflags} -I $auxdir"
     98  aclocalflags="${aclocalflags} -I $auxdir -I ."
    9899fi
    99100
Note: See TracChangeset for help on using the changeset viewer.