Changeset 2540 for cacatris/trunk


Ignore:
Timestamp:
Jul 16, 2008, 3:53:28 PM (12 years ago)
Author:
Sam Hocevar
Message:
  • bootstrap: update bootstrapping script.
  • configure.ac: hide autotools files in a .auto directory.
Location:
cacatris/trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • cacatris/trunk/bootstrap

    r1756 r2540  
    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
     5#
     6# Copyright (c) 2002-2007 Sam Hocevar <sam@zoy.org>
    57#
    68#    This program is free software. It comes without any warranty, to
     
    2729
    2830# Check for needed features
    29 auxdir="`sed -ne 's/^[ \t]*A._CONFIG_AUX_DIR *([\[ ]*\([^\] )]*\).*/\1/p' $conffile`"
     31auxdir="`sed -ne 's/^[ \t]*A._CONFIG_AUX_DIR *([[ ]*\([^] )]*\).*/\1/p' $conffile`"
    3032libtool="`grep -q '^[ \t]*A._PROG_LIBTOOL' $conffile && echo yes || echo no`"
     33pkgconfig="`grep -q '^[ \t]*PKG_PROG_PKG_CONFIG' $conffile && echo yes || echo no`"
    3134header="`grep -q '^[ \t]*A._CONFIG_HEADER' $conffile && echo yes || echo no`"
    3235aclocalflags="`sed -ne 's/^[ \t]*ACLOCAL_AMFLAGS[ \t]*=//p' Makefile.am`"
     
    3437# Check for automake
    3538amvers="no"
    36 for v in "-1.10" "110" "-1.9" "19" "-1.8" "18" "-1.7" "17" "-1.6" "16" "-1.5" "15"; do
    37   if automake${v} --version >/dev/null 2>&1; then
    38     amvers="${v}"
     39for v in 10 9 8 7 6 5; do
     40  if automake-1.${v} --version >/dev/null 2>&1; then
     41    amvers="-1.${v}"
     42    break
     43  elif automake1.${v} --version >/dev/null 2>&1; then
     44    amvers="1.${v}"
    3945    break
    4046  fi
     
    8995fi
    9096
     97# Check for pkg-config
     98if test "$pkgconfig" = "yes"; then
     99  if ! pkg-config --version >/dev/null 2>&1; then
     100    echo "$0: you need pkg-config"
     101    exit 1
     102  fi
     103fi
     104
    91105# Remove old cruft
    92106for 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
  • cacatris/trunk/configure.ac

    r1443 r2540  
    55AC_PREREQ(2.50)
    66AC_CONFIG_SRCDIR(src/main.c)
    7 AC_CONFIG_AUX_DIR(autotools)
     7AC_CONFIG_AUX_DIR(.auto)
    88AC_CANONICAL_SYSTEM
    99
Note: See TracChangeset for help on using the changeset viewer.