Changeset 3643 for libcaca/trunk


Ignore:
Timestamp:
Aug 25, 2009, 4:23:08 PM (10 years ago)
Author:
Sam Hocevar
Message:

Update bootstrap script (automake 1.11 and pkg-config detection).

File:
1 edited

Legend:

Unmodified
Added
Removed
  • libcaca/trunk/bootstrap

    r2176 r3643  
    44# bootstrap: generic bootstrap/autogen.sh script for autotools projects
    55#
    6 # Copyright (c) 2002-2007 Sam Hocevar <sam@zoy.org>
     6# Copyright (c) 2002-2009 Sam Hocevar <sam@hocevar.net>
    77#
    88#    This program is free software. It comes without any warranty, to
     
    3030# Check for needed features
    3131auxdir="`sed -ne 's/^[ \t]*A._CONFIG_AUX_DIR *([[ ]*\([^] )]*\).*/\1/p' $conffile`"
    32 libtool="`grep -q '^[ \t]*A._PROG_LIBTOOL' $conffile && echo yes || echo no`"
    33 pkgconfig="`grep -q '^[ \t]*PKG_PROG_PKG_CONFIG' $conffile && echo yes || echo no`"
    34 header="`grep -q '^[ \t]*A._CONFIG_HEADER' $conffile && echo yes || echo no`"
    35 aclocalflags="`sed -ne 's/^[ \t]*ACLOCAL_AMFLAGS[ \t]*=//p' Makefile.am`"
     32pkgconfig="`grep '^[ \t]*PKG_PROG_PKG_CONFIG' $conffile >/dev/null 2>&1 && echo yes || echo no`"
     33libtool="`grep '^[ \t]*A._PROG_LIBTOOL' $conffile >/dev/null 2>&1 && echo yes || echo no`"
     34header="`grep '^[ \t]*A._CONFIG_HEADER' $conffile >/dev/null 2>&1 && echo yes || echo no`"
     35makefile="`[ -f Makefile.am ] && echo yes || echo no`"
     36aclocalflags="`sed -ne 's/^[ \t]*ACLOCAL_AMFLAGS[ \t]*=//p' Makefile.am 2>/dev/null || :`"
    3637
    3738# Check for automake
    3839amvers="no"
    39 for v in 10 9 8 7 6 5; do
     40for v in 11 10 9 8 7 6 5; do
    4041  if automake-1.${v} --version >/dev/null 2>&1; then
    4142    amvers="-1.${v}"
     
    130131  autoheader${acvers}
    131132fi
    132 #add --include-deps if you want to bootstrap with any other compiler than gcc
    133 #automake${amvers} --add-missing --copy --include-deps
    134 automake${amvers} --foreign --add-missing --copy
     133if test "$makefile" = "yes"; then
     134  #add --include-deps if you want to bootstrap with any other compiler than gcc
     135  #automake${amvers} --add-missing --copy --include-deps
     136  automake${amvers} --foreign --add-missing --copy
     137fi
    135138
    136139# Remove cruft that we no longer want
Note: See TracChangeset for help on using the changeset viewer.